Patchwork D8821: merge: add removefile() to mergeresult object

login
register
mail settings
Submitter phabricator
Date July 25, 2020, 10 a.m.
Message ID <differential-rev-PHID-DREV-ecof2r25vxjb7an4pihn-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/46892/
State Superseded
Headers show

Comments

phabricator - July 25, 2020, 10 a.m.
pulkit created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  There are cases where some further calculation makes the file not needing to be
  merged anymore and hence needs to be dropped in mergeresult object. This adds a
  function for that.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -576,6 +576,11 @@ 
         """
         self._actions[filename] = (action, data, message)
 
+    def removefile(self, filename):
+        """ removes a file from the mergeresult object as the file might
+        not merging anymore """
+        del self._actions[filename]
+
     @property
     def actions(self):
         return self._actions
@@ -1929,7 +1934,7 @@ 
                         b'prompt recreating',
                     )
                 else:
-                    del mresult.actions[f]
+                    mresult.removefile(f)
 
         # Convert to dictionary-of-lists format
         actions = mresult.actionsdict