[Updated] D8598: rebase: drop duplicate call to copies.graftcopies()

[martinvonz (Martin von Zweigbergk)]

martinvonz edited the summary of this revision.
martinvonz updated this revision to Diff 21566.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8598?vs=21527&id=21566

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8598/new/

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

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS

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,
@@ -1478,13 +1477,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
 
 



To: martinvonz, #hg-reviewers
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20200606/8a396474/attachment.html>