diff hgext/histedit.py @ 32057:e5ffc91a2276 stable

histedit: make check for unresolved conflicts explicit (issue5545)

Previously, we'd rely on the implicit check that `localrepo.commit` did.
The problem is that that check only happened when the working copy was
dirty. With a "clean" working copy but unresolved conflicts we'd get
into a broken state.

To fix that, do what rebase does and check for unresolved conflicts at
the start of histedit --continue.

--- a/hgext/histedit.py	Tue Apr 18 14:51:30 2017 -0500
+++ b/hgext/histedit.py	Thu Apr 20 17:18:08 2017 -0700
@@ -198,6 +198,7 @@
     hg,
     lock,
     merge as mergemod,
+    mergeutil,
     node,
     obsolete,
     repair,
@@ -1297,6 +1298,10 @@
 
 def bootstrapcontinue(ui, state, opts):
     repo = state.repo
+
+    ms = mergemod.mergestate.read(repo)
+    mergeutil.checkunresolved(ms)
+
     if state.actions:
         actobj = state.actions.pop(0)