Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-item: replace another usage of `merged`
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 01 Oct 2021 03:29:33 +0200
changeset 48164 8f88307f8e07
parent 48163 e0b4e4f80fff
child 48165 c29d312657d2
dirstate-item: replace another usage of `merged` We simply spell out the logic here. This was the last usage of `merged`. Differential Revision: https://phab.mercurial-scm.org/D11596
mercurial/pure/parsers.py file | annotate | diff | comparison | revisions
rust/hg-core/src/dirstate/entry.rs file | annotate | diff | comparison | revisions 
--- a/mercurial/pure/parsers.py	Fri Oct 01 03:28:01 2021 +0200
+++ b/mercurial/pure/parsers.py	Fri Oct 01 03:29:33 2021 +0200
@@ -334,7 +334,7 @@
             raise RuntimeError('untracked item')
         elif self.removed:
             return b'r'
-        elif self.merged:
+        elif self._p1_tracked and self._p2_info:
             return b'm'
         elif self.added:
             return b'a'
--- a/rust/hg-core/src/dirstate/entry.rs	Fri Oct 01 03:28:01 2021 +0200
+++ b/rust/hg-core/src/dirstate/entry.rs	Fri Oct 01 03:29:33 2021 +0200
@@ -219,7 +219,10 @@
         }
         if self.removed() {
             EntryState::Removed
-        } else if self.merged() {
+        } else if self
+            .flags
+            .contains(Flags::WDIR_TRACKED | Flags::P1_TRACKED | Flags::P2_INFO)
+        {
             EntryState::Merged
         } else if self.added() {
             EntryState::Added
hg-stable