diff 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

--- a/mercurial/merge.py	Fri Jul 24 19:13:20 2020 +0530
+++ b/mercurial/merge.py	Fri Jul 24 19:19:47 2020 +0530
@@ -1130,10 +1130,7 @@
         fractions = _forgetremoved(wctx, mctx, branchmerge)
         mresult.updateactions(fractions)
 
-    prunedactions = sparse.filterupdatesactions(
-        repo, wctx, mctx, branchmerge, mresult.actions
-    )
-    mresult.setactions(prunedactions)
+    sparse.filterupdatesactions(repo, wctx, mctx, branchmerge, mresult)
     _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult)
 
     return mresult