Patchwork [5,of,5] histedit: hook afterresolvedstates

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

Comments

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

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -1434,5 +1434,7 @@ 
     cmdutil.unfinishedstates.append(
         ['histedit-state', False, True, _('histedit in progress'),
          _("use 'hg histedit --continue' or 'hg histedit --abort'")])
+    cmdutil.afterresolvedstates.append(
+        ['histedit-state', _('hg histedit --continue')])
     if ui.configbool("experimental", "histeditng"):
         globals()['base'] = addhisteditaction(['base', 'b'])(base)
diff --git a/tests/test-histedit-base.t b/tests/test-histedit-base.t
--- a/tests/test-histedit-base.t
+++ b/tests/test-histedit-base.t
@@ -178,6 +178,7 @@ 
   $ echo b2 > B
   $ hg resolve --mark B
   (no more unresolved files)
+  continue: hg histedit --continue
   $ hg histedit --continue | fixbundle
   $ hg tglog
   @  6:03772da75548bb42a8f1eacd8c91d0717a147fcd:draft 'X'
diff --git a/tests/test-histedit-fold-non-commute.t b/tests/test-histedit-fold-non-commute.t
--- a/tests/test-histedit-fold-non-commute.t
+++ b/tests/test-histedit-fold-non-commute.t
@@ -95,6 +95,7 @@ 
   $ echo 'I can haz no commute' > e
   $ hg resolve --mark e
   (no more unresolved files)
+  continue: hg histedit --continue
   $ cat > cat.py <<EOF
   > import sys
   > print open(sys.argv[1]).read()
@@ -128,6 +129,7 @@ 
   $ hg revert -r 'p1()' e
   $ hg resolve --mark e
   (no more unresolved files)
+  continue: hg histedit --continue
   $ hg histedit --continue 2>&1 | fixbundle
   7b4e2f4b7bcd: empty changeset
 
@@ -255,6 +257,7 @@ 
   $ echo 'I can haz no commute' > e
   $ hg resolve --mark e
   (no more unresolved files)
+  continue: hg histedit --continue
   $ hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -266,6 +269,7 @@ 
   $ hg revert -r 'p1()' e
   $ hg resolve --mark e
   (no more unresolved files)
+  continue: hg histedit --continue
   $ hg histedit --continue 2>&1 | fixbundle
   7b4e2f4b7bcd: empty changeset
 
diff --git a/tests/test-histedit-fold.t b/tests/test-histedit-fold.t
--- a/tests/test-histedit-fold.t
+++ b/tests/test-histedit-fold.t
@@ -305,6 +305,7 @@ 
   $ hg revert -r 'p1()' file
   $ hg resolve --mark file
   (no more unresolved files)
+  continue: hg histedit --continue
   $ hg histedit --continue
   251d831eeec5: empty changeset
   saved backup bundle to $TESTTMP/*-backup.hg (glob)
@@ -364,6 +365,7 @@ 
   > EOF
   $ hg resolve --mark file
   (no more unresolved files)
+  continue: hg histedit --continue
   $ hg commit -m '+5.2'
   created new head
   $ echo 6 >> file
diff --git a/tests/test-histedit-non-commute.t b/tests/test-histedit-non-commute.t
--- a/tests/test-histedit-non-commute.t
+++ b/tests/test-histedit-non-commute.t
@@ -153,6 +153,7 @@ 
   $ echo 'I can haz no commute' > e
   $ hg resolve --mark e
   (no more unresolved files)
+  continue: hg histedit --continue
   $ hg histedit --continue 2>&1 | fixbundle
   merging e
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
@@ -165,6 +166,7 @@ 
   $ hg revert -r 'p1()' e
   $ hg resolve --mark e
   (no more unresolved files)
+  continue: hg histedit --continue
   $ hg histedit --continue 2>&1 | fixbundle
   7b4e2f4b7bcd: empty changeset
 
@@ -236,6 +238,7 @@ 
   $ echo 'I can haz no commute' > e
   $ hg resolve --mark e
   (no more unresolved files)
+  continue: hg histedit --continue
   $ hg histedit --continue 2>&1 | fixbundle
   merging e
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
@@ -244,6 +247,7 @@ 
   $ hg revert -r 'p1()' e
   $ hg resolve --mark e
   (no more unresolved files)
+  continue: hg histedit --continue
   $ hg histedit --continue 2>&1 | fixbundle
   7b4e2f4b7bcd: empty changeset