comparison mercurial/copies.py @ 45986:f9f8d8aa9a92

copies: clarify the return of _merge_copies_dict

I misused that function twice in the past few days, so lets clarify the API.

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

45985:b6b7626d3e06

                # potential filelog related behavior.
                if parent == 1:
                    minor, major = othercopies, newcopies
                else:
                    minor, major = newcopies, othercopies
                _merge_copies_dict(minor, major, isancestor, changes)
                all_copies[c] = minor

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

    - `isancestors(low_rev, high_rev)`: callable return True if `low_rev` is an
                                        ancestors of `high_rev`,

    - `ismerged(path)`: callable return True if `path` have been merged in the
                        current revision,
    """
    for dest, value in major.items():
        other = minor.get(dest)
        if other is None:
            minor[dest] = value

            elif not isancestor(new_tt, other_tt):
                if value[1] is not None:
                    minor[dest] = value
                elif isancestor(other_tt, new_tt):
                    minor[dest] = value


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

45986:f9f8d8aa9a92

                # potential filelog related behavior.
                if parent == 1:
                    minor, major = othercopies, newcopies
                else:
                    minor, major = newcopies, othercopies
                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

    - `isancestors(low_rev, high_rev)`: callable return True if `low_rev` is an
                                        ancestors of `high_rev`,

    - `ismerged(path)`: callable return True if `path` have been merged in the
                        current revision,

    return the resulting dict (in practice, the "minor" object, updated)
    """
    for dest, value in major.items():
        other = minor.get(dest)
        if other is None:
            minor[dest] = value

            elif not isancestor(new_tt, other_tt):
                if value[1] is not None:
                    minor[dest] = value
                elif isancestor(other_tt, new_tt):
                    minor[dest] = value
    return minor


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