This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3692

merge: add a 'keepconflictparent' argument to graft
ClosedPublic

Authored by lothiraldan on Jun 5 2018, 6:58 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd4be8ea8f22d: merge: add a 'keepconflictparent' argument to graft
Summary

Before this change, merge.graft was always dropping the "grafted" changeset
from the parent. This is impractical in case of conflict as the second parent
can be useful to help with conflict resolution.

We add a new boolean parameter to control this behavior. This will make using
merge.graft directly in shelve practicable.

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

lothiraldan created this revision.Jun 5 2018, 6:58 AM
pulkit accepted this revision.Jun 29 2018, 3:07 PM
pulkit added a subscriber: pulkit.

Looks like this will help fixing issue5927 too.

Closed by commit rHGd4be8ea8f22d: merge: add a 'keepconflictparent' argument to graft (authored by lothiraldan). · Explain WhyJun 29 2018, 3:29 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (18 lines)

Diff 9361

mercurial/merge.py

if not branchmerge: if not branchmerge:
sparse.prunetemporaryincludes(repo) sparse.prunetemporaryincludes(repo)
if not partial: if not partial:
repo.hook('update', parent1=xp1, parent2=xp2, repo.hook('update', parent1=xp1, parent2=xp2,
error=stats.unresolvedcount) error=stats.unresolvedcount)
return stats return stats
def graft(repo, ctx, pctx, labels, keepparent=False): def graft(repo, ctx, pctx, labels, 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 (if keepparent is False) and tries to duplicate any
renames/copies appropriately. renames/copies appropriately.
ctx - changeset to rebase ctx - changeset to rebase
pctx - merge base, usually ctx.p1() pctx - merge base, usually ctx.p1()
labels - merge labels eg ['local', 'graft'] labels - merge labels eg ['local', 'graft']
keepparent - keep second parent if any keepparent - keep second parent if any
keepparent - 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
# which local deleted". # which local deleted".
mergeancestor = repo.changelog.isancestor(repo['.'].node(), ctx.node()) mergeancestor = repo.changelog.isancestor(repo['.'].node(), ctx.node())
stats = update(repo, ctx.node(), True, True, pctx.node(), stats = update(repo, ctx.node(), True, True, pctx.node(),
mergeancestor=mergeancestor, labels=labels) mergeancestor=mergeancestor, labels=labels)
if keepconflictparent and stats.unresolvedcount:
pother = ctx.node()
else:
pother = nullid pother = nullid
parents = ctx.parents() parents = ctx.parents()
if keepparent and len(parents) == 2 and pctx in parents: if keepparent and len(parents) == 2 and pctx in parents:
parents.remove(pctx) parents.remove(pctx)
pother = parents[0].node() pother = parents[0].node()
with repo.dirstate.parentchange(): with repo.dirstate.parentchange():
repo.setparents(repo['.'].node(), pother) repo.setparents(repo['.'].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(), pctx.rev()) copies.duplicatecopies(repo, repo[None], ctx.rev(), pctx.rev())
return stats return stats