( )⚙ D12525 rust-dirstatemap: add `clear_cached_mtime` helper method

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12525

rust-dirstatemap: add `clear_cached_mtime` helper method
Needs ReviewPublic

Authored by Alphare on Tue, Apr 12, 12:04 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This will help remove the get_or_insert method, which is dangerous because it
does not take the DirstateMap counters into account.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

Diff 33088

rust/hg-core/src/dirstate_tree/dirstate_map.rs

|_ancestor| {}, |_ancestor| {},
)?; )?;
let entry = node.data.as_entry_mut().expect("entry should exist"); let entry = node.data.as_entry_mut().expect("entry should exist");
entry.set_possibly_dirty(); entry.set_possibly_dirty();
node.data = NodeData::Entry(*entry); node.data = NodeData::Entry(*entry);
Ok(()) Ok(())
} }
/// Clears the cached mtime for the (potential) folder at `path`.
pub(super) fn clear_cached_mtime(
&mut self,
path: &HgPath,
) -> Result<(), DirstateV2ParseError> {
let node = match DirstateMap::get_node_mut(
self.on_disk,
&mut self.unreachable_bytes,
&mut self.root,
path,
)? {
Some(node) => node,
None => return Ok(()),
};
if let NodeData::CachedDirectory { .. } = &node.data {
node.data = NodeData::None
}
Ok(())
}
fn iter_nodes<'tree>( fn iter_nodes<'tree>(
&'tree self, &'tree self,
) -> impl Iterator< ) -> impl Iterator<
Item = Result<NodeRef<'tree, 'on_disk>, DirstateV2ParseError>, Item = Result<NodeRef<'tree, 'on_disk>, DirstateV2ParseError>,
> + 'tree { > + 'tree {
// Depth first tree traversal. // Depth first tree traversal.
// //
// If we could afford internal iteration and recursion, // If we could afford internal iteration and recursion,

rust/hg-core/src/dirstate_tree/status.rs

outcome.dirty = common.ignore_patterns_have_changed == Some(true) outcome.dirty = common.ignore_patterns_have_changed == Some(true)
|| !outdated.is_empty() || !outdated.is_empty()
|| !new_cachable.is_empty(); || !new_cachable.is_empty();
// Remove outdated mtimes before adding new mtimes, in case a given // Remove outdated mtimes before adding new mtimes, in case a given
// directory is both // directory is both
for path in &outdated { for path in &outdated {
let node = dmap.get_or_insert(path)?; dmap.clear_cached_mtime(path)?;
if let NodeData::CachedDirectory { .. } = &node.data {
node.data = NodeData::None
}
} }
for (path, mtime) in &new_cachable { for (path, mtime) in &new_cachable {
let node = dmap.get_or_insert(path)?; let node = dmap.get_or_insert(path)?;
match &node.data { match &node.data {
NodeData::Entry(_) => {} // Don’t overwrite an entry NodeData::Entry(_) => {} // Don’t overwrite an entry
NodeData::CachedDirectory { .. } | NodeData::None => { NodeData::CachedDirectory { .. } | NodeData::None => {
node.data = NodeData::CachedDirectory { mtime: *mtime } node.data = NodeData::CachedDirectory { mtime: *mtime }
} }