--- a/hgext/histedit.py Thu Sep 04 09:59:23 2014 -0400
+++ b/hgext/histedit.py Sun Sep 07 11:46:11 2014 -0500
@@ -149,6 +149,7 @@
pickle.dump # import now
except ImportError:
import pickle
+import errno
import os
import sys
@@ -761,7 +762,12 @@
def readstate(repo):
"""Returns a tuple of (parentnode, rules, keep, topmost, replacements).
"""
- fp = open(os.path.join(repo.path, 'histedit-state'))
+ try:
+ fp = open(os.path.join(repo.path, 'histedit-state'))
+ except IOError, err:
+ if err.errno != errno.ENOENT:
+ raise
+ raise util.Abort(_('no histedit in progress'))
return pickle.load(fp)
--- a/tests/test-histedit-arguments.t Thu Sep 04 09:59:23 2014 -0400
+++ b/tests/test-histedit-arguments.t Sun Sep 07 11:46:11 2014 -0500
@@ -41,6 +41,16 @@
one
+histedit --continue/--abort with no existing state
+--------------------------------------------------
+
+ $ hg histedit --continue
+ abort: no histedit in progress
+ [255]
+ $ hg histedit --abort
+ abort: no histedit in progress
+ [255]
+
Run a dummy edit to make sure we get tip^^ correctly via revsingle.
--------------------------------------------------------------------