This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7799

merge: remove unused keepparent argument for graft()
AbandonedPublic

Authored by martinvonz on Jan 6 2020, 7:58 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

The option was added in d6859d86a5d5 (merge.graft: add option to keep
second parent, 2015-12-03) in order to help fix
https://bz.mercurial-scm.org/show_bug.cgi?id=4389, but no code was
ever added to either core or evolve to pass the option. Evolve handles
at least some kinds of orphan merges these days, so I suspect this
turned out to not be needed.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Jan 6 2020, 7:58 PM
pulkit added a subscriber: pulkit.Jan 9 2020, 8:58 AM

but no code was ever added to either core or evolve to pass the option

It seems like evolve does use this option. https://www.mercurial-scm.org/repo/evolve/file/tip/hgext3rd/evolve/evolvecmd.py#l1104

martinvonz added a comment.Jan 9 2020, 12:12 PM
In D7799#114945, @pulkit wrote:

but no code was ever added to either core or evolve to pass the option

It seems like evolve does use this option. https://www.mercurial-scm.org/repo/evolve/file/tip/hgext3rd/evolve/evolvecmd.py#l1104

I naively just grepped for "keepparent" and missed that case since it's passing it as a positional argument. Thanks, I'll abandon this patch.

martinvonz abandoned this revision.Jan 9 2020, 12:12 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (12 lines)

Diff 19051

mercurial/merge.py

if not partial: if not partial:
repo.hook( repo.hook(
b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount
) )
return stats return stats
def graft( def graft(repo, ctx, base, labels=None, keepconflictparent=False):
repo, ctx, base, labels=None, keepparent=False, keepconflictparent=False
):
"""Do a graft-like merge. """Do a graft-like merge.
This is a merge where the merge ancestor is chosen such that one This is a merge where the merge ancestor is chosen such that one
or more changesets are grafted onto the current changeset. In or more changesets are grafted onto the current changeset. In
addition to the merge, this fixes up the dirstate to include only addition to the merge, this fixes up the dirstate to include only
a single parent (if keepparent is False) and tries to duplicate any a single parent and tries to duplicate any renames/copies appropriately.
renames/copies appropriately.
ctx - changeset to rebase ctx - changeset to rebase
base - merge base, usually ctx.p1() base - merge base, usually ctx.p1()
labels - merge labels eg ['local', 'graft'] labels - merge labels eg ['local', 'graft']
keepparent - keep second parent if any
keepconflictparent - if unresolved, keep parent used for the merge keepconflictparent - if unresolved, keep parent used for the merge
""" """
# 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
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()
if keepparent and len(parents) == 2 and base in parents:
parents.remove(base)
pother = parents[0].node()
# Never set both parents equal to each other # Never set both parents equal to each other
if pother == pctx.node(): if pother == pctx.node():
pother = nullid pother = nullid
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