##// END OF EJS Templates
mergecopies: avoid slowdown from linkrev adjustment (issue4680)...
Matt Mackall -
r25279:708b19c1 stable
parent child Browse files
Show More
@@ -456,7 +456,7 b' def checkcopies(ctx, f, m1, m2, ca, limi'
456
456
457 g1, g2 = f1.ancestors(), f2.ancestors()
457 g1, g2 = f1.ancestors(), f2.ancestors()
458 try:
458 try:
459 f1r, f2r = f1.rev(), f2.rev()
459 f1r, f2r = f1.linkrev(), f2.linkrev()
460
460
461 if f1r is None:
461 if f1r is None:
462 f1 = g1.next()
462 f1 = g1.next()
@@ -464,7 +464,7 b' def checkcopies(ctx, f, m1, m2, ca, limi'
464 f2 = g2.next()
464 f2 = g2.next()
465
465
466 while True:
466 while True:
467 f1r, f2r = f1.rev(), f2.rev()
467 f1r, f2r = f1.linkrev(), f2.linkrev()
468 if f1r > f2r:
468 if f1r > f2r:
469 f1 = g1.next()
469 f1 = g1.next()
470 elif f2r > f1r:
470 elif f2r > f1r:
@@ -479,7 +479,7 b' def checkcopies(ctx, f, m1, m2, ca, limi'
479 of = None
479 of = None
480 seen = set([f])
480 seen = set([f])
481 for oc in ctx(f, m1[f]).ancestors():
481 for oc in ctx(f, m1[f]).ancestors():
482 ocr = oc.rev()
482 ocr = oc.linkrev()
483 of = oc.path()
483 of = oc.path()
484 if of in seen:
484 if of in seen:
485 # check limit late - grab last rename before
485 # check limit late - grab last rename before
General Comments 0
You need to be logged in to leave comments. Login now