[PATCH evolve-ext] list: report the phase for divergent commits

timeless timeless at gmail.com
Tue May 3 16:32:03 UTC 2016


For the record, this is fe4b41a2af4e in evolve-ext

On Fri, Apr 15, 2016 at 4:38 AM, Pierre-Yves David
<pierre-yves.david at ens-lyon.org> wrote:
>
>
> On 04/14/2016 02:32 PM, timeless at gcc2-power8.osuosl.org wrote:
>>
>> # HG changeset patch
>> # User timeless at gmail.com
>> # Date 1460669457 0
>> #      Thu Apr 14 21:30:57 2016 +0000
>> # Node ID e8a6a77ecfbde3d122fb262ae0fa622f9fdbe55a
>> # Parent  bbf897714e70529923c1b1ccca181a49c9adb747
>> # Available At https://bitbucket.org/timeless/mutable-history/
>> #              hg pull https://bitbucket.org/timeless/mutable-history/ -r
>> e8a6a77ecfbd
>> # EXP-Topic list
>> list: report the phase for divergent commits
>
>
> I've taken that one, but I would like a follow up.
>
>>
>> diff -r bbf897714e70 -r e8a6a77ecfbd hgext/evolve.py
>> --- a/hgext/evolve.py   Thu Apr 14 03:42:48 2016 +0000
>> +++ b/hgext/evolve.py   Thu Apr 14 21:30:57 2016 +0000
>> @@ -1600,9 +1600,9 @@
>>                   fm.plain('  divergent: ')
>>                   first = True
>>                   for n in dset['divergentnodes']:
>> -                    t = "%s" if first else " %s"
>> +                    t = "%s (%s)" if first else " %s (%s)"
>>                       first = False
>> -                    fm.plain(t % node.hex(n)[:hashlen])
>> +                    fm.plain(t % (node.hex(n)[:hashlen],
>> repo[n].phasestr()))
>
>
> Can we add the phase info the the template data too?
>
> --
> 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