Patchwork [3,of,5] graft: hook afterresolvedstates

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 24, 2015, 9:03 p.m.
Message ID <10c11a93a37cb4bd1c29.1450990986@waste.org>
Download mbox | patch
Permalink /patch/12348/
State Accepted
Headers show

Comments

timeless@mozdev.org - Dec. 24, 2015, 9:03 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450989966 0
#      Thu Dec 24 20:46:06 2015 +0000
# Node ID 10c11a93a37cb4bd1c293caea291d7c2a6faaa36
# Parent  b37f41464819f05f3708e80eefe91fa9fb52f536
graft: hook afterresolvedstates

Patch

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -3362,6 +3362,8 @@ 
             util.unlink(repo.join(f))
 
 afterresolvedstates = [
+    ('graftstate',
+     _('hg graft --continue')),
     ]
 
 def checkafterresolved(repo):
diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -246,6 +246,7 @@ 
   $ 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 @@ 
   $ 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 @@ 
   $ 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 @@ 
   $ echo abc > a
   $ hg resolve -m a
   (no more unresolved files)
+  continue: hg graft --continue
   $ hg graft -c
   grafting 28:50a516bb8b57 "28"
   $ cat a
diff --git a/tests/test-issue1175.t b/tests/test-issue1175.t
--- a/tests/test-issue1175.t
+++ b/tests/test-issue1175.t
@@ -78,6 +78,7 @@ 
   $ 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'!