Patchwork D6269: copies: ignore heuristics copytracing when using changeset-centric algos

login
register
mail settings
Submitter phabricator
Date April 29, 2019, 10:52 p.m.
Message ID <2616541200d735167ec9c7dadcb72aca@localhost.localdomain>
Download mbox | patch
Permalink /patch/39895/
State Not Applicable
Headers show

Comments

phabricator - April 29, 2019, 10:52 p.m.
martinvonz updated this revision to Diff 14968.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6269?vs=14947&id=14968

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

AFFECTED FILES
  mercurial/copies.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -415,6 +415,10 @@ 
         # value, so we should rely on making sure copytracing is on such cases
         return {}, {}, {}, {}, {}
 
+    if usechangesetcentricalgo(repo):
+        # The heuristics don't make sense when we need changeset-centric algos
+        return _fullcopytracing(repo, c1, c2, base)
+
     # Copy trace disabling is explicitly below the node == p1 logic above
     # because the logic above is required for a simple copy to be kept across a
     # rebase.