Skip to content
Snippets Groups Projects
Commit 28d8b5f4 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

histedit: avoid repeating name of state file in a few places

We can depend on the state object instead.

Differential Revision: https://phab.mercurial-scm.org/D4006
parent fb9121ea
Branches
Tags
No related merge requests found
......@@ -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,5 +1638,6 @@
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
......@@ -1642,5 +1643,4 @@
return
state = histeditstate(repo)
state.read()
if state.actions:
# i18n: column positioning for "hg summary"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment