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

login
register
mail settings
Submitter phabricator
Date May 29, 2020, 3:58 p.m.
Message ID <differential-rev-PHID-DREV-agq2sfi2ui32etgnlojh-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/46394/
State New
Headers show

Comments

phabricator - May 29, 2020, 3:58 p.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  merge.graft() already calls it

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8598

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -29,7 +29,6 @@ 
     bookmarks,
     cmdutil,
     commands,
-    copies,
     destutil,
     dirstateguard,
     error,
@@ -1477,13 +1476,6 @@ 
         repo, ctx, repo[base], labels=[b'dest', b'source'], wctx=wctx,
     )
     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