##// END OF EJS Templates
copies: rename ctx to srcctx...
Stanislau Hlebik -
r32561:52cdbdd2 default
parent child Browse files
Show More
@@ -598,17 +598,17 b' def _related(f1, f2, limit):'
598 598 except StopIteration:
599 599 return False
600 600
601 def _checkcopies(ctx, f, msrc, mdst, base, tca, remotebase, limit, data):
601 def _checkcopies(srcctx, f, msrc, mdst, base, tca, remotebase, limit, data):
602 602 """
603 603 check possible copies of f from msrc to mdst
604 604
605 ctx = starting context for f in msrc
605 srcctx = starting context for f in msrc
606 606 f = the filename to check (as in msrc)
607 607 msrc = the source manifest
608 608 mdst = the destination manifest
609 609 base = the changectx used as a merge base
610 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::srcctx, False otherwise
612 612 limit = the rev number to not search beyond
613 613 data = dictionary of dictionary to store copy data. (see mergecopies)
614 614
@@ -630,7 +630,7 b' def _checkcopies(ctx, f, msrc, mdst, bas'
630 630 # the base) this is more complicated as we must detect a divergence.
631 631 # We use 'backwards = False' in that case.
632 632 backwards = not remotebase and base != tca and f in mb
633 getfctx = _makegetfctx(ctx)
633 getfctx = _makegetfctx(srcctx)
634 634
635 635 if msrc[f] == mb.get(f) and not remotebase:
636 636 # Nothing to merge
General Comments 0
You need to be logged in to leave comments. Login now