comparison mercurial/merge.py @ 45290:d70c972cec74

sparse: pass mergeresult obj in sparse.filterupdatesactions() (API)

Not able to see much which can be improved in this function by passing in
mergeresult object but for API consistency and no function directly touching
actions dict, it sounds like a good idea.

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

45289:1d1f112da75c

    if wctx.rev() is None:
        fractions = _forgetremoved(wctx, mctx, branchmerge)
        mresult.updateactions(fractions)

    prunedactions = sparse.filterupdatesactions(
        repo, wctx, mctx, branchmerge, mresult.actions
    )
    mresult.setactions(prunedactions)
    _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult)

    return mresult

45290:d70c972cec74

    if wctx.rev() is None:
        fractions = _forgetremoved(wctx, mctx, branchmerge)
        mresult.updateactions(fractions)

    sparse.filterupdatesactions(repo, wctx, mctx, branchmerge, mresult)
    _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult)

    return mresult