graft: hook afterresolvedstates

mercurial/cmdutil.py

@@ -3364,6 +3364,8 b' def clearunfinished(repo):'
             util.unlink(repo.join(f))
 
 afterresolvedstates = [
+    ('graftstate',
+     _('hg graft --continue')),
     ]
 
 def checkafterresolved(repo):

tests/test-graft.t

@@ -246,6 +246,7 b' Fix up:'
   $ echo b > e
   $ hg resolve -m e
   (no more unresolved files)
+  continue: hg graft --continue
 
 Continue with a revision should fail:
 
@@ -440,6 +441,7 b' Resolve conflicted graft'
   $ echo b > a
   $ hg resolve -m a
   (no more unresolved files)
+  continue: hg graft --continue
   $ hg graft -c
   grafting 1:5d205f8b35b6 "1"
   $ hg export tip --git
@@ -469,6 +471,7 b' Resolve conflicted graft with rename'
   $ hg resolve --all
   merging a and b to b
   (no more unresolved files)
+  continue: hg graft --continue
   $ hg graft -c
   grafting 2:5c095ad7e90f "2"
   $ hg export tip --git
@@ -759,6 +762,7 b' graft --continue after --force'
   $ echo abc > a
   $ hg resolve -m a
   (no more unresolved files)
+  continue: hg graft --continue
   $ hg graft -c
   grafting 28:50a516bb8b57 "28"
   $ cat a

tests/test-issue1175.t

@@ -78,6 +78,7 b' http://bz.selenic.com/show_bug.cgi?id=44'
   $ echo b3 >> b
   $ hg resolve --mark b
   (no more unresolved files)
+  continue: hg graft --continue
   $ hg graft --continue
   grafting 1:5974126fad84 "b1"
   warning: can't find ancestor for 'b' copied from 'a'!