Mercurial > evolve
diff hgext/evolve.py @ 1646:7e1b49cda66c
list: report the phase for divergent commits
author | timeless@gmail.com |
---|---|
date | Thu, 14 Apr 2016 21:30:57 +0000 |
parents | bbf897714e70 |
children | c450d134aac4 |
line wrap: on
line diff
--- a/hgext/evolve.py Thu Apr 14 17:42:18 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())) comprec = node.hex(dset['commonprecursor'])[:hashlen] fm.plain(" (precursor %s)\n" % comprec) fm.plain("\n")