[Request] [+ ] D12538: rust-dirstatemap: stop using `state()` in the cache logic
Alphare (Raphaël Gomès)
phabricator at mercurial-scm.org
Tue Apr 12 16:06:26 UTC 2022
Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
Let's use the new API
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D12538
AFFECTED FILES
rust/hg-core/src/dirstate_tree/dirstate_map.rs
CHANGE DETAILS
diff --git a/rust/hg-core/src/dirstate_tree/dirstate_map.rs b/rust/hg-core/src/dirstate_tree/dirstate_map.rs
--- a/rust/hg-core/src/dirstate_tree/dirstate_map.rs
+++ b/rust/hg-core/src/dirstate_tree/dirstate_map.rs
@@ -1182,8 +1182,8 @@
if let Some(node) = map.get_node(directory)? {
// A node without a `DirstateEntry` was created to hold child
// nodes, and is therefore a directory.
- let state = node.state()?;
- Ok(state.is_none() && node.tracked_descendants_count() > 0)
+ let is_dir = node.entry()?.is_none();
+ Ok(is_dir && node.tracked_descendants_count() > 0)
} else {
Ok(false)
}
@@ -1198,8 +1198,8 @@
if let Some(node) = map.get_node(directory)? {
// A node without a `DirstateEntry` was created to hold child
// nodes, and is therefore a directory.
- let state = node.state()?;
- Ok(state.is_none() && node.descendants_with_entry_count() > 0)
+ let is_dir = node.entry()?.is_none();
+ Ok(is_dir && node.descendants_with_entry_count() > 0)
} else {
Ok(false)
}
To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20220412/ebda4a10/attachment-0001.html>
More information about the Mercurial-patches
mailing list