comparison mercurial/copies.py @ 45670:a8fb29b05f92

salvaged: properly deal with salvaged file during copy tracing

When salvaged files are encountered, the removal have been reverted and we
should keep the rename information from the other side.

The conditional was starting to be quite hairy, so we spell it out in multiple
elif case for readability.

This fixes the associated test cases introduced a while back. The changeset centric copy tracing is now (known) bug free.

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

45669:e53778ad64bf

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


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

45670:a8fb29b05f92

            other_tt = other[0]
            if value[1] == other[1]:
                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