diff rust/hg-core/src/dirstate/entry.rs @ 48149:6ac2b417d5d7

dirstate-item: directly use `p2_info` in `v1_size`

This is simpler.

Differential Revision: https://phab.mercurial-scm.org/D11593

--- a/rust/hg-core/src/dirstate/entry.rs	Fri Oct 01 04:04:38 2021 +0200
+++ b/rust/hg-core/src/dirstate/entry.rs	Fri Oct 01 03:24:57 2021 +0200
@@ -250,16 +250,12 @@
             && self.flags.contains(Flags::P1_TRACKED | Flags::P2_INFO)
         {
             SIZE_NON_NORMAL
-        } else if self.removed() && self.flags.contains(Flags::P2_INFO) {
+        } else if self.flags.contains(Flags::P2_INFO) {
             SIZE_FROM_OTHER_PARENT
         } else if self.removed() {
             0
-        } else if self.merged() {
-            SIZE_FROM_OTHER_PARENT
         } else if self.added() {
             SIZE_NON_NORMAL
-        } else if self.from_p2() {
-            SIZE_FROM_OTHER_PARENT
         } else if let Some((_mode, size)) = self.mode_size {
             size
         } else {