This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7995

merge: call hg.abortmerge() directly and return early
ClosedPublic

Authored by martinvonz on Jan 24 2020, 7:16 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG6744859ff3ee: merge: call hg.abortmerge() directly and return early
Summary

It's seem really weird to go through a lot of unrelated code before we
call hg.merge(..., abort=True) when we can just call
hg.abortmerge() and return early.

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.

Event Timeline

martinvonz created this revision.Jan 24 2020, 7:16 PM
pulkit accepted this revision.Jan 24 2020, 8:23 PM
This revision is now accepted and ready to land.Jan 24 2020, 8:23 PM
martinvonz added a commit: rHG6744859ff3ee: merge: call hg.abortmerge() directly and return early.Jan 25 2020, 7:25 PM
Closed by commit rHG6744859ff3ee: merge: call hg.abortmerge() directly and return early (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (5 lines)

Diff 19614

mercurial/commands.py

state = cmdutil.getunfinishedstate(repo) state = cmdutil.getunfinishedstate(repo)
if state and state._opname != b'merge': if state and state._opname != b'merge':
raise error.Abort( raise error.Abort(
_(b'cannot abort merge with %s in progress') % (state._opname), _(b'cannot abort merge with %s in progress') % (state._opname),
hint=state.hint(), hint=state.hint(),
) )
if node: if node:
raise error.Abort(_(b"cannot specify a node with --abort")) raise error.Abort(_(b"cannot specify a node with --abort"))
return hg.abortmerge(repo.ui, repo)
if opts.get(b'rev') and node: if opts.get(b'rev') and node:
raise error.Abort(_(b"please specify just one revision")) raise error.Abort(_(b"please specify just one revision"))
if not node: if not node:
node = opts.get(b'rev') node = opts.get(b'rev')
if node: if node:
node = scmutil.revsingle(repo, node).node() node = scmutil.revsingle(repo, node).node()
if not node and not abort: if not node:
if ui.configbool(b'commands', b'merge.require-rev'): if ui.configbool(b'commands', b'merge.require-rev'):
raise error.Abort( raise error.Abort(
_( _(
b'configuration requires specifying revision to merge ' b'configuration requires specifying revision to merge '
b'with' b'with'
) )
) )
node = repo[destutil.destmerge(repo)].node() node = repo[destutil.destmerge(repo)].node()
force = opts.get(b'force') force = opts.get(b'force')
labels = [b'working copy', b'merge rev'] labels = [b'working copy', b'merge rev']
return hg.merge( return hg.merge(
repo, repo,
node, node,
force=force, force=force,
mergeforce=force, mergeforce=force,
labels=labels, labels=labels,
abort=abort,
) )
statemod.addunfinished( statemod.addunfinished(
b'merge', b'merge',
fname=None, fname=None,
clearable=True, clearable=True,
allowcommit=True, allowcommit=True,