##// END OF EJS Templates
copies: pass contexts into _findlimit()...
Martin von Zweigbergk -
r41438:dc501211 default
parent child Browse files
Show More
@@ -24,7 +24,7 b' from .utils import ('
24 stringutil,
24 stringutil,
25 )
25 )
26
26
27 def _findlimit(repo, a, b):
27 def _findlimit(repo, ctxa, ctxb):
28 """
28 """
29 Find the last revision that needs to be checked to ensure that a full
29 Find the last revision that needs to be checked to ensure that a full
30 transitive closure for file copies can be properly calculated.
30 transitive closure for file copies can be properly calculated.
@@ -45,6 +45,8 b' def _findlimit(repo, a, b):'
45 # - quit when interesting revs is zero
45 # - quit when interesting revs is zero
46
46
47 cl = repo.changelog
47 cl = repo.changelog
48 a = ctxa.rev()
49 b = ctxb.rev()
48 if a is None:
50 if a is None:
49 a = node.wdirrev
51 a = node.wdirrev
50 if b is None:
52 if b is None:
@@ -162,7 +164,7 b' def _committedforwardcopies(a, b, match)'
162 if debug:
164 if debug:
163 dbg('debug.copies: looking into rename from %s to %s\n'
165 dbg('debug.copies: looking into rename from %s to %s\n'
164 % (a, b))
166 % (a, b))
165 limit = _findlimit(repo, a.rev(), b.rev())
167 limit = _findlimit(repo, a, b)
166 if debug:
168 if debug:
167 dbg('debug.copies: search limit: %d\n' % limit)
169 dbg('debug.copies: search limit: %d\n' % limit)
168 am = a.manifest()
170 am = a.manifest()
@@ -456,7 +458,7 b' def _fullcopytracing(repo, c1, c2, base)'
456 if graft:
458 if graft:
457 tca = _c1.ancestor(_c2)
459 tca = _c1.ancestor(_c2)
458
460
459 limit = _findlimit(repo, c1.rev(), c2.rev())
461 limit = _findlimit(repo, c1, c2)
460 repo.ui.debug(" searching for copies back to rev %d\n" % limit)
462 repo.ui.debug(" searching for copies back to rev %d\n" % limit)
461
463
462 m1 = c1.manifest()
464 m1 = c1.manifest()
General Comments 0
You need to be logged in to leave comments. Login now