# HG changeset patch # User timeless # Date 1449037872 0 # Node ID 4d61c847e06c643766041b81a7079375ed6e4452 # Parent 3028ea0aff468e55eac25606490e99a4a354869c summary: mention graft diff -r 3028ea0aff46 -r 4d61c847e06c mercurial/commands.py --- 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: diff -r 3028ea0aff46 -r 4d61c847e06c tests/test-graft.t --- 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'