comparison mercurial/merge.py @ 45333:f569ca3eb430

merge: pass mergeresult obj instead of actions in _checkcollision() (API)

The goal is to not use the actions dict and replace it with a rich mergeresult
object.

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

45332:54eeb1a0e325

                )

    return actions


def _checkcollision(repo, wmf, actions):
    """
    Check for case-folding collisions.
    """
    # If the repo is narrowed, filter out files outside the narrowspec.
    narrowmatch = repo.narrowmatch()
    if not narrowmatch.always():
        pmmf = set(wmf.walk(narrowmatch))
        if actions:
            narrowactions = {}
            for m, actionsfortype in pycompat.iteritems(actions):
                narrowactions[m] = []
                for (f, args, msg) in actionsfortype:
                    if narrowmatch(f):
                        narrowactions[m].append((f, args, msg))
            actions = narrowactions
    else:
        # build provisional merged manifest up
        pmmf = set(wmf)

    if actions:
        # KEEP and EXEC are no-op
        for m in (
            mergestatemod.ACTION_ADD,
            mergestatemod.ACTION_ADD_MODIFIED,
            mergestatemod.ACTION_FORGET,
            mergestatemod.ACTION_GET,
            mergestatemod.ACTION_CHANGED_DELETED,
            mergestatemod.ACTION_DELETED_CHANGED,
        ):
            for f, args, msg in actions[m]:
                pmmf.add(f)
        for f, args, msg in actions[mergestatemod.ACTION_REMOVE]:
            pmmf.discard(f)
        for f, args, msg in actions[mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL]:
            f2, flags = args
            pmmf.discard(f2)
            pmmf.add(f)
        for f, args, msg in actions[mergestatemod.ACTION_LOCAL_DIR_RENAME_GET]:
            pmmf.add(f)
        for f, args, msg in actions[mergestatemod.ACTION_MERGE]:
            f1, f2, fa, move, anc = args
            if move:
                pmmf.discard(f1)
            pmmf.add(f)

                        b'prompt recreating',
                    )
                else:
                    mresult.removefile(f)

        # Convert to dictionary-of-lists format
        actions = mresult.actionsdict

        if not util.fscasesensitive(repo.path):
            # check collision between files only in p2 for clean update
            if not branchmerge and (
                force or not wc.dirty(missing=True, branch=False)
            ):
                _checkcollision(repo, p2.manifest(), None)
            else:
                _checkcollision(repo, wc.manifest(), actions)

        # divergent renames
        for f, fl in sorted(pycompat.iteritems(mresult.diverge)):
            repo.ui.warn(
                _(

        updatedirstate = updatedirstate and always and not wc.isinmemory()
        if updatedirstate:
            repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2)
            # note that we're in the middle of an update
            repo.vfs.write(b'updatestate', p2.hex())

        _advertisefsmonitor(
            repo, len(actions[mergestatemod.ACTION_GET]), p1.node()
        )

45333:f569ca3eb430

                )

    return actions


def _checkcollision(repo, wmf, mresult):
    """
    Check for case-folding collisions.
    """
    # If the repo is narrowed, filter out files outside the narrowspec.
    narrowmatch = repo.narrowmatch()
    if not narrowmatch.always():
        pmmf = set(wmf.walk(narrowmatch))
        if mresult:
            for f, actionsfortype in pycompat.iteritems(mresult.actions):
                if not narrowmatch(f):
                    mresult.removefile(f)
    else:
        # build provisional merged manifest up
        pmmf = set(wmf)

    if mresult:
        # KEEP and EXEC are no-op
        for f, args, msg in mresult.getactions(
            (
                mergestatemod.ACTION_ADD,
                mergestatemod.ACTION_ADD_MODIFIED,
                mergestatemod.ACTION_FORGET,
                mergestatemod.ACTION_GET,
                mergestatemod.ACTION_CHANGED_DELETED,
                mergestatemod.ACTION_DELETED_CHANGED,
            )
        ):
            pmmf.add(f)
        for f, args, msg in mresult.getactions([mergestatemod.ACTION_REMOVE]):
            pmmf.discard(f)
        for f, args, msg in mresult.getactions(
            [mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL]
        ):
            f2, flags = args
            pmmf.discard(f2)
            pmmf.add(f)
        for f, args, msg in mresult.getactions(
            [mergestatemod.ACTION_LOCAL_DIR_RENAME_GET]
        ):
            pmmf.add(f)
        for f, args, msg in mresult.getactions([mergestatemod.ACTION_MERGE]):
            f1, f2, fa, move, anc = args
            if move:
                pmmf.discard(f1)
            pmmf.add(f)

                        b'prompt recreating',
                    )
                else:
                    mresult.removefile(f)

        if not util.fscasesensitive(repo.path):
            # check collision between files only in p2 for clean update
            if not branchmerge and (
                force or not wc.dirty(missing=True, branch=False)
            ):
                _checkcollision(repo, p2.manifest(), None)
            else:
                _checkcollision(repo, wc.manifest(), mresult)

        # divergent renames
        for f, fl in sorted(pycompat.iteritems(mresult.diverge)):
            repo.ui.warn(
                _(

        updatedirstate = updatedirstate and always and not wc.isinmemory()
        if updatedirstate:
            repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2)
            # note that we're in the middle of an update
            repo.vfs.write(b'updatestate', p2.hex())

        # Convert to dictionary-of-lists format
        actions = mresult.actionsdict

        _advertisefsmonitor(
            repo, len(actions[mergestatemod.ACTION_GET]), p1.node()
        )