comparison mercurial/merge.py @ 45661:ebc14a2ad23d

salvaged: track removal-candidates in more cases

If we want to use this information for copy tracing, then we need to be able to
record it.

First we unlock the recording of deletion candidates, and we will actually record
the data in the next changeset.

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

45660:e66db30f95a8

    # - we are tracking salvaged files specifically hence should process all
    #   files
    if (
        pa not in ([wctx, p2] + wctx.parents())
        and not forcefulldiff
        and not repo.ui.configbool(b'experimental', b'merge-track-salvaged')
    ):
        # Identify which files are relevant to the merge, so we can limit the
        # total m1-vs-m2 diff to just those files. This has significant
        # performance benefits in large repositories.
        relevantfiles = set(ma.diff(m2).keys())

45661:ebc14a2ad23d

    # - we are tracking salvaged files specifically hence should process all
    #   files
    if (
        pa not in ([wctx, p2] + wctx.parents())
        and not forcefulldiff
        and not (
            repo.ui.configbool(b'experimental', b'merge-track-salvaged')
            or repo.filecopiesmode == b'changeset-sidedata'
        )
    ):
        # Identify which files are relevant to the merge, so we can limit the
        # total m1-vs-m2 diff to just those files. This has significant
        # performance benefits in large repositories.
        relevantfiles = set(ma.diff(m2).keys())