dirstate: inline the merged_removed logic

It is used internally for compatibilty with size used in the `v1` format, but
this is the only use. So we can simply inline it.

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

mercurial/cext/parsers.c

@@ -210,7 +210,8 b' static inline int dirstate_item_c_v1_mod'
 
 static inline int dirstate_item_c_v1_size(dirstateItemObject *self)
 {
-	if (dirstate_item_c_merged_removed(self)) {
+	if (dirstate_item_c_removed(self) &&
+	    (self->flags & dirstate_flag_merged)) {
 		return dirstate_v1_nonnormal;
 	} else if (dirstate_item_c_from_p2_removed(self)) {
 		return dirstate_v1_from_p2;

mercurial/pure/parsers.py

@@ -386,7 +386,7 b' class DirstateItem(object):'
             # the object has no state to record, this is -currently-
             # unsupported
             raise RuntimeError('untracked item')
-        elif self.merged_removed:
+        elif self.removed and self._merged:
             return NONNORMAL
         elif self.from_p2_removed:
             return FROM_P2

rust/hg-core/src/dirstate/entry.rs

@@ -216,7 +216,7 b' impl DirstateEntry {'
     }
 
     pub fn size(&self) -> i32 {
-        if self.merged_removed() {
+        if self.removed() && self.flags.contains(Flags::MERGED) {
             SIZE_NON_NORMAL
         } else if self.from_p2_removed() {
             SIZE_FROM_OTHER_PARENT