comparison mercurial/merge.py @ 45335:2c96fd8e05f6

merge: pass mergeresult obj in merge._prefetchfiles()

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

45334:b9b055f15035

    if i > 0:
        yield False, (i, f)
    yield True, filedata


def _prefetchfiles(repo, ctx, actions):
    """Invoke ``scmutil.prefetchfiles()`` for the files relevant to the dict
    of merge actions.  ``ctx`` is the context being merged in."""

    # Skipping 'a', 'am', 'f', 'r', 'dm', 'e', 'k', 'p' and 'pr', because they
    # don't touch the context to be merged in.  'cd' is skipped, because
    # changed/deleted never resolves to something from the remote side.
    oplist = [
        actions[a]
        for a in (
            mergestatemod.ACTION_GET,
            mergestatemod.ACTION_DELETED_CHANGED,
            mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,
            mergestatemod.ACTION_MERGE,
        )
    ]
    prefetch = scmutil.prefetchfiles
    matchfiles = scmutil.matchfiles
    prefetch(
        repo,
        [
            (
                ctx.rev(),
                matchfiles(
                    repo, [f for sublist in oplist for f, args, msg in sublist]
                ),
            )
        ],
    )


@attr.s(frozen=True)
class updateresult(object):

    files were affected by the update, and filedata is as described in
    batchget.
    """

    actions = mresult.actionsdict
    _prefetchfiles(repo, mctx, actions)

    updated, merged, removed = 0, 0, 0
    ms = mergestatemod.mergestate.clean(
        repo, wctx.p1().node(), mctx.node(), labels
    )

45335:2c96fd8e05f6

    if i > 0:
        yield False, (i, f)
    yield True, filedata


def _prefetchfiles(repo, ctx, mresult):
    """Invoke ``scmutil.prefetchfiles()`` for the files relevant to the dict
    of merge actions.  ``ctx`` is the context being merged in."""

    # Skipping 'a', 'am', 'f', 'r', 'dm', 'e', 'k', 'p' and 'pr', because they
    # don't touch the context to be merged in.  'cd' is skipped, because
    # changed/deleted never resolves to something from the remote side.
    files = []
    for f, args, msg in mresult.getactions(
        [
            mergestatemod.ACTION_GET,
            mergestatemod.ACTION_DELETED_CHANGED,
            mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,
            mergestatemod.ACTION_MERGE,
        ]
    ):
        files.append(f)

    prefetch = scmutil.prefetchfiles
    matchfiles = scmutil.matchfiles
    prefetch(
        repo, [(ctx.rev(), matchfiles(repo, files),)],
    )


@attr.s(frozen=True)
class updateresult(object):

    files were affected by the update, and filedata is as described in
    batchget.
    """

    actions = mresult.actionsdict
    _prefetchfiles(repo, mctx, mresult)

    updated, merged, removed = 0, 0, 0
    ms = mergestatemod.mergestate.clean(
        repo, wctx.p1().node(), mctx.node(), labels
    )