Mercurial > hg

changeset 27172:4d61c847e06c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
summary: mention graft
author timeless <timeless@mozdev.org>
date Wed, 02 Dec 2015 06:31:12 +0000
parents 3028ea0aff46
children 8a8f5d71a49a
files mercurial/commands.py tests/test-graft.t
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Dec 02 08:07:36 2015 +0000
+++ b/mercurial/commands.py	Wed Dec 02 06:31:12 2015 +0000
@@ -6272,6 +6272,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:
--- a/tests/test-graft.t	Wed Dec 02 08:07:36 2015 +0000
+++ b/tests/test-graft.t	Wed Dec 02 06:31:12 2015 +0000
@@ -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'