[PATCH 6 of 6] histedit: move autoverb rule to the commit it matches

[Simon Farnsworth]

On 28/06/2016 21:24, Sean Farley wrote:
> Simon Farnsworth <simonfar at fb.com> writes:
>
>> Apart from the test suite changes, this LGTM.

And with Sean's explanation of the changes, I think this is good to go.

<snip>

>>> diff --git a/tests/test-histedit-arguments.t b/tests/test-histedit-arguments.t
>>> --- a/tests/test-histedit-arguments.t
>>> +++ b/tests/test-histedit-arguments.t
>>> @@ -505,36 +505,35 @@ amend should not be blocked by the ongoi
>>>    Test autoverb feature
>>>
>>>      $ hg init autoverb
>>>      $ cd autoverb
>>>      $ echo alpha >> alpha
>>> -  $ hg addr
>>> -  adding alpha
>>> -  $ hg ci -m one
>>> +  $ hg ci -qAm one
>>>      $ echo alpha >> alpha
>>> -  $ hg ci -m two
>>> -  $ echo alpha >> alpha
>>> -  $ hg ci -m "roll! three"
>>> +  $ hg ci -qm two
>>> +  $ echo beta >> beta
>>> +  $ hg ci -qAm "roll! one"
>>>
>>
>> Why these changes? They don't seem to match up to the main thrust of the
>> patchset?
>
> They're needed to use this feature which is "verb! some previous
> commit's summary." So, in this case I needed to change "roll! three" to
> "roll! one" so that it actually moves the commit one line up. The '-q's
> were added to future-proof the output.
>

I see; I would have expected you to simply change the message on the 
third commit from "roll! three" to "roll! one", but the other edits make 
sense and bring it more in line with other tests.

<snip>

>>> _______________________________________________
>>> Mercurial-devel mailing list
>>> Mercurial-devel at mercurial-scm.org
>>> https://urldefense.proofpoint.com/v2/url?u=https-3A__www.mercurial-2Dscm.org_mailman_listinfo_mercurial-2Ddevel&d=CwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=XJgnLgmqvd94zZ4Gg-23pLKb0FquyX6LtDveEumutfQ&s=a8SR2qtk9k2ewYmNYbYAw0bTnJMD9r2BkThX1bhXJwI&e=
>
> What the what??
>
The combination of Thunderbird and corporate Exchange set up to mangle 
all incoming URLs leads to "interesting" lines from time to time. Big 
company problems...

-- 
Simon Farnsworth