diff hgext/histedit.py @ 22369:897041f6b025

merge with stable

--- 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)