comparison 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
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 28 Sep 2021 20:05:37 +0200
parents 98c0408324e6
children 2943955304b3
comparison
equal deleted inserted replaced
48060:a660d8a53267 48061:060cd909439f
292 /// will need to keep the same format. 292 /// will need to keep the same format.
293 pub fn v1_data(&self) -> (u8, i32, i32, i32) { 293 pub fn v1_data(&self) -> (u8, i32, i32, i32) {
294 (self.state().into(), self.mode(), self.size(), self.mtime()) 294 (self.state().into(), self.mode(), self.size(), self.mtime())
295 } 295 }
296 296
297 pub fn is_non_normal(&self) -> bool { 297 pub(crate) fn is_from_other_parent(&self) -> bool {
298 self.state() != EntryState::Normal || self.mtime() == MTIME_UNSET
299 }
300
301 pub fn is_from_other_parent(&self) -> bool {
302 self.state() == EntryState::Normal 298 self.state() == EntryState::Normal
303 && self.size() == SIZE_FROM_OTHER_PARENT 299 && self.size() == SIZE_FROM_OTHER_PARENT
304 } 300 }
305 301
306 // TODO: other platforms 302 // TODO: other platforms