[PATCH 5 of 8 v2] copies: remove _checkcopies wrapper - it does no good
Mads Kiilerich
mads at kiilerich.com
Tue Feb 25 13:40:27 CST 2014
# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1393356711 -3600
# Tue Feb 25 20:31:51 2014 +0100
# Node ID 817b7fc6d4249035c6988dbad35537217292fbee
# Parent 1729920d85210c7aa44d6d656e935f1abe04bb41
copies: remove _checkcopies wrapper - it does no good
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