Mercurial > public > mercurial-scm > hg

diff hgext/histedit.py @ 22368:802dffd62de5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: abort gracefully on --continue/--abort with no state Previously we'd print an ugly message saying that the histedit-state file doesn't exist in the repo.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 03 Sep 2014 20:42:51 +0200
parents 9ac98c2aa95c
children 897041f6b025
line wrap: on
line diff
--- 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)