D6269: copies: ignore heuristics copytracing when using changeset-centric algos
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Apr 17 22:06:41 UTC 2019
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
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.
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list