comparison mercurial/copies.py @ 46148:70a9eb899637

copies: document the current algorithm step

We are about to reorganise everything and we document the "old" way to clarify
the change that leads to the "new way".

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

46146:d109dda4a3e7

# copies.py - copy detection for Mercurial
#
# Copyright 2008 Matt Mackall <[e-mail]>
#
# This software may be used and distributed according to the terms of the

        )

    isancestor = cached_is_ancestor(isancestor)

    all_copies = {}
    for r in revs:
        copies = all_copies.pop(r, None)
        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:

                    childcopies = changes.copied_from_p2
            if not alwaysmatch:
                childcopies = {
                    dst: src for dst, src in childcopies.items() if match(dst)
                }
            newcopies = copies
            if childcopies:
                newcopies = copies.copy()
                for dest, source in pycompat.iteritems(childcopies):
                    prev = copies.get(source)

                            # 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
            elif newcopies is othercopies:
                # nothing to merge:

                    # unnecessary.
                    minor, major = newcopies, othercopies.copy()
                copies = _merge_copies_dict(minor, major, isancestor, changes)
                all_copies[c] = copies

    final_copies = {}
    for dest, (tt, source) in all_copies[targetrev].items():
        if source is not None:
            final_copies[dest] = source
    return final_copies

46148:70a9eb899637

# coding: utf8
# copies.py - copy detection for Mercurial
#
# Copyright 2008 Matt Mackall <[e-mail]>
#
# This software may be used and distributed according to the terms of the

        )

    isancestor = cached_is_ancestor(isancestor)

    all_copies = {}
    # iterate over all the "parent" side of copy tracing "edge"
    for r in revs:
        # fetch potential previously computed data for that parent
        copies = all_copies.pop(r, None)
        if copies is None:
            # this is a root
            copies = {}

        # iterate over all known children to chain the existing data with the
        # data from the parent → child edge.
        for i, c in enumerate(children[r]):
            p1, p2, changes = revinfo(c)
            childcopies = {}

            # select the right parent → child edge
            if r == p1:
                parent = 1
                if changes is not None:
                    childcopies = changes.copied_from_p1
            else:

                    childcopies = changes.copied_from_p2
            if not alwaysmatch:
                childcopies = {
                    dst: src for dst, src in childcopies.items() if match(dst)
                }

            # chain the data in the edge with the existing data
            newcopies = copies
            if childcopies:
                newcopies = copies.copy()
                for dest, source in pycompat.iteritems(childcopies):
                    prev = copies.get(source)

                            # 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)

            # check potential need to combine the data from another parent (for
            # that child). See comment below for details.
            othercopies = all_copies.get(c)
            if othercopies is None:
                all_copies[c] = newcopies
            elif newcopies is othercopies:
                # nothing to merge:

                    # unnecessary.
                    minor, major = newcopies, othercopies.copy()
                copies = _merge_copies_dict(minor, major, isancestor, changes)
                all_copies[c] = copies

    # 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