Mercurial > hg-stable

changeset 45307:00e9c5edcd58

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: pass mergeresult obj instead of actions dict in _resolvetrivial() Differential Revision: https://phab.mercurial-scm.org/D8824
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 24 Jul 2020 17:52:33 +0530
parents e7196f1da2b1
children 4ad6c4e9e35f
files mercurial/merge.py
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Fri Jul 24 17:49:13 2020 +0530
+++ b/mercurial/merge.py	Fri Jul 24 17:52:33 2020 +0530
@@ -959,26 +959,28 @@
     return mresult
 
 
-def _resolvetrivial(repo, wctx, mctx, ancestor, actions):
+def _resolvetrivial(repo, wctx, mctx, ancestor, mresult):
     """Resolves false conflicts where the nodeid changed but the content
        remained the same."""
     # We force a copy of actions.items() because we're going to mutate
     # actions as we resolve trivial conflicts.
-    for f, (m, args, msg) in list(actions.items()):
+    for f, (m, args, msg) in list(mresult.actions.items()):
         if (
             m == mergestatemod.ACTION_CHANGED_DELETED
             and f in ancestor
             and not wctx[f].cmp(ancestor[f])
         ):
             # local did change but ended up with same content
-            actions[f] = mergestatemod.ACTION_REMOVE, None, b'prompt same'
+            mresult.addfile(
+                f, mergestatemod.ACTION_REMOVE, None, b'prompt same'
+            )
         elif (
             m == mergestatemod.ACTION_DELETED_CHANGED
             and f in ancestor
             and not mctx[f].cmp(ancestor[f])
         ):
             # remote did change but ended up with same content
-            del actions[f]  # don't get = keep local deleted
+            mresult.removefile(f)  # don't get = keep local deleted
 
 
 def calculateupdates(
@@ -1127,7 +1129,7 @@
     prunedactions = sparse.filterupdatesactions(
         repo, wctx, mctx, branchmerge, mresult.actions
     )
-    _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult.actions)
+    _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult)
 
     mresult.setactions(prunedactions)
     return mresult