This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7548

graft: extract `repo['.']` to local variable
ClosedPublic

Authored by martinvonz on Dec 5 2019, 1:03 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfb07126dadbe: graft: extract `repo['.']` to local variable
Summary

It's used in two places and I'm about to use it more.

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.Dec 5 2019, 1:03 PM
pulkit accepted this revision.Dec 6 2019, 8:58 AM
This revision is now accepted and ready to land.Dec 6 2019, 8:58 AM
martinvonz added a commit: rHGfb07126dadbe: graft: extract `repo['.']` to local variable.Dec 6 2019, 10:37 AM
Closed by commit rHGfb07126dadbe: graft: extract `repo['.']` to local variable (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (5 lines)

Diff 18487

mercurial/merge.py

""" """
# If we're grafting a descendant onto an ancestor, be sure to pass # If we're grafting a descendant onto an ancestor, be sure to pass
# mergeancestor=True to update. This does two things: 1) allows the merge if # mergeancestor=True to update. This does two things: 1) allows the merge if
# the destination is the same as the parent of the ctx (so we can use graft # the destination is the same as the parent of the ctx (so we can use graft
# to copy commits), and 2) informs update that the incoming changes are # to copy commits), and 2) informs update that the incoming changes are
# newer than the destination so it doesn't prompt about "remote changed foo # newer than the destination so it doesn't prompt about "remote changed foo
# which local deleted". # which local deleted".
mergeancestor = repo.changelog.isancestor(repo[b'.'].node(), ctx.node()) pctx = repo[b'.']
mergeancestor = repo.changelog.isancestor(pctx.node(), ctx.node())
stats = update( stats = update(
repo, repo,
ctx.node(), ctx.node(),
True, True,
True, True,
base.node(), base.node(),
mergeancestor=mergeancestor, mergeancestor=mergeancestor,
labels=labels, labels=labels,
) )
if keepconflictparent and stats.unresolvedcount: if keepconflictparent and stats.unresolvedcount:
pother = ctx.node() pother = ctx.node()
else: else:
pother = nullid pother = nullid
parents = ctx.parents() parents = ctx.parents()
if keepparent and len(parents) == 2 and base in parents: if keepparent and len(parents) == 2 and base in parents:
parents.remove(base) parents.remove(base)
pother = parents[0].node() pother = parents[0].node()
with repo.dirstate.parentchange(): with repo.dirstate.parentchange():
repo.setparents(repo[b'.'].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.duplicatecopies(repo, repo[None], ctx.rev(), base.rev()) copies.duplicatecopies(repo, repo[None], ctx.rev(), base.rev())
return stats return stats
def purge( def purge(
repo, repo,