This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12527

rust-dirstatemap: inline the last `get_or_insert` call
Needs ReviewPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

The get_or_insert method was dangerous because it did not take the
DirstateMap counters into account. This particular instance does not need
to update the counters.

Diff Detail

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

Revision Contents
Changeset List

Diff 33090

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

return Ok(Some(child)); return Ok(Some(child));
} }
} else { } else {
return Ok(None); return Ok(None);
} }
} }
} }
pub(super) fn get_or_insert<'tree, 'path>(
&'tree mut self,
path: &HgPath,
) -> Result<&'tree mut Node<'on_disk>, DirstateV2ParseError> {
Self::get_or_insert_node(
self.on_disk,
&mut self.unreachable_bytes,
&mut self.root,
path,
WithBasename::to_cow_owned,
|_| {},
)
}
fn get_or_insert_node<'tree, 'path>( fn get_or_insert_node<'tree, 'path>(
on_disk: &'on_disk [u8], on_disk: &'on_disk [u8],
unreachable_bytes: &mut u32, unreachable_bytes: &mut u32,
root: &'tree mut ChildNodes<'on_disk>, root: &'tree mut ChildNodes<'on_disk>,
path: &'path HgPath, path: &'path HgPath,
to_cow: impl Fn( to_cow: impl Fn(
WithBasename<&'path HgPath>, WithBasename<&'path HgPath>,
) -> WithBasename<Cow<'on_disk, HgPath>>, ) -> WithBasename<Cow<'on_disk, HgPath>>,
for res in self.iter() { for res in self.iter() {
let (path, entry) = res?; let (path, entry) = res?;
if entry.p2_info() { if entry.p2_info() {
files_with_p2_info.push(path.to_owned()) files_with_p2_info.push(path.to_owned())
} }
} }
self.with_dmap_mut(|map| { self.with_dmap_mut(|map| {
for path in files_with_p2_info.iter() { for path in files_with_p2_info.iter() {
let node = map.get_or_insert(path)?; let node = DirstateMap::get_or_insert_node(
map.on_disk,
&mut map.unreachable_bytes,
&mut map.root,
path,
WithBasename::to_cow_owned,
|_| {},
)?;
let entry = let entry =
node.data.as_entry_mut().expect("entry should exist"); node.data.as_entry_mut().expect("entry should exist");
entry.drop_merge_data(); entry.drop_merge_data();
if let Some(source) = node.copy_source.take().as_deref() { if let Some(source) = node.copy_source.take().as_deref() {
copies.push((path.to_owned(), source.to_owned())); copies.push((path.to_owned(), source.to_owned()));
} }
} }
Ok(copies) Ok(copies)