comparison mercurial/copies.py @ 45672:f877b3628015

copies: return None instead of ChangingFiles when relevant

If they are not relevant data, they are no need to fetch them.

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

45671:2d6aea053153

    util,
)


from .utils import stringutil


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

    * p2: revision number of first parent
    * changes: a ChangingFiles object
    """
    cl = repo.changelog
    parents = cl.parentrevs

    changelogrevision = cl.changelogrevision

    # A small cache to avoid doing the work twice for merges
    #

        p1, p2 = parents(rev)
        value = None
        e = merge_caches.pop(rev, None)
        if e is not None:
            return e
        value = (p1, p2, changelogrevision(rev).changes)
        if p1 != node.nullrev and p2 != node.nullrev:
            # XXX some case we over cache, IGNORE
            merge_caches[rev] = value
        return value

        if copies is None:
            # this is a root
            copies = {}
        for i, c in enumerate(children[r]):
            p1, p2, changes = revinfo(c)
            if r == p1:
                parent = 1
                childcopies = changes.copied_from_p1
            else:
                assert r == p2
                parent = 2
                childcopies = changes.copied_from_p2
            if not alwaysmatch:
                childcopies = {
                    dst: src for dst, src in childcopies.items() if match(dst)
                }
            newcopies = copies

                    prev = copies.get(source)
                    if prev is not None and prev[1] is not None:
                        source = prev[1]
                    newcopies[dest] = (c, source)
                assert newcopies is not copies
            for f in changes.removed:
                if f in newcopies:
                    if newcopies is copies:
                        # copy on write to avoid affecting potential other
                        # branches.  when there are no other branches, this
                        # could be avoided.
                        newcopies = copies.copy()
                    newcopies[f] = (c, None)
            othercopies = all_copies.get(c)
            if othercopies is None:
                all_copies[c] = newcopies
            else:
                # we are the second parent to work on c, we need to merge our

                continue
            # content from "major" wins, unless it is older
            # than the branch point or there is a merge
            if new_tt == other_tt:
                minor[dest] = value
            elif value[1] is None and dest in changes.salvaged:
                pass
            elif other[1] is None and dest in changes.salvaged:
                minor[dest] = value
            elif not isancestor(new_tt, other_tt):
                minor[dest] = value
            elif dest in changes.merged:
                minor[dest] = value


def _revinfo_getter_extra(repo):
    """return a function that return multiple data given a <rev>"i

45672:f877b3628015

    util,
)


from .utils import stringutil

from .revlogutils import flagutil


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

    * p2: revision number of first parent
    * changes: a ChangingFiles object
    """
    cl = repo.changelog
    parents = cl.parentrevs
    flags = cl.flags

    HASCOPIESINFO = flagutil.REVIDX_HASCOPIESINFO

    changelogrevision = cl.changelogrevision

    # A small cache to avoid doing the work twice for merges
    #

        p1, p2 = parents(rev)
        value = None
        e = merge_caches.pop(rev, None)
        if e is not None:
            return e
        changes = None
        if flags(rev) & HASCOPIESINFO:
            changes = changelogrevision(rev).changes
        value = (p1, p2, changes)
        if p1 != node.nullrev and p2 != node.nullrev:
            # XXX some case we over cache, IGNORE
            merge_caches[rev] = value
        return value

        if copies is None:
            # this is a root
            copies = {}
        for i, c in enumerate(children[r]):
            p1, p2, changes = revinfo(c)
            childcopies = {}
            if r == p1:
                parent = 1
                if changes is not None:
                    childcopies = changes.copied_from_p1
            else:
                assert r == p2
                parent = 2
                if changes is not None:
                    childcopies = changes.copied_from_p2
            if not alwaysmatch:
                childcopies = {
                    dst: src for dst, src in childcopies.items() if match(dst)
                }
            newcopies = copies

                    prev = copies.get(source)
                    if prev is not None and prev[1] is not None:
                        source = prev[1]
                    newcopies[dest] = (c, source)
                assert newcopies is not copies
            if changes is not None:
                for f in changes.removed:
                    if f in newcopies:
                        if newcopies is copies:
                            # copy on write to avoid affecting potential other
                            # branches.  when there are no other branches, this
                            # could be avoided.
                            newcopies = copies.copy()
                        newcopies[f] = (c, None)
            othercopies = all_copies.get(c)
            if othercopies is None:
                all_copies[c] = newcopies
            else:
                # we are the second parent to work on c, we need to merge our

                continue
            # content from "major" wins, unless it is older
            # than the branch point or there is a merge
            if new_tt == other_tt:
                minor[dest] = value
            elif (
                changes is not None
                and value[1] is None
                and dest in changes.salvaged
            ):
                pass
            elif (
                changes is not None
                and other[1] is None
                and dest in changes.salvaged
            ):
                minor[dest] = value
            elif not isancestor(new_tt, other_tt):
                minor[dest] = value
            elif changes is not None and dest in changes.merged:
                minor[dest] = value


def _revinfo_getter_extra(repo):
    """return a function that return multiple data given a <rev>"i