diff mercurial/commit.py @ 45382:0652a533fe3c

mergestate: use _stateextras instead of merge records for commit related info There is a set of information related to a merge which is needed on commit. We want to store such information in the mergestate so that we can read it while committing. For this purpose, we are using merge records and introduced a merge entry state for that. However this won't scale and is not clean way to implement this. This patch reworks the existing logic related to this to use _stateextras and read from it. Right now the information stored is not very descriptive but it will be in next patch. Using _stateextras also makes MERGE_RECORD_MERGED_OTHER useless and only to be kept for BC. Differential Revision: https://phab.mercurial-scm.org/D8920
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 10 Aug 2020 15:29:02 +0530
parents 54eeb1a0e325
children f52b0297acc8
line wrap: on
line diff
--- a/mercurial/commit.py	Mon Aug 10 15:09:44 2020 +0530
+++ b/mercurial/commit.py	Mon Aug 10 15:29:02 2020 +0530
@@ -325,10 +325,7 @@
         elif not fparentancestors:
             # TODO: this whole if-else might be simplified much more
             ms = mergestate.mergestate.read(repo)
-            if (
-                fname in ms
-                and ms[fname] == mergestate.MERGE_RECORD_MERGED_OTHER
-            ):
+            if ms.extras(fname).get(b'filenode-source') == b'other':
                 fparent1, fparent2 = fparent2, nullid
 
     # is the file changed?