This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7549

graft: never set both parents equal in the dirstate (issue6098)
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG32d11a23c9cf: graft: never set both parents equal in the dirstate (issue6098)
Summary

merge.graft() can set both parents equal in the dirstate when
keepparent=True. We don't seem to set that in core, but the evolve
extension does use it. So I couldn't figure out a way to add a test
for this patch in core.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (3 lines)

Diff 18488

mercurial/merge.py

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()
# Never set both parents equal to each other
if pother == pctx.node():
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
copies.duplicatecopies(repo, repo[None], ctx.rev(), base.rev()) copies.duplicatecopies(repo, repo[None], ctx.rev(), base.rev())
return stats return stats