Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
list: report the phase for divergent commits
authortimeless@gmail.com
Thu, 14 Apr 2016 21:30:57 +0000
changeset 1646 7e1b49cda66c
parent 1645 30fa0c553695
child 1647 23521789ded0
list: report the phase for divergent commits
hgext/evolve.py file | annotate | diff | comparison | revisions
tests/test-evolve-list.t file | annotate | diff | comparison | revisions 
--- 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")
--- 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 ..
evolve