--- a/hgext/histedit.py Wed Aug 01 13:10:07 2018 -0700
+++ b/hgext/histedit.py Tue Jul 24 22:51:11 2018 -0700
@@ -1084,7 +1084,7 @@
raise error.Abort(_('only --commands argument allowed with '
'--edit-plan'))
else:
- if os.path.exists(os.path.join(repo.path, 'histedit-state')):
+ if state.inprogress():
raise error.Abort(_('history edit already in progress, try '
'--continue or --abort'))
if outg:
@@ -1624,8 +1624,8 @@
def stripwrapper(orig, ui, repo, nodelist, *args, **kwargs):
if isinstance(nodelist, str):
nodelist = [nodelist]
- if os.path.exists(os.path.join(repo.path, 'histedit-state')):
- state = histeditstate(repo)
+ state = histeditstate(repo)
+ if state.inprogress():
state.read()
histedit_nodes = {action.node for action
in state.actions if action.node}
@@ -1638,9 +1638,9 @@
extensions.wrapfunction(repair, 'strip', stripwrapper)
def summaryhook(ui, repo):
- if not os.path.exists(repo.vfs.join('histedit-state')):
+ state = histeditstate(repo)
+ if not state.inprogress():
return
- state = histeditstate(repo)
state.read()
if state.actions:
# i18n: column positioning for "hg summary"