This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12432

rust-dirstatemap: correctly decrement the copies counter
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGce919b1a1063: rust-dirstatemap: correctly decrement the copies counter
rHGc2b373191f6b: rust-dirstatemap: correctly decrement the copies counter
Summary

This was caught when writing unit tests for the DirstateMap. We were always
setting had_copy_source to false since we erased the value just before.

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 32761.Apr 4 2022, 1:39 PM
baymax updated this revision to Diff 32766.Apr 4 2022, 2:33 PM

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

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

Revision Contents
Changeset List

Diff 32772

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

} }
} else { } else {
let entry = node.data.as_entry(); let entry = node.data.as_entry();
let was_tracked = entry.map_or(false, |entry| entry.tracked()); let was_tracked = entry.map_or(false, |entry| entry.tracked());
let had_entry = entry.is_some(); let had_entry = entry.is_some();
if had_entry { if had_entry {
node.data = NodeData::None node.data = NodeData::None
} }
let mut had_copy_source = false;
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);
had_copy_source = true;
node.copy_source = None node.copy_source = None
} }
dropped = Dropped { dropped = Dropped {
was_tracked, was_tracked,
had_entry, had_entry,
had_copy_source: node.copy_source.take().is_some(), had_copy_source,
}; };
} }
// 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()
&& node.children.is_empty(); && node.children.is_empty();
if remove { if remove {