[PATCH 1 of 3] summary: mention graft

timeless timeless at mozdev.org
Wed Dec 2 06:35:07 UTC 2015


# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1449037872 0
#      Wed Dec 02 06:31:12 2015 +0000
# Node ID a227e8b8b5b0b180a04b2ca76a0823fe136d44b5
# Parent  61fbf5dc12b23e7a2a30cf04ebd9f096c42a1f61
summary: mention graft

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -6254,6 +6254,8 @@
     t = ', '.join(t)
     cleanworkdir = False
 
+    if repo.vfs.exists('graftstate'):
+        t += _(' (graft in progress)')
     if repo.vfs.exists('updatestate'):
         t += _(' (interrupted update)')
     elif len(parents) > 1:
diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -195,6 +195,11 @@
   (use hg resolve and hg graft --continue)
   [255]
 
+Summary should mention graft:
+
+  $ hg summary |grep graft
+  commit: 2 modified, 2 unknown, 1 unresolved (graft in progress)
+
 Commit while interrupted should fail:
 
   $ hg ci -m 'commit interrupted graft'


More information about the Mercurial-devel mailing list