This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12431

rust-dirstatemap: properly decrement counter for tracked descendants
ClosedPublic

Authored by Alphare on Apr 4 2022, 11:30 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGfbc02ccc207e: rust-dirstatemap: properly decrement counter for tracked descendants
rHG3049072cc132: rust-dirstatemap: properly decrement counter for tracked descendants
Summary

I found this bug when writing unit tests after the fact for the DirstateMap.
We never decremented the tracked descendants counter since we were always
resetting the node data before reading it. This also drops the use of state,
in favor of the new API to get that information.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.Apr 4 2022, 11:30 AM
Alphare updated this revision to Diff 32760.Apr 4 2022, 1:38 PM
baymax updated this revision to Diff 32765.Apr 4 2022, 2:33 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)
⚠ This patch is intended for stable ⚠

Alphare added a commit: rHG3049072cc132: rust-dirstatemap: properly decrement counter for tracked descendants.Apr 4 2022, 4:06 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG3049072cc132: rust-dirstatemap: properly decrement counter for tracked descendants (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 32771

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

if let NodeData::CachedDirectory { .. } = &node.data { if let NodeData::CachedDirectory { .. } = &node.data {
node.data = NodeData::None node.data = NodeData::None
} }
} }
} else { } else {
return Ok(None); return Ok(None);
} }
} else { } else {
let had_entry = node.data.has_entry(); let entry = node.data.as_entry();
let was_tracked = entry.map_or(false, |entry| entry.tracked());
let had_entry = entry.is_some();
if had_entry { if had_entry {
node.data = NodeData::None node.data = NodeData::None
} }
if let Some(source) = &node.copy_source { if let Some(source) = &node.copy_source {
DirstateMap::count_dropped_path(unreachable_bytes, source); DirstateMap::count_dropped_path(unreachable_bytes, source);
node.copy_source = None node.copy_source = None
} }
dropped = Dropped { dropped = Dropped {
was_tracked: node was_tracked,
.data
.as_entry()
.map_or(false, |entry| entry.state().is_tracked()),
had_entry, had_entry,
had_copy_source: node.copy_source.take().is_some(), had_copy_source: node.copy_source.take().is_some(),
}; };
} }
// After recursion, for both leaf (rest_of_path is None) nodes and // After recursion, for both leaf (rest_of_path is None) nodes and
// parent nodes, remove a node if it just became empty. // parent nodes, remove a node if it just became empty.
let remove = !node.data.has_entry() let remove = !node.data.has_entry()
&& node.copy_source.is_none() && node.copy_source.is_none()