This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8597

rebase: use merge.graft() instead of merge.update()
Changes PlannedPublic

Authored by martinvonz on May 29 2020, 11:57 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Summary

It's been possible to call merge.graft() here for a while (I don't
remember which of my previous changes made it possible), but it would
have meant that we did a redundant graftcopies() call. With the fix
to make merge.update() record copies in the overlayworkingctx (when
using that), we can now also remove the redundant graftcopies()
call. The next patch will do that.

Diff Detail

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

Event Timeline

martinvonz created this revision.May 29 2020, 11:57 AM
marmoute added a subscriber: marmoute.Jun 9 2020, 6:47 AM

This patch seems related to D8596 which @martinvonz pointed as "not meant to be merged". What should we do with this diff ? is it intended for landing ? If not could get we it out of need-review and marke it RFC ?

martinvonz added a comment.Jun 9 2020, 10:12 AM
In D8597#128716, @marmoute wrote:

This patch seems related to D8596 which @martinvonz pointed as "not meant to be merged". What should we do with this diff ? is it intended for landing ? If not could get we it out of need-review and marke it RFC ?

That was on an earlier version of the series; this series is now ready.

marmoute accepted this revision.Jun 10 2020, 1:54 PM

Great.

martinvonz abandoned this revision.Jul 16 2020, 11:23 AM

Changes planned to earlier patch in the series

martinvonz reclaimed this revision.Jul 16 2020, 11:24 AM
martinvonz planned changes to this revision.

Changes planned to earlier patch in the series

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (14 lines)

Diff 21565

hgext/rebase.py

# This is, alas, necessary to invalidate workingctx's manifest cache, # This is, alas, necessary to invalidate workingctx's manifest cache,
# as well as other data we litter on it in other places. # as well as other data we litter on it in other places.
wctx = repo[None] wctx = repo[None]
repo.dirstate.write(repo.currenttransaction()) repo.dirstate.write(repo.currenttransaction())
ctx = repo[rev] ctx = repo[rev]
repo.ui.debug(b" merge against %d:%s\n" % (rev, ctx)) repo.ui.debug(b" merge against %d:%s\n" % (rev, ctx))
if base is not None: if base is not None:
repo.ui.debug(b" detach base %d:%s\n" % (base, repo[base])) repo.ui.debug(b" detach base %d:%s\n" % (base, repo[base]))
stats = mergemod.graft(
# See explanation in merge.graft() repo, ctx, repo[base], labels=[b'dest', b'source'], wctx=wctx,
mergeancestor = repo.changelog.isancestor(p1ctx.node(), ctx.node())
stats = mergemod.update(
repo,
rev,
branchmerge=True,
force=True,
ancestor=base,
mergeancestor=mergeancestor,
labels=[b'dest', b'source'],
wc=wctx,
) )
wctx.setparents(p1ctx.node(), repo[p2].node()) wctx.setparents(p1ctx.node(), repo[p2].node())
if collapse: if collapse:
copies.graftcopies(wctx, ctx, repo[dest]) copies.graftcopies(wctx, ctx, repo[dest])
else: else:
# If we're not using --collapse, we need to # If we're not using --collapse, we need to
# duplicate copies between the revision we're # duplicate copies between the revision we're
# rebasing and its first parent. # rebasing and its first parent.