##// END OF EJS Templates
copies: do full filtering at end of _changesetforwardcopies()...
Martin von Zweigbergk -
r42685:4c39c99d default
parent child Browse files
Show More
@@ -300,6 +300,7 b' def _changesetforwardcopies(a, b, match)'
300 else:
300 else:
301 copies = copies1
301 copies = copies1
302 if r == b.rev():
302 if r == b.rev():
303 _filter(a, b, copies)
303 return copies
304 return copies
304 for c in children[r]:
305 for c in children[r]:
305 childctx = repo[c]
306 childctx = repo[c]
@@ -313,7 +314,10 b' def _changesetforwardcopies(a, b, match)'
313 if not match.always():
314 if not match.always():
314 childcopies = {dst: src for dst, src in childcopies.items()
315 childcopies = {dst: src for dst, src in childcopies.items()
315 if match(dst)}
316 if match(dst)}
316 childcopies = _chainandfilter(a, childctx, copies, childcopies)
317 childcopies = _chain(copies, childcopies)
318 for f in childctx.filesremoved():
319 if f in childcopies:
320 del childcopies[f]
317 heapq.heappush(work, (c, parent, childcopies))
321 heapq.heappush(work, (c, parent, childcopies))
318 assert False
322 assert False
319
323
General Comments 0
You need to be logged in to leave comments. Login now