diff rust/hg-core/src/dirstate/entry.rs @ 48061:060cd909439f

dirstate: drop all logic around the "non-normal" sets

The dirstate has a lot of code to compute a set of all "non-normal" and
"from_other_parent" entries.

This is all used in one, unique, location, when `setparent` is called and moved
from a merge to a non merge. At that time, any "merge related" information has
to be dropped. This is mostly useful for command like `graft` or `shelve` that
move to a single-parent state -before- the commit. Otherwise the commit will
already have removed all traces of the merge information in the dirstate (e.g.
for a regular merges).

The bookkeeping for these sets is quite invasive. And it seems simpler to just
drop it and do the full computation in the single location where we actually
use it (since we have to do the computation at least once anyway).

This simplify the code a lot, and clarify why this kind of computation is
needed.

The possible drawback compared to the previous code are:
- if the operation happens in a loop, we will end up doing it multiple time,
- the C code to detect entry of interest have been dropped, for now. It will be
  re-introduced later, with a processing code directly in C for even faster
  operation.

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

--- a/rust/hg-core/src/dirstate/entry.rs	Wed Sep 22 17:46:29 2021 +0200
+++ b/rust/hg-core/src/dirstate/entry.rs	Tue Sep 28 20:05:37 2021 +0200
@@ -294,11 +294,7 @@
         (self.state().into(), self.mode(), self.size(), self.mtime())
     }
 
-    pub fn is_non_normal(&self) -> bool {
-        self.state() != EntryState::Normal || self.mtime() == MTIME_UNSET
-    }
-
-    pub fn is_from_other_parent(&self) -> bool {
+    pub(crate) fn is_from_other_parent(&self) -> bool {
         self.state() == EntryState::Normal
             && self.size() == SIZE_FROM_OTHER_PARENT
     }