( )⚙ D8598 rebase: drop duplicate call to copies.graftcopies()

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8598

rebase: drop duplicate call to copies.graftcopies()
Changes PlannedPublic

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

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Summary

merge.graft() already calls it.

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
martinvonz edited the summary of this revision. (Show Details)Jun 5 2020, 9:39 PM
martinvonz updated this revision to Diff 21566.
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 D8598#128720, @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:58 PM
martinvonz planned changes to this revision.Jul 16 2020, 11:24 AM

Changes planned to earlier patch in the series

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (8 lines)

Diff 21566

hgext/rebase.py

nullrev, nullrev,
short, short,
) )
from mercurial.pycompat import open from mercurial.pycompat import open
from mercurial import ( from mercurial import (
bookmarks, bookmarks,
cmdutil, cmdutil,
commands, commands,
copies,
destutil, destutil,
dirstateguard, dirstateguard,
error, error,
extensions, extensions,
hg, hg,
merge as mergemod, merge as mergemod,
mergestate as mergestatemod, mergestate as mergestatemod,
mergeutil, mergeutil,
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( stats = mergemod.graft(
repo, ctx, repo[base], labels=[b'dest', b'source'], wctx=wctx, repo, ctx, repo[base], labels=[b'dest', b'source'], wctx=wctx,
) )
wctx.setparents(p1ctx.node(), repo[p2].node()) wctx.setparents(p1ctx.node(), repo[p2].node())
if collapse:
copies.graftcopies(wctx, ctx, repo[dest])
else:
# If we're not using --collapse, we need to
# duplicate copies between the revision we're
# rebasing and its first parent.
copies.graftcopies(wctx, ctx, ctx.p1())
return stats return stats
def adjustdest(repo, rev, destmap, state, skipped): def adjustdest(repo, rev, destmap, state, skipped):
r"""adjust rebase destination given the current rebase state r"""adjust rebase destination given the current rebase state
rev is what is being rebased. Return a list of two revs, which are the rev is what is being rebased. Return a list of two revs, which are the
adjusted destinations for rev's p1 and p2, respectively. If a parent is adjusted destinations for rev's p1 and p2, respectively. If a parent is