D7547: graft: rename `pctx` argument to `base` since that's what it is
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Dec 6 10:37:35 EST 2019
Closed by commit rHGebfd349eac46: graft: rename `pctx` argument to `base` since that's what it is (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D7547?vs=18472&id=18486
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7547/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7547
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -2582,7 +2582,7 @@
def graft(
- repo, ctx, pctx, labels=None, keepparent=False, keepconflictparent=False
+ repo, ctx, base, labels=None, keepparent=False, keepconflictparent=False
):
"""Do a graft-like merge.
@@ -2593,7 +2593,7 @@
renames/copies appropriately.
ctx - changeset to rebase
- pctx - merge base, usually ctx.p1()
+ base - merge base, usually ctx.p1()
labels - merge labels eg ['local', 'graft']
keepparent - keep second parent if any
keepconflictparent - if unresolved, keep parent used for the merge
@@ -2612,7 +2612,7 @@
ctx.node(),
True,
True,
- pctx.node(),
+ base.node(),
mergeancestor=mergeancestor,
labels=labels,
)
@@ -2622,15 +2622,15 @@
else:
pother = nullid
parents = ctx.parents()
- if keepparent and len(parents) == 2 and pctx in parents:
- parents.remove(pctx)
+ if keepparent and len(parents) == 2 and base in parents:
+ parents.remove(base)
pother = parents[0].node()
with repo.dirstate.parentchange():
repo.setparents(repo[b'.'].node(), pother)
repo.dirstate.write(repo.currenttransaction())
# fix up dirstate for copies and renames
- copies.duplicatecopies(repo, repo[None], ctx.rev(), pctx.rev())
+ copies.duplicatecopies(repo, repo[None], ctx.rev(), base.rev())
return stats
To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list