[PATCH 7 of 8 ancestor-ish] copies: remove _checkcopies wrapper - it does no good
Mads Kiilerich
mads at kiilerich.com
Mon Apr 7 16:18:23 CDT 2014
# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1393356711 -3600
# Tue Feb 25 20:31:51 2014 +0100
# Node ID cc91230f0757ea07ea2370d084ba45fcd4fe7f91
# Parent d1c551696f45860a80a27b06fa71076c72077f82
copies: remove _checkcopies wrapper - it does no good
mergecopies might be doomed but it is not dead yet ...
diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -228,9 +228,6 @@ def mergecopies(repo, c1, c2, ca):
fullcopy = {}
diverge = {}
- def _checkcopies(f, m1, m2):
- checkcopies(ctx, f, m1, m2, ca, limit, diverge, copy, fullcopy)
-
repo.ui.debug(" searching for copies back to rev %d\n" % limit)
u1 = _nonoverlap(m1, m2, ma)
@@ -244,9 +241,10 @@ def mergecopies(repo, c1, c2, ca):
% "\n ".join(u2))
for f in u1:
- _checkcopies(f, m1, m2)
+ checkcopies(ctx, f, m1, m2, ca, limit, diverge, copy, fullcopy)
+
for f in u2:
- _checkcopies(f, m2, m1)
+ checkcopies(ctx, f, m2, m1, ca, limit, diverge, copy, fullcopy)
renamedelete = {}
renamedelete2 = set()
More information about the Mercurial-devel
mailing list