[PATCH 4 of 5 v2] summary: add other/local markers for merges [RFC]

timeless timeless at gmail.com
Wed Mar 30 13:56:31 EDT 2016


I put it on its own line because conceivably there could be a dozen
tags on that line and I don't want to deal with the position shifting
around based on tag count / length.

(Our tests here are unhelpful in that they're too simplistic to show
this problem.)

My initial proposal to avoid that problem was to put it before the tag
list, but someone objected...

On Tue, Mar 29, 2016 at 2:34 PM, Pierre-Yves David
<pierre-yves.david at ens-lyon.org> wrote:
>
>
> On 03/22/2016 08:23 PM, timeless wrote:
>>
>> # HG changeset patch
>> # User timeless <timeless at mozdev.org>
>> # Date 1458683883 0
>> #      Tue Mar 22 21:58:03 2016 +0000
>> # Node ID f8b55256f2bf7613df37760b87052cb79c036834
>> # Parent  4bff81fb8154285cf1c9a335d6700eab7cc81bb1
>> summary: add other/local markers for merges [RFC]
>>
>> diff --git a/mercurial/commands.py b/mercurial/commands.py
>> --- a/mercurial/commands.py
>> +++ b/mercurial/commands.py
>> @@ -6602,6 +6602,14 @@
>>               else:
>>                   ui.write(_(' (no revision checked out)'))
>>           ui.write('\n')
>> +        if conflicts:
>> +            merging = ''
>> +            # these are not for translation
>> +            if p == localctx:
>> +                merging = 'local'
>> +            elif p == otherctx:
>> +                merging = 'other'
>> +            ui.write(_('merging: %s\n') % merging)
>>           if p.description():
>>               ui.status(' ' + p.description().splitlines()[0].strip() +
>> '\n',
>>                         label='log.summary')
>> diff --git a/tests/test-backout.t b/tests/test-backout.t
>> --- a/tests/test-backout.t
>> +++ b/tests/test-backout.t
>> @@ -81,8 +81,10 @@
>>     [1]
>>     $ hg summary
>>     parent: 4:ed99997b793d tip
>> +   merging: local
>>      ypples
>>     source: 1:22cb4f70d813
>
>
> I'm not fan of having this extra line between 'parent:' and the description.
> I find it quit confusing. Could we sneak that into the above line? This
> "make" sense as this is a label for the changeset
>
>   parent: 4:ed99997b793d tip (merging as local)
>     ypples
>
> What do you think ?
>
> Cheers,
>
> --
> Pierre-Yves David
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list