comparison mercurial/copies.py @ 46159:929054848d6c

copies: properly match result during changeset centric copy tracing

By filtering "during" the iteration we were excluding rename information that
were not in the matched set but that file served as base information for the
matched set.

We now do all copy tracing matching at the end of the process to ensure we raise
proper result.

If we were aggregating information top down instead of bottom up we could do
filtering during processing. However, we don't.

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

46158:1fcfff09cac5

    HASCOPIESINFO = flagutil.REVIDX_HASCOPIESINFO

    changelogrevision = cl.changelogrevision

    alwaysmatch = match.always()

    if rustmod is not None and alwaysmatch:

        def revinfo(rev):
            p1, p2 = parents(rev)
            if flags(rev) & HASCOPIESINFO:
                raw = changelogrevision(rev)._sidedata.get(sidedatamod.SD_FILES)

    It returns the aggregated copies information for `targetrev`.
    """

    alwaysmatch = match.always()

    if rustmod is not None and alwaysmatch:
        final_copies = rustmod.combine_changeset_copies(
            list(revs), children_count, targetrev, revinfo, isancestor
        )
    else:
        isancestor = cached_is_ancestor(isancestor)

                    if parent == 1:
                        childcopies = changes.copied_from_p1
                    elif parent == 2:
                        childcopies = changes.copied_from_p2

                    if not alwaysmatch:
                        childcopies = {
                            dst: src
                            for dst, src in childcopies.items()
                            if match(dst)
                        }
                    if childcopies:
                        newcopies = copies.copy()
                        for dest, source in pycompat.iteritems(childcopies):
                            prev = copies.get(source)
                            if prev is not None and prev[1] is not None:

        # filter out internal details and return a {dest: source mapping}
        final_copies = {}
        for dest, (tt, source) in all_copies[targetrev].items():
            if source is not None:
                final_copies[dest] = source
    return final_copies


def _merge_copies_dict(minor, major, isancestor, changes):
    """merge two copies-mapping together, minor and major

46159:929054848d6c

    HASCOPIESINFO = flagutil.REVIDX_HASCOPIESINFO

    changelogrevision = cl.changelogrevision

    if rustmod is not None:

        def revinfo(rev):
            p1, p2 = parents(rev)
            if flags(rev) & HASCOPIESINFO:
                raw = changelogrevision(rev)._sidedata.get(sidedatamod.SD_FILES)

    It returns the aggregated copies information for `targetrev`.
    """

    alwaysmatch = match.always()

    if rustmod is not None:
        final_copies = rustmod.combine_changeset_copies(
            list(revs), children_count, targetrev, revinfo, isancestor
        )
    else:
        isancestor = cached_is_ancestor(isancestor)

                    if parent == 1:
                        childcopies = changes.copied_from_p1
                    elif parent == 2:
                        childcopies = changes.copied_from_p2

                    if childcopies:
                        newcopies = copies.copy()
                        for dest, source in pycompat.iteritems(childcopies):
                            prev = copies.get(source)
                            if prev is not None and prev[1] is not None:

        # filter out internal details and return a {dest: source mapping}
        final_copies = {}
        for dest, (tt, source) in all_copies[targetrev].items():
            if source is not None:
                final_copies[dest] = source
    if not alwaysmatch:
        for filename in list(final_copies.keys()):
            if not match(filename):
                del final_copies[filename]
    return final_copies


def _merge_copies_dict(minor, major, isancestor, changes):
    """merge two copies-mapping together, minor and major