Patchwork [4,of,5] rebase: hook afterresolvedstates

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

Comments

timeless@mozdev.org - Dec. 24, 2015, 9:03 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450989700 0
#      Thu Dec 24 20:41:40 2015 +0000
# Node ID 30dce3851eacee36939bbf165bda71d8cca80b9e
# Parent  10c11a93a37cb4bd1c293caea291d7c2a6faaa36
rebase: hook afterresolvedstates

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -1229,6 +1229,8 @@ 
     cmdutil.unfinishedstates.append(
         ['rebasestate', False, False, _('rebase in progress'),
          _("use 'hg rebase --continue' or 'hg rebase --abort'")])
+    cmdutil.afterresolvedstates.append(
+        ['rebasestate', _('hg rebase --continue')])
     # ensure rebased rev are not hidden
     extensions.wrapfunction(repoview, '_getdynamicblockers', _rebasedvisible)
     revset.symbols['_destrebase'] = _revsetdestrebase
diff --git a/tests/test-largefiles-update.t b/tests/test-largefiles-update.t
--- a/tests/test-largefiles-update.t
+++ b/tests/test-largefiles-update.t
@@ -590,6 +590,7 @@ 
   $ echo "manually modified before 'hg rebase --continue'" > large1
   $ hg resolve -m normal1
   (no more unresolved files)
+  continue: hg rebase --continue
   $ hg rebase --continue --config ui.interactive=True <<EOF
   > c
   > EOF
diff --git a/tests/test-rebase-bookmarks.t b/tests/test-rebase-bookmarks.t
--- a/tests/test-rebase-bookmarks.t
+++ b/tests/test-rebase-bookmarks.t
@@ -176,6 +176,7 @@ 
   $ echo 'c' > c
   $ hg resolve --mark c
   (no more unresolved files)
+  continue: hg rebase --continue
   $ hg rebase --continue
   rebasing 3:3d5fa227f4b5 "C" (Y Z)
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-backup.hg (glob)
diff --git a/tests/test-rebase-check-restore.t b/tests/test-rebase-check-restore.t
--- a/tests/test-rebase-check-restore.t
+++ b/tests/test-rebase-check-restore.t
@@ -78,6 +78,7 @@ 
   $ rm A.orig
   $ hg resolve -m A
   (no more unresolved files)
+  continue: hg rebase --continue
   $ hg rebase --continue
   already rebased 1:27547f69f254 "B" as 45396c49d53b
   rebasing 2:965c486023db "C"
@@ -134,6 +135,7 @@ 
   $ rm A.orig
   $ hg resolve -m A
   (no more unresolved files)
+  continue: hg rebase --continue
   $ hg rebase --continue
   rebasing 5:01e6ebbd8272 "F" (tip)
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-backup.hg (glob)
diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -83,6 +83,7 @@ 
   $ echo 'resolved merge' >common
   $ hg resolve -m common
   (no more unresolved files)
+  continue: hg rebase --continue
   $ hg rebase --continue
   already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
   rebasing 4:46f0b057b5c0 "L2"
diff --git a/tests/test-rebase-detach.t b/tests/test-rebase-detach.t
--- a/tests/test-rebase-detach.t
+++ b/tests/test-rebase-detach.t
@@ -391,6 +391,7 @@ 
   [1]
   $ hg resolve --all -t internal:local
   (no more unresolved files)
+  continue: hg rebase --continue
   $ hg rebase -c
   rebasing 8:6215fafa5447 "H2" (tip)
   note: rebase of 8:6215fafa5447 created no changes to commit
diff --git a/tests/test-rebase-interruptions.t b/tests/test-rebase-interruptions.t
--- a/tests/test-rebase-interruptions.t
+++ b/tests/test-rebase-interruptions.t
@@ -107,6 +107,7 @@ 
   $ rm A.orig
   $ hg resolve -m A
   (no more unresolved files)
+  continue: hg rebase --continue
 
   $ hg rebase --continue
   already rebased 1:27547f69f254 "B" as 45396c49d53b
diff --git a/tests/test-rebase-mq-skip.t b/tests/test-rebase-mq-skip.t
--- a/tests/test-rebase-mq-skip.t
+++ b/tests/test-rebase-mq-skip.t
@@ -155,6 +155,7 @@ 
 
   $ HGMERGE=internal:local hg resolve --all
   (no more unresolved files)
+  continue: hg rebase --continue
 
   $ hg rebase --continue
   already rebased 1:b4bffa6e4776 "r1" (qbase r1) as 057f55ff8f44
diff --git a/tests/test-rebase-mq.t b/tests/test-rebase-mq.t
--- a/tests/test-rebase-mq.t
+++ b/tests/test-rebase-mq.t
@@ -70,6 +70,7 @@ 
   $ echo mq1r1 > f
   $ hg resolve -m f
   (no more unresolved files)
+  continue: hg rebase --continue
   $ hg rebase -c
   rebasing 2:3504f44bffc0 "P0" (f.patch qbase)
   rebasing 3:929394423cd3 "P1" (f2.patch qtip tip)
@@ -83,6 +84,7 @@ 
   $ echo mq1r1mq2 > f
   $ hg resolve -m f
   (no more unresolved files)
+  continue: hg rebase --continue
   $ hg rebase -c
   already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c
   rebasing 3:929394423cd3 "P1" (f2.patch qtip)
diff --git a/tests/test-rebase-parameters.t b/tests/test-rebase-parameters.t
--- a/tests/test-rebase-parameters.t
+++ b/tests/test-rebase-parameters.t
@@ -484,6 +484,7 @@ 
 
   $ hg resolve -m c2
   (no more unresolved files)
+  continue: hg rebase --continue
   $ hg rebase -c --tool internal:fail
   rebasing 2:e4e3f3546619 "c2b" (tip)
   note: rebase of 2:e4e3f3546619 created no changes to commit