This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12538

rust-dirstatemap: stop using `state()` in the cache logic
Needs ReviewPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

Let's use the new API

Diff Detail

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

Revision Contents
Changeset List

Diff 33101

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

pub fn has_tracked_dir( pub fn has_tracked_dir(
&mut self, &mut self,
directory: &HgPath, directory: &HgPath,
) -> Result<bool, DirstateError> { ) -> Result<bool, DirstateError> {
self.with_dmap_mut(|map| { self.with_dmap_mut(|map| {
if let Some(node) = map.get_node(directory)? { if let Some(node) = map.get_node(directory)? {
// A node without a `DirstateEntry` was created to hold child // A node without a `DirstateEntry` was created to hold child
// nodes, and is therefore a directory. // nodes, and is therefore a directory.
let state = node.state()?; let is_dir = node.entry()?.is_none();
Ok(state.is_none() && node.tracked_descendants_count() > 0) Ok(is_dir && node.tracked_descendants_count() > 0)
} else { } else {
Ok(false) Ok(false)
} }
}) })
} }
pub fn has_dir( pub fn has_dir(
&mut self, &mut self,
directory: &HgPath, directory: &HgPath,
) -> Result<bool, DirstateError> { ) -> Result<bool, DirstateError> {
self.with_dmap_mut(|map| { self.with_dmap_mut(|map| {
if let Some(node) = map.get_node(directory)? { if let Some(node) = map.get_node(directory)? {
// A node without a `DirstateEntry` was created to hold child // A node without a `DirstateEntry` was created to hold child
// nodes, and is therefore a directory. // nodes, and is therefore a directory.
let state = node.state()?; let is_dir = node.entry()?.is_none();
Ok(state.is_none() && node.descendants_with_entry_count() > 0) Ok(is_dir && node.descendants_with_entry_count() > 0)
} else { } else {
Ok(false) Ok(false)
} }
}) })
} }
#[timed] #[timed]
pub fn pack_v1( pub fn pack_v1(