Mercurial > public > mercurial-scm > hg

diff rust/hg-core/src/dirstate/entry.rs @ 48152:8f88307f8e07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 01 Oct 2021 03:29:33 +0200
parents d71feb05d5b6
children c29d312657d2
line wrap: on
line diff
--- 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