mercurial/copies.py

42499:f305f1d7d559

                    # Copied on both sides: mark as copy from p1 side
                    copies[dst] = copies1[dst]
        else:
            copies = copies1
        if r == b.rev():
            return copies
        for c in children[r]:
            childctx = repo[c]
            if r == childctx.p1().rev():
                parent = 1

                parent = 2
                childcopies = childctx.p2copies()
            if not match.always():
                childcopies = {dst: src for dst, src in childcopies.items()
                               if match(dst)}
            childcopies = _chainandfilter(a, childctx, copies, childcopies)
            heapq.heappush(work, (c, parent, childcopies))
    assert False

def _forwardcopies(a, b, match=None):
    """find {dst@b: src@a} copy mapping where a is an ancestor of b"""

42500:4c39c99d9492

                    # Copied on both sides: mark as copy from p1 side
                    copies[dst] = copies1[dst]
        else:
            copies = copies1
        if r == b.rev():
            _filter(a, b, copies)
            return copies
        for c in children[r]:
            childctx = repo[c]
            if r == childctx.p1().rev():
                parent = 1

                parent = 2
                childcopies = childctx.p2copies()
            if not match.always():
                childcopies = {dst: src for dst, src in childcopies.items()
                               if match(dst)}
            childcopies = _chain(copies, childcopies)
            for f in childctx.filesremoved():
                if f in childcopies:
                    del childcopies[f]
            heapq.heappush(work, (c, parent, childcopies))
    assert False

def _forwardcopies(a, b, match=None):
    """find {dst@b: src@a} copy mapping where a is an ancestor of b"""