Mercurial > hg

changeset 42226:a6be3af3a397

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: ignore heuristics copytracing when using changeset-centric algos Differential Revision: https://phab.mercurial-scm.org/D6269
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 17 Apr 2019 14:44:18 -0700
parents d8ca7b99fc51
children d1c2688eda80
files mercurial/copies.py
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/copies.py	Wed Apr 17 14:42:23 2019 -0700
+++ b/mercurial/copies.py	Wed Apr 17 14:44:18 2019 -0700
@@ -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.