# HG changeset patch # User Mads Kiilerich <madski@unity3d.com> # Date 1393356711 -3600 # Tue Feb 25 20:31:51 2014 +0100 # Node ID e8533ec2d222490278893c34a03fbccf7f25262c # Parent 8c2f1e2a11ff2dd87f920b19f56ca06441fa294a 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 @@ 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 @@ % "\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()