This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12110

merge: break up a not-so-one-liner for readability
ClosedPublic

Authored by marmoute on Jan 29 2022, 9:13 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG48aff31e7f4c: merge: break up a not-so-one-liner for readability

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

marmoute created this revision.Jan 29 2022, 9:13 AM
Alphare accepted this revision.Feb 3 2022, 3:54 AM
This revision is now accepted and ready to land.Feb 3 2022, 3:54 AM
marmoute added a commit: rHG48aff31e7f4c: merge: break up a not-so-one-liner for readability.Feb 4 2022, 5:29 AM
Closed by commit rHG48aff31e7f4c: merge: break up a not-so-one-liner for readability (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (5 lines)

Diff 32068

mercurial/merge.py

# 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): def back_out(ctx, parent=None, wc=None):
if parent is None: if parent is None:
if ctx.p2() is not None: if ctx.p2() is not None:
raise error.ProgrammingError( msg = b"must specify parent of merge commit to back out"
b"must specify parent of merge commit to back out" raise error.ProgrammingError(msg)
)
parent = ctx.p1() parent = ctx.p1()
return _update( return _update(
ctx.repo(), ctx.repo(),
parent, parent,
branchmerge=True, branchmerge=True,
force=True, force=True,
ancestor=ctx.node(), ancestor=ctx.node(),
mergeancestor=False, mergeancestor=False,