From patchwork Thu Apr 14 21:32:26 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [evolve-ext] list: report the phase for divergent commits
From: timeless@gcc2-power8.osuosl.org
X-Patchwork-Id: 14634
Message-Id: <e8a6a77ecfbde3d122fb.1460669546@gcc2-power8.osuosl.org>
To: mercurial-devel@mercurial-scm.org
Date: Thu, 14 Apr 2016 21:32:26 +0000

# HG changeset patch
# User timeless@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

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()))
                 comprec = node.hex(dset['commonprecursor'])[:hashlen]
                 fm.plain(" (precursor %s)\n" % comprec)
         fm.plain("\n")
diff -r bbf897714e70 -r e8a6a77ecfbd tests/test-evolve-list.t
--- a/tests/test-evolve-list.t	Thu Apr 14 03:42:48 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 ..