diff hgext/histedit.py @ 19479:11664641fbad stable

histedit: add checkunfinished support (issue3955) The tests contain a couple corner cases where workarounds are now required. Strictly speaking, these are behavior regressions, but of an extremely obscure and marginal sort. Commits or updates in the middle of a histedit would have almost always been fairly serious user error.
author Matt Mackall <mpm@selenic.com>
date Wed, 24 Jul 2013 23:51:44 -0500
parents 10a0ae668fe6
children 607191a45f8c
line wrap: on
line diff
--- a/hgext/histedit.py	Wed Jul 24 23:51:44 2013 -0500
+++ b/hgext/histedit.py	Wed Jul 24 23:51:44 2013 -0500
@@ -512,6 +512,7 @@
         os.unlink(os.path.join(repo.path, 'histedit-state'))
         return
     else:
+        cmdutil.checkunfinished(repo)
         cmdutil.bailifchanged(repo)
 
         topmost, empty = repo.dirstate.parents()
@@ -872,3 +873,6 @@
 
 def extsetup(ui):
     cmdutil.summaryhooks.add('histedit', summaryhook)
+    cmdutil.unfinishedstates.append(
+        ['histedit-state', False, _('histedit in progress'),
+         _("use 'hg histedit --continue' or 'hg histedit --abort'")])