Show More
@@ -598,14 +598,14 b' def _related(f1, f2, limit):' | |||||
598 | except StopIteration: |
|
598 | except StopIteration: | |
599 | return False |
|
599 | return False | |
600 |
|
600 | |||
601 |
def _checkcopies(ctx, f, msrc, m |
|
601 | def _checkcopies(ctx, f, msrc, mdst, base, tca, remotebase, limit, data): | |
602 | """ |
|
602 | """ | |
603 |
check possible copies of f from msrc to m |
|
603 | check possible copies of f from msrc to mdst | |
604 |
|
604 | |||
605 | ctx = starting context for f in msrc |
|
605 | ctx = starting context for f in msrc | |
606 | f = the filename to check (as in msrc) |
|
606 | f = the filename to check (as in msrc) | |
607 | msrc = the source manifest |
|
607 | msrc = the source manifest | |
608 |
m |
|
608 | mdst = the destination manifest | |
609 | base = the changectx used as a merge base |
|
609 | base = the changectx used as a merge base | |
610 | tca = topological common ancestor for graft-like scenarios |
|
610 | tca = topological common ancestor for graft-like scenarios | |
611 | remotebase = True if base is outside tca::ctx, False otherwise |
|
611 | remotebase = True if base is outside tca::ctx, False otherwise | |
@@ -653,11 +653,11 b' def _checkcopies(ctx, f, msrc, m2, base,' | |||||
653 | data['fullcopy'][of] = f # grafting backwards through renames |
|
653 | data['fullcopy'][of] = f # grafting backwards through renames | |
654 | else: |
|
654 | else: | |
655 | data['fullcopy'][f] = of |
|
655 | data['fullcopy'][f] = of | |
656 |
if of not in m |
|
656 | if of not in mdst: | |
657 | continue # no match, keep looking |
|
657 | continue # no match, keep looking | |
658 |
if m |
|
658 | if mdst[of] == mb.get(of): | |
659 | return # no merge needed, quit early |
|
659 | return # no merge needed, quit early | |
660 |
c2 = getfctx(of, m |
|
660 | c2 = getfctx(of, mdst[of]) | |
661 | # c2 might be a plain new file on added on destination side that is |
|
661 | # c2 might be a plain new file on added on destination side that is | |
662 | # unrelated to the droids we are looking for. |
|
662 | # unrelated to the droids we are looking for. | |
663 | cr = _related(oc, c2, tca.rev()) |
|
663 | cr = _related(oc, c2, tca.rev()) |
General Comments 0
You need to be logged in to leave comments.
Login now