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

login
register
mail settings
Submitter phabricator
Date April 17, 2019, 10:06 p.m.
Message ID <differential-rev-PHID-DREV-hmpyxjq7uikx32cqbk4i-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/39713/
State Superseded
Headers show

Comments

phabricator - April 17, 2019, 10:06 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

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.