##// END OF EJS Templates
copies: rename getfctx to getsrcfctx...
Stanislau Hlebik -
r32564:6966e42f default
parent child Browse files
Show More
@@ -631,7 +631,7 b' def _checkcopies(srcctx, dstctx, f, base'
631 # the base) this is more complicated as we must detect a divergence.
631 # the base) this is more complicated as we must detect a divergence.
632 # We use 'backwards = False' in that case.
632 # We use 'backwards = False' in that case.
633 backwards = not remotebase and base != tca and f in mb
633 backwards = not remotebase and base != tca and f in mb
634 getfctx = _makegetfctx(srcctx)
634 getsrcfctx = _makegetfctx(srcctx)
635
635
636 if msrc[f] == mb.get(f) and not remotebase:
636 if msrc[f] == mb.get(f) and not remotebase:
637 # Nothing to merge
637 # Nothing to merge
@@ -639,7 +639,7 b' def _checkcopies(srcctx, dstctx, f, base'
639
639
640 of = None
640 of = None
641 seen = {f}
641 seen = {f}
642 for oc in getfctx(f, msrc[f]).ancestors():
642 for oc in getsrcfctx(f, msrc[f]).ancestors():
643 ocr = oc.linkrev()
643 ocr = oc.linkrev()
644 of = oc.path()
644 of = oc.path()
645 if of in seen:
645 if of in seen:
@@ -658,7 +658,7 b' def _checkcopies(srcctx, dstctx, f, base'
658 continue # no match, keep looking
658 continue # no match, keep looking
659 if mdst[of] == mb.get(of):
659 if mdst[of] == mb.get(of):
660 return # no merge needed, quit early
660 return # no merge needed, quit early
661 c2 = getfctx(of, mdst[of])
661 c2 = getsrcfctx(of, mdst[of])
662 # c2 might be a plain new file on added on destination side that is
662 # c2 might be a plain new file on added on destination side that is
663 # unrelated to the droids we are looking for.
663 # unrelated to the droids we are looking for.
664 cr = _related(oc, c2, tca.rev())
664 cr = _related(oc, c2, tca.rev())
General Comments 0
You need to be logged in to leave comments. Login now