# HG changeset patch # User timeless@gmail.com # Date 1460669457 0 # Node ID 7e1b49cda66c0f6c941b14ac0b9b164b625e7047 # Parent 30fa0c553695102b55ef23419467e7a3d4812bec list: report the phase for divergent commits diff -r 30fa0c553695 -r 7e1b49cda66c hgext/evolve.py --- 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") diff -r 30fa0c553695 -r 7e1b49cda66c tests/test-evolve-list.t --- a/tests/test-evolve-list.t Thu Apr 14 17:42:18 2016 +0000 +++ b/tests/test-evolve-list.t Thu Apr 14 21:30:57 2016 +0000 @@ -67,9 +67,14 @@ 2 new divergent changesets $ hg evolve --list c882616e9d84: b - divergent: a922b3733e98 (precursor d2ae7f538514) + divergent: a922b3733e98 (draft) (precursor d2ae7f538514) a922b3733e98: b - divergent: c882616e9d84 (precursor d2ae7f538514) + divergent: c882616e9d84 (draft) (precursor d2ae7f538514) + + $ hg phase -p a922b3733e98 + $ hg evolve --list + c882616e9d84: b + divergent: a922b3733e98 (public) (precursor d2ae7f538514) $ cd ..