This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9064

merge: add a back_out() function to encapsulate update()
ClosedPublic

Authored by martinvonz on Sep 21 2020, 4:36 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG2b339c6c6e99: merge: add a back_out() function to encapsulate update()
Summary

I've sent several earlier patches adding merge.clean_update(),
merge.merge() etc, one function for each use case. This patch
continues that work. I plan to hide the complex update() eventually.

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
Mmercurial/commands.py (12 lines)
Mmercurial/merge.py (17 lines)

Diff 22818

mercurial/commands.py

raise error.Abort(_(b"please specify a revision to backout")) raise error.Abort(_(b"please specify a revision to backout"))
date = opts.get(b'date') date = opts.get(b'date')
if date: if date:
opts[b'date'] = dateutil.parsedate(date) opts[b'date'] = dateutil.parsedate(date)
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
node = scmutil.revsingle(repo, rev).node() ctx = scmutil.revsingle(repo, rev)
node = ctx.node()
op1, op2 = repo.dirstate.parents() op1, op2 = repo.dirstate.parents()
if not repo.changelog.isancestor(node, op1): if not repo.changelog.isancestor(node, op1):
raise error.Abort(_(b'cannot backout change that is not an ancestor')) raise error.Abort(_(b'cannot backout change that is not an ancestor'))
p1, p2 = repo.changelog.parents(node) p1, p2 = repo.changelog.parents(node)
if p1 == nullid: if p1 == nullid:
raise error.Abort(_(b'cannot backout a change with no parents')) raise error.Abort(_(b'cannot backout a change with no parents'))
# the backout should appear on the same branch # the backout should appear on the same branch
branch = repo.dirstate.branch() branch = repo.dirstate.branch()
bheads = repo.branchheads(branch) bheads = repo.branchheads(branch)
rctx = scmutil.revsingle(repo, hex(parent)) rctx = scmutil.revsingle(repo, hex(parent))
if not opts.get(b'merge') and op1 != node: if not opts.get(b'merge') and op1 != node:
with dirstateguard.dirstateguard(repo, b'backout'): with dirstateguard.dirstateguard(repo, b'backout'):
overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
with ui.configoverride(overrides, b'backout'): with ui.configoverride(overrides, b'backout'):
stats = mergemod.update( stats = mergemod.back_out(ctx, parent=repo[parent])
repo,
parent,
branchmerge=True,
force=True,
ancestor=node,
mergeancestor=False,
)
repo.setparents(op1, op2) repo.setparents(op1, op2)
hg._showstats(repo, stats) hg._showstats(repo, stats)
if stats.unresolvedcount: if stats.unresolvedcount:
repo.ui.status( repo.ui.status(
_(b"use 'hg resolve' to retry unresolved file merges\n") _(b"use 'hg resolve' to retry unresolved file merges\n")
) )
return 1 return 1
else: else:

mercurial/merge.py

with repo.dirstate.parentchange(): with repo.dirstate.parentchange():
repo.setparents(pctx.node(), pother) repo.setparents(pctx.node(), pother)
repo.dirstate.write(repo.currenttransaction()) repo.dirstate.write(repo.currenttransaction())
# fix up dirstate for copies and renames # fix up dirstate for copies and renames
copies.graftcopies(wctx, ctx, base) copies.graftcopies(wctx, ctx, base)
return stats return stats
def back_out(ctx, parent=None, wc=None):
if parent is None:
if ctx.p2() is not None:
raise error.ProgrammingError(
b"must specify parent of merge commit to back out"
)
parent = ctx.p1()
return update(
ctx.repo(),
parent,
branchmerge=True,
force=True,
ancestor=ctx.node(),
mergeancestor=False,
)
def purge( def purge(
repo, repo,
matcher, matcher,
unknown=True, unknown=True,
ignored=False, ignored=False,
removeemptydirs=True, removeemptydirs=True,
removefiles=True, removefiles=True,
abortonerror=False, abortonerror=False,