[PATCH v2] histedit: add "amen" command to fold commit data and drop message (issue4256)

[Pierre-Yves David]

On 08/11/2014 03:13 PM, Augie Fackler wrote:
>
> On Aug 11, 2014, at 2:31 PM, adgar at google.com wrote:
>
>> # HG changeset patch
>> # User Mike Edgar <adgar at google.com>
>> # Date 1407358301 14400
>> #      Wed Aug 06 16:51:41 2014 -0400
>> # Node ID 40809b1ede87da3184d06cfccee966dd4aea72fe
>> # Parent  4354b1e35f533f72d5b6ccc76e8bc742f8cb5257
>> histedit: add "amen" command to fold commit data and drop message (issue4256)
>>
>> This new histedit command (short for "amend") acts like "hg amend" does for
>> working copy: it accumulates changes without interrupting the user and asking
>> for an updated commit message.
>>
>> diff -r 4354b1e35f53 -r 40809b1ede87 hgext/histedit.py
>> --- a/hgext/histedit.py	Wed Aug 06 12:16:58 2014 -0500
>> +++ b/hgext/histedit.py	Wed Aug 06 16:51:41 2014 -0400
>> @@ -36,6 +36,7 @@
>>   #  p, pick = use commit
>>   #  e, edit = use commit, but stop for amending
>>   #  f, fold = use commit, but combine it with the one above
>> + #  a, amen = add commit content to one above, dropping message (hg amend)
>
> Sorry, I should have caught this earlier: 'hg amend' is actually from evolution, not core. Perhaps just drop that for now? I'm happy to do that during patch application if that seems sensible to everyone.

Fine with me. Push it!


-- 
Pierre-Yves David