This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11508

histedit: remove redundant checks for unfinished histedit state
ClosedPublic

Authored by martinvonz on Sep 29 2021, 12:52 AM.

Details

Reviewers
durin42
Alphare
Group Reviewers
hg-reviewers
Commits
rHG6256c7525222: histedit: remove redundant checks for unfinished histedit state
Summary

Both text-based and curses-based histedit already check for unfinished
operations (not just unfinished histedit), so there's no need to check
specifically for unfinished histedit.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (18 lines)

Diff 30440

hgext/histedit.py

ui._colormode = None ui._colormode = None
try: try:
keep = opts.get(b'keep') keep = opts.get(b'keep')
revs = opts.get(b'rev', [])[:] revs = opts.get(b'rev', [])[:]
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
if os.path.exists(os.path.join(repo.path, b'histedit-state')):
raise error.Abort(
_(
b'history edit already in progress, try '
b'--continue or --abort'
)
)
revs.extend(freeargs) revs.extend(freeargs)
if not revs: if not revs:
defaultrev = destutil.desthistedit(ui, repo) defaultrev = destutil.desthistedit(ui, repo)
if defaultrev is not None: if defaultrev is not None:
revs.append(defaultrev) revs.append(defaultrev)
if len(revs) != 1: if len(revs) != 1:
raise error.Abort( raise error.Abort(
_(b'histedit requires exactly one ancestor revision') _(b'histedit requires exactly one ancestor revision')
if path == b'-': if path == b'-':
with ui.timeblockedsection(b'histedit'): with ui.timeblockedsection(b'histedit'):
return ui.fin.read() return ui.fin.read()
else: else:
with open(path, b'rb') as f: with open(path, b'rb') as f:
return f.read() return f.read()
def _validateargs(ui, repo, state, freeargs, opts, goal, rules, revs): def _validateargs(ui, repo, freeargs, opts, goal, rules, revs):
# TODO only abort if we try to histedit mq patches, not just # TODO only abort if we try to histedit mq patches, not just
# blanket if mq patches are applied somewhere # blanket if mq patches are applied somewhere
mq = getattr(repo, 'mq', None) mq = getattr(repo, 'mq', None)
if mq and mq.applied: if mq and mq.applied:
raise error.Abort(_(b'source has mq patches applied')) raise error.Abort(_(b'source has mq patches applied'))
# basic argument incompatibility processing # basic argument incompatibility processing
outg = opts.get(b'outgoing') outg = opts.get(b'outgoing')
if any((outg, revs, freeargs, rules, editplan)): if any((outg, revs, freeargs, rules, editplan)):
raise error.Abort(_(b'no arguments allowed with --abort')) raise error.Abort(_(b'no arguments allowed with --abort'))
elif goal == b'edit-plan': elif goal == b'edit-plan':
if any((outg, revs, freeargs)): if any((outg, revs, freeargs)):
raise error.Abort( raise error.Abort(
_(b'only --commands argument allowed with --edit-plan') _(b'only --commands argument allowed with --edit-plan')
) )
else: else:
if state.inprogress():
raise error.Abort(
_(
b'history edit already in progress, try '
b'--continue or --abort'
)
)
if outg: if outg:
if revs: if revs:
raise error.Abort(_(b'no revisions allowed with --outgoing')) raise error.Abort(_(b'no revisions allowed with --outgoing'))
if len(freeargs) > 1: if len(freeargs) > 1:
raise error.Abort( raise error.Abort(
_(b'only one repo argument allowed with --outgoing') _(b'only one repo argument allowed with --outgoing')
) )
else: else:
fm = ui.formatter(b'histedit', opts) fm = ui.formatter(b'histedit', opts)
fm.startitem() fm.startitem()
goal = _getgoal(opts) goal = _getgoal(opts)
revs = opts.get(b'rev', []) revs = opts.get(b'rev', [])
nobackup = not ui.configbool(b'rewrite', b'backup-bundle') nobackup = not ui.configbool(b'rewrite', b'backup-bundle')
rules = opts.get(b'commands', b'') rules = opts.get(b'commands', b'')
state.keep = opts.get(b'keep', False) state.keep = opts.get(b'keep', False)
_validateargs(ui, repo, state, freeargs, opts, goal, rules, revs) _validateargs(ui, repo, freeargs, opts, goal, rules, revs)
hastags = False hastags = False
if revs: if revs:
revs = scmutil.revrange(repo, revs) revs = scmutil.revrange(repo, revs)
ctxs = [repo[rev] for rev in revs] ctxs = [repo[rev] for rev in revs]
for ctx in ctxs: for ctx in ctxs:
tags = [tag for tag in ctx.tags() if tag != b'tip'] tags = [tag for tag in ctx.tags() if tag != b'tip']
if not hastags: if not hastags: