[Updated] D8826: merge: introduce mergeresult.updateactions() and use it

[pulkit (Pulkit Goyal)]

Closed by commit rHG3f5ac87ae10f: merge: introduce mergeresult.updateactions() and use it (authored by pulkit).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8826?vs=22110&id=22209

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8826/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8826

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -622,6 +622,9 @@
     def setactions(self, actions):
         self._actions = actions
 
+    def updateactions(self, updates):
+        self._actions.update(updates)
+
     def hasconflicts(self):
         """ tells whether this merge resulted in some actions which can
         result in conflicts or not """
@@ -1125,7 +1128,7 @@
 
     if wctx.rev() is None:
         fractions = _forgetremoved(wctx, mctx, branchmerge)
-        mresult.actions.update(fractions)
+        mresult.updateactions(fractions)
 
     prunedactions = sparse.filterupdatesactions(
         repo, wctx, mctx, branchmerge, mresult.actions



To: pulkit, #hg-reviewers, indygreg
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200802/1c1fcd12/attachment-0002.html>