This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12526

rust-dirstatemap: add `set_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 33089

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

None => return Ok(()), None => return Ok(()),
}; };
if let NodeData::CachedDirectory { .. } = &node.data { if let NodeData::CachedDirectory { .. } = &node.data {
node.data = NodeData::None node.data = NodeData::None
} }
Ok(()) Ok(())
} }
/// Sets the cached mtime for the (potential) folder at `path`.
pub(super) fn set_cached_mtime(
&mut self,
path: &HgPath,
mtime: TruncatedTimestamp,
) -> 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(()),
};
match &node.data {
NodeData::Entry(_) => {} // Don’t overwrite an entry
NodeData::CachedDirectory { .. } | NodeData::None => {
node.data = NodeData::CachedDirectory { mtime }
}
}
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

use crate::dirstate::entry::TruncatedTimestamp; use crate::dirstate::entry::TruncatedTimestamp;
use crate::dirstate::status::IgnoreFnType; use crate::dirstate::status::IgnoreFnType;
use crate::dirstate::status::StatusPath; use crate::dirstate::status::StatusPath;
use crate::dirstate_tree::dirstate_map::BorrowedPath; use crate::dirstate_tree::dirstate_map::BorrowedPath;
use crate::dirstate_tree::dirstate_map::ChildNodesRef; use crate::dirstate_tree::dirstate_map::ChildNodesRef;
use crate::dirstate_tree::dirstate_map::DirstateMap; use crate::dirstate_tree::dirstate_map::DirstateMap;
use crate::dirstate_tree::dirstate_map::NodeData;
use crate::dirstate_tree::dirstate_map::NodeRef; use crate::dirstate_tree::dirstate_map::NodeRef;
use crate::dirstate_tree::on_disk::DirstateV2ParseError; use crate::dirstate_tree::on_disk::DirstateV2ParseError;
use crate::matchers::get_ignore_function; use crate::matchers::get_ignore_function;
use crate::matchers::Matcher; use crate::matchers::Matcher;
use crate::utils::files::get_bytes_from_os_string; use crate::utils::files::get_bytes_from_os_string;
use crate::utils::files::get_path_from_bytes; use crate::utils::files::get_path_from_bytes;
use crate::utils::hg_path::HgPath; use crate::utils::hg_path::HgPath;
use crate::BadMatch; use crate::BadMatch;
|| !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 {
dmap.clear_cached_mtime(path)?; dmap.clear_cached_mtime(path)?;
} }
for (path, mtime) in &new_cachable { for (path, mtime) in &new_cachable {
let node = dmap.get_or_insert(path)?; dmap.set_cached_mtime(path, *mtime)?;
match &node.data {
NodeData::Entry(_) => {} // Don’t overwrite an entry
NodeData::CachedDirectory { .. } | NodeData::None => {
node.data = NodeData::CachedDirectory { mtime: *mtime }
}
}
} }
Ok((outcome, warnings)) Ok((outcome, warnings))
} }
/// Bag of random things needed by various parts of the algorithm. Reduces the /// Bag of random things needed by various parts of the algorithm. Reduces the
/// number of parameters passed to functions. /// number of parameters passed to functions.
struct StatusCommon<'a, 'tree, 'on_disk: 'tree> { struct StatusCommon<'a, 'tree, 'on_disk: 'tree> {