--- a/hgext/histedit.py Tue Sep 02 03:41:01 2014 +0200
+++ b/hgext/histedit.py Wed Sep 03 20:42:51 2014 +0200
@@ -147,6 +147,7 @@
pickle.dump # import now
except ImportError:
import pickle
+import errno
import os
import sys
@@ -741,7 +742,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)