Mercurial > hg-stable
changeset 20989:e8533ec2d222
copies: remove _checkcopies wrapper - it does no good
mergecopies might be doomed but it is not dead yet ...
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Tue, 25 Feb 2014 20:31:51 +0100 |
| parents | 8c2f1e2a11ff |
| children | d9e211a658eb |
| files | mercurial/copies.py |
| diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/copies.py Mon Apr 07 23:17:51 2014 +0200 +++ b/mercurial/copies.py Tue Feb 25 20:31:51 2014 +0100 @@ -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()