comparison mercurial/copies.py @ 42593:11ceb1b8fd74

copies: inline _chainandfilter() to prepare for next patch

Differential Revision: https://phab.mercurial-scm.org/D6602

42592:a48f6f18dc6d

    # yet the filelog has the copy information in rev 1 and we will not look
    # back far enough unless we also look at the a and b as candidates.
    # This only occurs when a is a descendent of b or visa-versa.
    return min(limit, a, b)

def _chainandfilter(src, dst, a, b):
    """chain two sets of copies 'a' and 'b' and filter result"""

    # When chaining copies in 'a' (from 'src' via some other commit 'mid') with
    # copies in 'b' (from 'mid' to 'dst'), we can get the different cases in the
    # following table (not including trivial cases). For example, case 2 is
    # where a file existed in 'src' and remained under that name in 'mid' and
    # then was renamed between 'mid' and 'dst'.
    #
    # case src mid dst result
    #   1   x   y   -    -
    #   2   x   y   y   x->y

    # _chain() takes care of chaining the copies in 'a' and 'b', but it
    # cannot tell the difference between cases 1 and 2, between 3 and 4, or
    # between 5 and 6, so it includes all cases in its result.
    # Cases 1, 3, and 5 are then removed by _filter().

    t = _chain(a, b)
    _filter(src, dst, t)
    return t

def _filter(src, dst, t):
    """filters out invalid copies after chaining"""
    for k, v in list(t.items()):
        # remove copies from files that didn't exist
        if v not in src:
            del t[k]
        # remove criss-crossed copies

    match = a.repo().narrowmatch(match)
    # check for working copy
    if b.rev() is None:
        cm = _committedforwardcopies(a, b.p1(), match)
        # combine copies from dirstate if necessary
        copies = _chainandfilter(a, b, cm, _dirstatecopies(b._repo, match))
    else:
        copies  = _committedforwardcopies(a, b, match)
    return copies

def _backwardrenames(a, b, match):

            repo.ui.debug('debug.copies: search mode: backward\n')
        copies = _backwardrenames(x, y, match=match)
    else:
        if debug:
            repo.ui.debug('debug.copies: search mode: combined\n')
        copies = _chainandfilter(x, y, _backwardrenames(x, a, match=match),
                                 _forwardcopies(a, y, match=match))
    return copies

def mergecopies(repo, c1, c2, base):
    """
    Finds moves and copies between context c1 and c2 that are relevant for

42593:11ceb1b8fd74

    # yet the filelog has the copy information in rev 1 and we will not look
    # back far enough unless we also look at the a and b as candidates.
    # This only occurs when a is a descendent of b or visa-versa.
    return min(limit, a, b)

def _filter(src, dst, t):
    """filters out invalid copies after chaining"""

    # When _chain()'ing copies in 'a' (from 'src' via some other commit 'mid')
    # with copies in 'b' (from 'mid' to 'dst'), we can get the different cases
    # in the following table (not including trivial cases). For example, case 2
    # is where a file existed in 'src' and remained under that name in 'mid' and
    # then was renamed between 'mid' and 'dst'.
    #
    # case src mid dst result
    #   1   x   y   -    -
    #   2   x   y   y   x->y

    # _chain() takes care of chaining the copies in 'a' and 'b', but it
    # cannot tell the difference between cases 1 and 2, between 3 and 4, or
    # between 5 and 6, so it includes all cases in its result.
    # Cases 1, 3, and 5 are then removed by _filter().

    for k, v in list(t.items()):
        # remove copies from files that didn't exist
        if v not in src:
            del t[k]
        # remove criss-crossed copies

    match = a.repo().narrowmatch(match)
    # check for working copy
    if b.rev() is None:
        cm = _committedforwardcopies(a, b.p1(), match)
        # combine copies from dirstate if necessary
        copies = _chain(cm, _dirstatecopies(b._repo, match))
        _filter(a, b, copies)
    else:
        copies  = _committedforwardcopies(a, b, match)
    return copies

def _backwardrenames(a, b, match):

            repo.ui.debug('debug.copies: search mode: backward\n')
        copies = _backwardrenames(x, y, match=match)
    else:
        if debug:
            repo.ui.debug('debug.copies: search mode: combined\n')
        copies = _chain(_backwardrenames(x, a, match=match),
                        _forwardcopies(a, y, match=match))
        _filter(x, y, copies)
    return copies

def mergecopies(repo, c1, c2, base):
    """
    Finds moves and copies between context c1 and c2 that are relevant for