Mercurial > evolve

changeset 3473:b2f591aa4507

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
grab: add grab info to cmdutil.afterresolvedstates This will help us in showing how to continue the grab when user resolves all the conflicts.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 02 Feb 2018 15:37:00 +0530
parents 05bd493d496d
children 05fe5239fca2
files hgext3rd/evolve/__init__.py tests/test-grab.t
diffstat 2 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/__init__.py	Sat Jan 27 21:15:27 2018 +0530
+++ b/hgext3rd/evolve/__init__.py	Fri Feb 02 15:37:00 2018 +0530
@@ -1347,7 +1347,9 @@
     cmdutil.unfinishedstates.append(data)
 
     afterresolved = ('evolvestate', _('hg evolve --continue'))
+    grabresolved = ('grabstate', _('hg grab --continue'))
     cmdutil.afterresolvedstates.append(afterresolved)
+    cmdutil.afterresolvedstates.append(grabresolved)
 
 @eh.wrapfunction(hg, 'clean')
 def clean(orig, repo, *args, **kwargs):
--- a/tests/test-grab.t	Sat Jan 27 21:15:27 2018 +0530
+++ b/tests/test-grab.t	Fri Feb 02 15:37:00 2018 +0530
@@ -166,6 +166,7 @@
   $ echo foobar > c
   $ hg resolve --all --mark
   (no more unresolved files)
+  continue: hg grab --continue
   $ hg grab --continue
   $ hg glog
   @  8:44e155eb95c7 add c