##// END OF EJS Templates
rust-dirstatemap: stop using `state()` in the cache logic...
Raphaël Gomès -
r50031:748ac640 default
parent child Browse files
Show More
@@ -1182,8 +1182,8 b' impl OwningDirstateMap {'
1182 if let Some(node) = map.get_node(directory)? {
1182 if let Some(node) = map.get_node(directory)? {
1183 // A node without a `DirstateEntry` was created to hold child
1183 // A node without a `DirstateEntry` was created to hold child
1184 // nodes, and is therefore a directory.
1184 // nodes, and is therefore a directory.
1185 let state = node.state()?;
1185 let is_dir = node.entry()?.is_none();
1186 Ok(state.is_none() && node.tracked_descendants_count() > 0)
1186 Ok(is_dir && node.tracked_descendants_count() > 0)
1187 } else {
1187 } else {
1188 Ok(false)
1188 Ok(false)
1189 }
1189 }
@@ -1198,8 +1198,8 b' impl OwningDirstateMap {'
1198 if let Some(node) = map.get_node(directory)? {
1198 if let Some(node) = map.get_node(directory)? {
1199 // A node without a `DirstateEntry` was created to hold child
1199 // A node without a `DirstateEntry` was created to hold child
1200 // nodes, and is therefore a directory.
1200 // nodes, and is therefore a directory.
1201 let state = node.state()?;
1201 let is_dir = node.entry()?.is_none();
1202 Ok(state.is_none() && node.descendants_with_entry_count() > 0)
1202 Ok(is_dir && node.descendants_with_entry_count() > 0)
1203 } else {
1203 } else {
1204 Ok(false)
1204 Ok(false)
1205 }
1205 }
General Comments 0
You need to be logged in to leave comments. Login now