# HG changeset patch # User Raphaël Gomès # Date 1649429812 -7200 # Node ID fcf6f943a1423f2b8968da3457c6ca24d2ceacd4 # Parent 3926bfef28e456546c53b4dd6fcc46c10a3130bf rust-dirstatemap: add `each_ancestor` argument to `get_node_mut` This forces the callers to think about if the counters in the ancestors need to be adjusted. Differential Revision: https://phab.mercurial-scm.org/D12529 diff -r 3926bfef28e4 -r fcf6f943a142 rust/hg-core/src/dirstate_tree/dirstate_map.rs --- a/rust/hg-core/src/dirstate_tree/dirstate_map.rs Fri Apr 08 16:53:06 2022 +0200 +++ b/rust/hg-core/src/dirstate_tree/dirstate_map.rs Fri Apr 08 16:56:52 2022 +0200 @@ -546,12 +546,17 @@ /// Returns a mutable reference to the node at `path` if it exists /// /// This takes `root` instead of `&mut self` so that callers can mutate - /// other fields while the returned borrow is still valid + /// other fields while the returned borrow is still valid. + /// + /// `each_ancestor` is a callback that is called for each ancestor node + /// when descending the tree. It is used to keep the different counters + /// of the `DirstateMap` up-to-date. fn get_node_mut<'tree>( on_disk: &'on_disk [u8], unreachable_bytes: &mut u32, root: &'tree mut ChildNodes<'on_disk>, path: &HgPath, + mut each_ancestor: impl FnMut(&mut Node), ) -> Result>, DirstateV2ParseError> { let mut children = root; let mut components = path.components(); @@ -563,6 +568,7 @@ .get_mut(component) { if let Some(next_component) = components.next() { + each_ancestor(child); component = next_component; children = &mut child.children; } else { @@ -786,6 +792,7 @@ &mut self.unreachable_bytes, &mut self.root, path, + |_ancestor| {}, )? { Some(node) => node, None => return Ok(()), @@ -807,6 +814,7 @@ &mut self.unreachable_bytes, &mut self.root, path, + |_ancestor| {}, )? { Some(node) => node, None => return Ok(()), @@ -1294,6 +1302,7 @@ unreachable_bytes, &mut map.root, key, + |_ancestor| {}, )? .and_then(|node| { if let Some(source) = &node.copy_source {