comparison mercurial/merge.py @ 45334:b9b055f15035

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

This is similar to past 20 patches or so where we are replacing use of a bare
actions dict with a dedicated mergeresult object. The goal is to have a
dedicated powerful object instead of a dict while making the code more easier to
understand.
In past few patches, we have already simplified the code at some places using
the newly introduced object.

This patch does not updates applyupdates() to use the mergeresult object
directly. That will be done in next patch to make things easier to review.

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

45333:f569ca3eb430

    }


def applyupdates(
    repo,
    actions,
    wctx,
    mctx,
    overwrite,
    wantfiledata,
    labels=None,
    commitinfo=None,
):
    """apply the merge action list to the working directory

    wctx is the working copy context
    mctx is the context to be merged into the working copy
    commitinfo is a mapping of information which needs to be stored somewhere
               (probably mergestate) so that it can be used at commit time.

    (updated, merged, removed, unresolved) that describes how many
    files were affected by the update, and filedata is as described in
    batchget.
    """

    _prefetchfiles(repo, mctx, actions)

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

    extraactions = ms.actions()
    if extraactions:
        mfiles = {a[0] for a in actions[mergestatemod.ACTION_MERGE]}
        for k, acts in pycompat.iteritems(extraactions):
            actions[k].extend(acts)
            if k == mergestatemod.ACTION_GET and wantfiledata:
                # no filedata until mergestate is updated to provide it
                for a in acts:
                    getfiledata[a[0]] = None
            # Remove these files from actions[ACTION_MERGE] as well. This is

            mfiles.difference_update(a[0] for a in acts)

        actions[mergestatemod.ACTION_MERGE] = [
            a for a in actions[mergestatemod.ACTION_MERGE] if a[0] in mfiles
        ]

    progress.complete()
    assert len(getfiledata) == (
        len(actions[mergestatemod.ACTION_GET]) if wantfiledata else 0
    )

        )

        wantfiledata = updatedirstate and not branchmerge
        stats, getfiledata = applyupdates(
            repo,
            actions,
            wc,
            p2,
            overwrite,
            wantfiledata,
            labels=labels,

        if updatedirstate:
            with repo.dirstate.parentchange():
                repo.setparents(fp1, fp2)
                mergestatemod.recordupdates(
                    repo, actions, branchmerge, getfiledata
                )
                # update completed, clear state
                util.unlink(repo.vfs.join(b'updatestate'))

                if not branchmerge:

45334:b9b055f15035

    }


def applyupdates(
    repo,
    mresult,
    wctx,
    mctx,
    overwrite,
    wantfiledata,
    labels=None,
    commitinfo=None,
):
    """apply the merge action list to the working directory

    mresult is a mergeresult object representing result of the merge
    wctx is the working copy context
    mctx is the context to be merged into the working copy
    commitinfo is a mapping of information which needs to be stored somewhere
               (probably mergestate) so that it can be used at commit time.

    (updated, merged, removed, unresolved) that describes how many
    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

    extraactions = ms.actions()
    if extraactions:
        mfiles = {a[0] for a in actions[mergestatemod.ACTION_MERGE]}
        for k, acts in pycompat.iteritems(extraactions):
            actions[k].extend(acts)
            for a in acts:
                mresult.addfile(a[0], k, *a[1:])
            if k == mergestatemod.ACTION_GET and wantfiledata:
                # no filedata until mergestate is updated to provide it
                for a in acts:
                    getfiledata[a[0]] = None
            # Remove these files from actions[ACTION_MERGE] as well. This is

            mfiles.difference_update(a[0] for a in acts)

        actions[mergestatemod.ACTION_MERGE] = [
            a for a in actions[mergestatemod.ACTION_MERGE] if a[0] in mfiles
        ]
        for a in mresult.getactions([mergestatemod.ACTION_MERGE]):
            if a[0] not in mfiles:
                mresult.removefile(a[0])

    progress.complete()
    assert len(getfiledata) == (
        len(actions[mergestatemod.ACTION_GET]) if wantfiledata else 0
    )

        )

        wantfiledata = updatedirstate and not branchmerge
        stats, getfiledata = applyupdates(
            repo,
            mresult,
            wc,
            p2,
            overwrite,
            wantfiledata,
            labels=labels,

        if updatedirstate:
            with repo.dirstate.parentchange():
                repo.setparents(fp1, fp2)
                mergestatemod.recordupdates(
                    repo, mresult.actionsdict, branchmerge, getfiledata
                )
                # update completed, clear state
                util.unlink(repo.vfs.join(b'updatestate'))

                if not branchmerge: