# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1517566020 -19800 # Node ID b2f591aa450708b7bc7a09ee46bf88f9d840913f # Parent 05bd493d496d1a279ca81176bdd209b651b41fc4 grab: add grab info to cmdutil.afterresolvedstates This will help us in showing how to continue the grab when user resolves all the conflicts. diff -r 05bd493d496d -r b2f591aa4507 hgext3rd/evolve/__init__.py --- 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): diff -r 05bd493d496d -r b2f591aa4507 tests/test-grab.t --- 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