comparison mercurial/copies.py @ 32593:931b7707179f

copies: rename m2 to mdst

Small refactoring to rename m2 to more clearer mdst.

32592:c8c9feffbd35

            elif f1r == f2r or f1r < limit or f2r < limit:
                return False # copy no longer relevant
    except StopIteration:
        return False

def _checkcopies(ctx, f, msrc, m2, base, tca, remotebase, limit, data):
    """
    check possible copies of f from msrc to m2

    ctx = starting context for f in msrc
    f = the filename to check (as in msrc)
    msrc = the source manifest
    m2 = the destination manifest
    base = the changectx used as a merge base
    tca = topological common ancestor for graft-like scenarios
    remotebase = True if base is outside tca::ctx, False otherwise
    limit = the rev number to not search beyond
    data = dictionary of dictionary to store copy data. (see mergecopies)

        # remember for dir rename detection
        if backwards:
            data['fullcopy'][of] = f # grafting backwards through renames
        else:
            data['fullcopy'][f] = of
        if of not in m2:
            continue # no match, keep looking
        if m2[of] == mb.get(of):
            return # no merge needed, quit early
        c2 = getfctx(of, m2[of])
        # c2 might be a plain new file on added on destination side that is
        # unrelated to the droids we are looking for.
        cr = _related(oc, c2, tca.rev())
        if cr and (of == f or of == c2.path()): # non-divergent
            if backwards:

32593:931b7707179f

            elif f1r == f2r or f1r < limit or f2r < limit:
                return False # copy no longer relevant
    except StopIteration:
        return False

def _checkcopies(ctx, f, msrc, mdst, base, tca, remotebase, limit, data):
    """
    check possible copies of f from msrc to mdst

    ctx = starting context for f in msrc
    f = the filename to check (as in msrc)
    msrc = the source manifest
    mdst = the destination manifest
    base = the changectx used as a merge base
    tca = topological common ancestor for graft-like scenarios
    remotebase = True if base is outside tca::ctx, False otherwise
    limit = the rev number to not search beyond
    data = dictionary of dictionary to store copy data. (see mergecopies)

        # remember for dir rename detection
        if backwards:
            data['fullcopy'][of] = f # grafting backwards through renames
        else:
            data['fullcopy'][f] = of
        if of not in mdst:
            continue # no match, keep looking
        if mdst[of] == mb.get(of):
            return # no merge needed, quit early
        c2 = getfctx(of, mdst[of])
        # c2 might be a plain new file on added on destination side that is
        # unrelated to the droids we are looking for.
        cr = _related(oc, c2, tca.rev())
        if cr and (of == f or of == c2.path()): # non-divergent
            if backwards: