dirstate_map.rs
647 lines
| 20.4 KiB
| application/rls-services+xml
|
RustLexer
|
r47872 | use bytes_cast::BytesCast; | ||
|
r47888 | use micro_timer::timed; | ||
|
r47889 | use std::convert::TryInto; | ||
|
r47865 | use std::path::PathBuf; | ||
|
r47867 | use super::path_with_basename::WithBasename; | ||
|
r47872 | use crate::dirstate::parsers::clear_ambiguous_mtime; | ||
use crate::dirstate::parsers::pack_entry; | ||||
use crate::dirstate::parsers::packed_entry_size; | ||||
|
r47868 | use crate::dirstate::parsers::parse_dirstate_entries; | ||
use crate::dirstate::parsers::parse_dirstate_parents; | ||||
|
r47871 | use crate::dirstate::parsers::Timestamp; | ||
|
r47865 | use crate::matchers::Matcher; | ||
|
r47867 | use crate::revlog::node::NULL_NODE; | ||
|
r47865 | use crate::utils::hg_path::{HgPath, HgPathBuf}; | ||
use crate::CopyMapIter; | ||||
use crate::DirstateEntry; | ||||
use crate::DirstateError; | ||||
use crate::DirstateMapError; | ||||
use crate::DirstateParents; | ||||
use crate::DirstateStatus; | ||||
use crate::EntryState; | ||||
|
r47889 | use crate::FastHashMap; | ||
|
r47865 | use crate::PatternFileWarning; | ||
use crate::StateMapIter; | ||||
use crate::StatusError; | ||||
use crate::StatusOptions; | ||||
pub struct DirstateMap { | ||||
|
r47867 | parents: Option<DirstateParents>, | ||
dirty_parents: bool, | ||||
|
r47883 | pub(super) root: ChildNodes, | ||
|
r47873 | |||
/// Number of nodes anywhere in the tree that have `.entry.is_some()`. | ||||
nodes_with_entry_count: usize, | ||||
/// Number of nodes anywhere in the tree that have | ||||
/// `.copy_source.is_some()`. | ||||
nodes_with_copy_source_count: usize, | ||||
|
r47867 | } | ||
/// Using a plain `HgPathBuf` of the full path from the repository root as a | ||||
/// map key would also work: all paths in a given map have the same parent | ||||
/// path, so comparing full paths gives the same result as comparing base | ||||
/// names. However `BTreeMap` would waste time always re-comparing the same | ||||
/// string prefix. | ||||
|
r47889 | pub(super) type ChildNodes = FastHashMap<WithBasename<HgPathBuf>, Node>; | ||
|
r47867 | |||
|
r47876 | /// Represents a file or a directory | ||
|
r47867 | #[derive(Default)] | ||
|
r47883 | pub(super) struct Node { | ||
|
r47876 | /// `None` for directories | ||
|
r47883 | pub(super) entry: Option<DirstateEntry>, | ||
|
r47876 | |||
|
r47883 | pub(super) copy_source: Option<HgPathBuf>, | ||
|
r47876 | |||
|
r47883 | pub(super) children: ChildNodes, | ||
|
r47876 | |||
/// How many (non-inclusive) descendants of this node are tracked files | ||||
tracked_descendants_count: usize, | ||||
} | ||||
impl Node { | ||||
|
r47883 | pub(super) fn state(&self) -> Option<EntryState> { | ||
self.entry.as_ref().map(|entry| entry.state) | ||||
} | ||||
|
r47865 | } | ||
|
r47870 | /// `(full_path, entry, copy_source)` | ||
type NodeDataMut<'a> = ( | ||||
&'a WithBasename<HgPathBuf>, | ||||
&'a mut Option<DirstateEntry>, | ||||
&'a mut Option<HgPathBuf>, | ||||
); | ||||
|
r47865 | impl DirstateMap { | ||
pub fn new() -> Self { | ||||
|
r47867 | Self { | ||
parents: None, | ||||
dirty_parents: false, | ||||
|
r47889 | root: ChildNodes::default(), | ||
|
r47873 | nodes_with_entry_count: 0, | ||
nodes_with_copy_source_count: 0, | ||||
|
r47867 | } | ||
} | ||||
|
r47869 | fn get_node(&self, path: &HgPath) -> Option<&Node> { | ||
let mut children = &self.root; | ||||
let mut components = path.components(); | ||||
let mut component = | ||||
components.next().expect("expected at least one components"); | ||||
loop { | ||||
let child = children.get(component)?; | ||||
if let Some(next_component) = components.next() { | ||||
component = next_component; | ||||
children = &child.children; | ||||
} else { | ||||
return Some(child); | ||||
} | ||||
} | ||||
} | ||||
|
r47876 | /// Returns a mutable reference to the node at `path` if it exists | ||
/// | ||||
|
r47873 | /// This takes `root` instead of `&mut self` so that callers can mutate | ||
/// other fields while the returned borrow is still valid | ||||
|
r47874 | fn get_node_mut<'tree>( | ||
root: &'tree mut ChildNodes, | ||||
path: &HgPath, | ||||
) -> Option<&'tree mut Node> { | ||||
|
r47890 | Self::get_node_mut_tracing_ancestors(root, path, |_| {}) | ||
|
r47876 | } | ||
|
r47890 | /// Same as `get_node_mut`, and calls `each_ancestor` for each ancestor of | ||
/// the node. | ||||
|
r47876 | /// | ||
|
r47890 | /// Note that `each_ancestor` may be called (with what would be ancestors) | ||
/// even if it turns out there is no node at `path`. | ||||
fn get_node_mut_tracing_ancestors<'tree>( | ||||
|
r47876 | root: &'tree mut ChildNodes, | ||
path: &HgPath, | ||||
|
r47890 | mut each_ancestor: impl FnMut(&mut Node), | ||
|
r47876 | ) -> Option<&'tree mut Node> { | ||
|
r47874 | let mut children = root; | ||
let mut components = path.components(); | ||||
let mut component = | ||||
components.next().expect("expected at least one components"); | ||||
loop { | ||||
let child = children.get_mut(component)?; | ||||
if let Some(next_component) = components.next() { | ||||
|
r47890 | each_ancestor(child); | ||
|
r47874 | component = next_component; | ||
children = &mut child.children; | ||||
} else { | ||||
return Some(child); | ||||
} | ||||
} | ||||
} | ||||
|
r47873 | fn get_or_insert_node<'tree>( | ||
root: &'tree mut ChildNodes, | ||||
path: &HgPath, | ||||
) -> &'tree mut Node { | ||||
|
r47890 | Self::get_or_insert_node_tracing_ancestors(root, path, |_| {}) | ||
} | ||||
fn get_or_insert_node_tracing_ancestors<'tree>( | ||||
root: &'tree mut ChildNodes, | ||||
path: &HgPath, | ||||
mut each_ancestor: impl FnMut(&mut Node), | ||||
) -> &'tree mut Node { | ||||
|
r47873 | let mut child_nodes = root; | ||
|
r47867 | let mut inclusive_ancestor_paths = | ||
WithBasename::inclusive_ancestors_of(path); | ||||
let mut ancestor_path = inclusive_ancestor_paths | ||||
.next() | ||||
.expect("expected at least one inclusive ancestor"); | ||||
loop { | ||||
|
r47886 | // TODO: can we avoid allocating an owned key in cases where the | ||
// map already contains that key, without introducing double | ||||
// lookup? | ||||
|
r47867 | let child_node = | ||
|
r47886 | child_nodes.entry(ancestor_path.to_owned()).or_default(); | ||
|
r47867 | if let Some(next) = inclusive_ancestor_paths.next() { | ||
|
r47890 | each_ancestor(child_node); | ||
|
r47867 | ancestor_path = next; | ||
child_nodes = &mut child_node.children; | ||||
} else { | ||||
return child_node; | ||||
} | ||||
} | ||||
|
r47865 | } | ||
|
r47870 | |||
|
r47890 | fn add_or_remove_file( | ||
|
r47873 | &mut self, | ||
path: &HgPath, | ||||
|
r47890 | old_state: EntryState, | ||
|
r47873 | new_entry: DirstateEntry, | ||
) { | ||||
|
r47876 | let tracked_count_increment = | ||
|
r47890 | match (old_state.is_tracked(), new_entry.state.is_tracked()) { | ||
|
r47876 | (false, true) => 1, | ||
(true, false) => -1, | ||||
_ => 0, | ||||
}; | ||||
|
r47890 | let node = Self::get_or_insert_node_tracing_ancestors( | ||
&mut self.root, | ||||
path, | ||||
|ancestor| { | ||||
// We can’t use `+= increment` because the counter is unsigned, | ||||
// and we want debug builds to detect accidental underflow | ||||
// through zero | ||||
match tracked_count_increment { | ||||
1 => ancestor.tracked_descendants_count += 1, | ||||
-1 => ancestor.tracked_descendants_count -= 1, | ||||
_ => {} | ||||
} | ||||
}, | ||||
); | ||||
if node.entry.is_none() { | ||||
self.nodes_with_entry_count += 1 | ||||
|
r47873 | } | ||
|
r47890 | node.entry = Some(new_entry) | ||
|
r47873 | } | ||
|
r47870 | fn iter_nodes<'a>( | ||
&'a self, | ||||
) -> impl Iterator<Item = (&'a WithBasename<HgPathBuf>, &'a Node)> + 'a | ||||
{ | ||||
// Depth first tree traversal. | ||||
// | ||||
// If we could afford internal iteration and recursion, | ||||
// this would look like: | ||||
// | ||||
// ``` | ||||
// fn traverse_children( | ||||
// children: &ChildNodes, | ||||
// each: &mut impl FnMut(&Node), | ||||
// ) { | ||||
// for child in children.values() { | ||||
// traverse_children(&child.children, each); | ||||
// each(child); | ||||
// } | ||||
// } | ||||
// ``` | ||||
// | ||||
// However we want an external iterator and therefore can’t use the | ||||
// call stack. Use an explicit stack instead: | ||||
let mut stack = Vec::new(); | ||||
let mut iter = self.root.iter(); | ||||
std::iter::from_fn(move || { | ||||
while let Some((key, child_node)) = iter.next() { | ||||
// Pseudo-recursion | ||||
let new_iter = child_node.children.iter(); | ||||
let old_iter = std::mem::replace(&mut iter, new_iter); | ||||
stack.push((key, child_node, old_iter)); | ||||
} | ||||
// Found the end of a `children.iter()` iterator. | ||||
if let Some((key, child_node, next_iter)) = stack.pop() { | ||||
// "Return" from pseudo-recursion by restoring state from the | ||||
// explicit stack | ||||
iter = next_iter; | ||||
Some((key, child_node)) | ||||
} else { | ||||
// Reached the bottom of the stack, we’re done | ||||
None | ||||
} | ||||
}) | ||||
} | ||||
/// Mutable iterator for the `(entry, copy source)` of each node. | ||||
/// | ||||
/// It would not be safe to yield mutable references to nodes themeselves | ||||
/// with `-> impl Iterator<Item = &mut Node>` since child nodes are | ||||
/// reachable from their ancestor nodes, potentially creating multiple | ||||
/// `&mut` references to a given node. | ||||
fn iter_node_data_mut<'a>( | ||||
&'a mut self, | ||||
) -> impl Iterator<Item = NodeDataMut<'a>> + 'a { | ||||
// Explict stack for pseudo-recursion, see `iter_nodes` above. | ||||
let mut stack = Vec::new(); | ||||
let mut iter = self.root.iter_mut(); | ||||
std::iter::from_fn(move || { | ||||
while let Some((key, child_node)) = iter.next() { | ||||
// Pseudo-recursion | ||||
let data = | ||||
(key, &mut child_node.entry, &mut child_node.copy_source); | ||||
let new_iter = child_node.children.iter_mut(); | ||||
let old_iter = std::mem::replace(&mut iter, new_iter); | ||||
stack.push((data, old_iter)); | ||||
} | ||||
// Found the end of a `children.values_mut()` iterator. | ||||
if let Some((data, next_iter)) = stack.pop() { | ||||
// "Return" from pseudo-recursion by restoring state from the | ||||
// explicit stack | ||||
iter = next_iter; | ||||
Some(data) | ||||
} else { | ||||
// Reached the bottom of the stack, we’re done | ||||
None | ||||
} | ||||
}) | ||||
} | ||||
|
r47865 | } | ||
impl super::dispatch::DirstateMapMethods for DirstateMap { | ||||
fn clear(&mut self) { | ||||
|
r47867 | self.set_parents(&DirstateParents { | ||
p1: NULL_NODE, | ||||
p2: NULL_NODE, | ||||
}); | ||||
|
r47873 | self.root.clear(); | ||
self.nodes_with_entry_count = 0; | ||||
self.nodes_with_copy_source_count = 0; | ||||
|
r47865 | } | ||
fn add_file( | ||||
&mut self, | ||||
|
r47877 | filename: &HgPath, | ||
|
r47890 | old_state: EntryState, | ||
|
r47877 | entry: DirstateEntry, | ||
|
r47865 | ) -> Result<(), DirstateMapError> { | ||
|
r47890 | self.add_or_remove_file(filename, old_state, entry); | ||
|
r47877 | Ok(()) | ||
|
r47865 | } | ||
fn remove_file( | ||||
&mut self, | ||||
|
r47877 | filename: &HgPath, | ||
|
r47890 | old_state: EntryState, | ||
|
r47877 | size: i32, | ||
|
r47865 | ) -> Result<(), DirstateMapError> { | ||
|
r47877 | let entry = DirstateEntry { | ||
state: EntryState::Removed, | ||||
mode: 0, | ||||
size, | ||||
mtime: 0, | ||||
}; | ||||
|
r47890 | self.add_or_remove_file(filename, old_state, entry); | ||
|
r47877 | Ok(()) | ||
|
r47865 | } | ||
fn drop_file( | ||||
&mut self, | ||||
|
r47877 | filename: &HgPath, | ||
|
r47890 | old_state: EntryState, | ||
|
r47865 | ) -> Result<bool, DirstateMapError> { | ||
|
r47890 | let was_tracked = old_state.is_tracked(); | ||
if let Some(node) = Self::get_node_mut_tracing_ancestors( | ||||
&mut self.root, | ||||
filename, | ||||
|ancestor| { | ||||
if was_tracked { | ||||
ancestor.tracked_descendants_count -= 1 | ||||
} | ||||
}, | ||||
) { | ||||
|
r47877 | let had_entry = node.entry.is_some(); | ||
let had_copy_source = node.copy_source.is_some(); | ||||
// TODO: this leaves in the tree a "non-file" node. Should we | ||||
// remove the node instead, together with ancestor nodes for | ||||
// directories that become empty? | ||||
node.entry = None; | ||||
node.copy_source = None; | ||||
if had_entry { | ||||
self.nodes_with_entry_count -= 1 | ||||
} | ||||
if had_copy_source { | ||||
self.nodes_with_copy_source_count -= 1 | ||||
} | ||||
Ok(had_entry) | ||||
} else { | ||||
|
r47890 | assert!(!was_tracked); | ||
|
r47877 | Ok(false) | ||
} | ||||
|
r47865 | } | ||
|
r47875 | fn clear_ambiguous_times(&mut self, filenames: Vec<HgPathBuf>, now: i32) { | ||
for filename in filenames { | ||||
if let Some(node) = Self::get_node_mut(&mut self.root, &filename) { | ||||
if let Some(entry) = node.entry.as_mut() { | ||||
clear_ambiguous_mtime(entry, now); | ||||
} | ||||
} | ||||
} | ||||
|
r47865 | } | ||
|
r47878 | fn non_normal_entries_contains(&mut self, key: &HgPath) -> bool { | ||
self.get_node(key) | ||||
.and_then(|node| node.entry.as_ref()) | ||||
.map_or(false, DirstateEntry::is_non_normal) | ||||
|
r47865 | } | ||
|
r47878 | fn non_normal_entries_remove(&mut self, _key: &HgPath) { | ||
// Do nothing, this `DirstateMap` does not have a separate "non normal | ||||
// entries" set that need to be kept up to date | ||||
|
r47865 | } | ||
fn non_normal_or_other_parent_paths( | ||||
&mut self, | ||||
) -> Box<dyn Iterator<Item = &HgPathBuf> + '_> { | ||||
|
r47878 | Box::new(self.iter_nodes().filter_map(|(path, node)| { | ||
node.entry | ||||
.as_ref() | ||||
.filter(|entry| { | ||||
entry.is_non_normal() || entry.is_from_other_parent() | ||||
}) | ||||
.map(|_| path.full_path()) | ||||
})) | ||||
|
r47865 | } | ||
fn set_non_normal_other_parent_entries(&mut self, _force: bool) { | ||||
|
r47878 | // Do nothing, this `DirstateMap` does not have a separate "non normal | ||
// entries" and "from other parent" sets that need to be recomputed | ||||
|
r47865 | } | ||
fn iter_non_normal_paths( | ||||
&mut self, | ||||
) -> Box<dyn Iterator<Item = &HgPathBuf> + Send + '_> { | ||||
|
r47878 | self.iter_non_normal_paths_panic() | ||
|
r47865 | } | ||
fn iter_non_normal_paths_panic( | ||||
&self, | ||||
) -> Box<dyn Iterator<Item = &HgPathBuf> + Send + '_> { | ||||
|
r47878 | Box::new(self.iter_nodes().filter_map(|(path, node)| { | ||
node.entry | ||||
.as_ref() | ||||
.filter(|entry| entry.is_non_normal()) | ||||
.map(|_| path.full_path()) | ||||
})) | ||||
|
r47865 | } | ||
fn iter_other_parent_paths( | ||||
&mut self, | ||||
) -> Box<dyn Iterator<Item = &HgPathBuf> + Send + '_> { | ||||
|
r47878 | Box::new(self.iter_nodes().filter_map(|(path, node)| { | ||
node.entry | ||||
.as_ref() | ||||
.filter(|entry| entry.is_from_other_parent()) | ||||
.map(|_| path.full_path()) | ||||
})) | ||||
|
r47865 | } | ||
fn has_tracked_dir( | ||||
&mut self, | ||||
|
r47876 | directory: &HgPath, | ||
|
r47865 | ) -> Result<bool, DirstateMapError> { | ||
|
r47876 | if let Some(node) = self.get_node(directory) { | ||
// A node without a `DirstateEntry` was created to hold child | ||||
// nodes, and is therefore a directory. | ||||
Ok(node.entry.is_none() && node.tracked_descendants_count > 0) | ||||
} else { | ||||
Ok(false) | ||||
} | ||||
|
r47865 | } | ||
fn has_dir( | ||||
&mut self, | ||||
|
r47876 | directory: &HgPath, | ||
|
r47865 | ) -> Result<bool, DirstateMapError> { | ||
|
r47876 | if let Some(node) = self.get_node(directory) { | ||
// A node without a `DirstateEntry` was created to hold child | ||||
// nodes, and is therefore a directory. | ||||
Ok(node.entry.is_none()) | ||||
} else { | ||||
Ok(false) | ||||
} | ||||
|
r47865 | } | ||
fn parents( | ||||
&mut self, | ||||
|
r47868 | file_contents: &[u8], | ||
|
r47865 | ) -> Result<&DirstateParents, DirstateError> { | ||
|
r47868 | if self.parents.is_none() { | ||
let parents = if !file_contents.is_empty() { | ||||
parse_dirstate_parents(file_contents)?.clone() | ||||
} else { | ||||
DirstateParents { | ||||
p1: NULL_NODE, | ||||
p2: NULL_NODE, | ||||
} | ||||
}; | ||||
self.parents = Some(parents); | ||||
} | ||||
Ok(self.parents.as_ref().unwrap()) | ||||
|
r47865 | } | ||
|
r47867 | fn set_parents(&mut self, parents: &DirstateParents) { | ||
self.parents = Some(parents.clone()); | ||||
self.dirty_parents = true; | ||||
|
r47865 | } | ||
|
r47888 | #[timed] | ||
|
r47865 | fn read<'a>( | ||
&mut self, | ||||
|
r47867 | file_contents: &'a [u8], | ||
|
r47865 | ) -> Result<Option<&'a DirstateParents>, DirstateError> { | ||
|
r47867 | if file_contents.is_empty() { | ||
return Ok(None); | ||||
} | ||||
let parents = parse_dirstate_entries( | ||||
file_contents, | ||||
|path, entry, copy_source| { | ||||
|
r47890 | let tracked = entry.state.is_tracked(); | ||
let node = Self::get_or_insert_node_tracing_ancestors( | ||||
&mut self.root, | ||||
|
r47873 | path, | ||
|
r47890 | |ancestor| { | ||
if tracked { | ||||
ancestor.tracked_descendants_count += 1 | ||||
} | ||||
}, | ||||
); | ||||
assert!( | ||||
node.entry.is_none(), | ||||
"duplicate dirstate entry in read" | ||||
); | ||||
assert!( | ||||
node.copy_source.is_none(), | ||||
"duplicate dirstate entry in read" | ||||
); | ||||
node.entry = Some(*entry); | ||||
node.copy_source = copy_source.map(HgPath::to_owned); | ||||
self.nodes_with_entry_count += 1; | ||||
if copy_source.is_some() { | ||||
self.nodes_with_copy_source_count += 1 | ||||
} | ||||
|
r47867 | }, | ||
)?; | ||||
if !self.dirty_parents { | ||||
self.set_parents(parents); | ||||
} | ||||
Ok(Some(parents)) | ||||
|
r47865 | } | ||
fn pack( | ||||
&mut self, | ||||
|
r47872 | parents: DirstateParents, | ||
now: Timestamp, | ||||
|
r47865 | ) -> Result<Vec<u8>, DirstateError> { | ||
|
r47872 | // Optizimation (to be measured?): pre-compute size to avoid `Vec` | ||
// reallocations | ||||
let mut size = parents.as_bytes().len(); | ||||
for (path, node) in self.iter_nodes() { | ||||
if node.entry.is_some() { | ||||
size += packed_entry_size( | ||||
path.full_path(), | ||||
node.copy_source.as_ref(), | ||||
) | ||||
} | ||||
} | ||||
let mut packed = Vec::with_capacity(size); | ||||
packed.extend(parents.as_bytes()); | ||||
let now: i32 = now.0.try_into().expect("time overflow"); | ||||
for (path, opt_entry, copy_source) in self.iter_node_data_mut() { | ||||
if let Some(entry) = opt_entry { | ||||
clear_ambiguous_mtime(entry, now); | ||||
pack_entry( | ||||
path.full_path(), | ||||
entry, | ||||
copy_source.as_ref(), | ||||
&mut packed, | ||||
); | ||||
} | ||||
} | ||||
self.dirty_parents = false; | ||||
Ok(packed) | ||||
|
r47865 | } | ||
fn set_all_dirs(&mut self) -> Result<(), DirstateMapError> { | ||||
|
r47876 | // Do nothing, this `DirstateMap` does not a separate `all_dirs` that | ||
// needs to be recomputed | ||||
Ok(()) | ||||
|
r47865 | } | ||
fn set_dirs(&mut self) -> Result<(), DirstateMapError> { | ||||
|
r47876 | // Do nothing, this `DirstateMap` does not a separate `dirs` that needs | ||
// to be recomputed | ||||
Ok(()) | ||||
|
r47865 | } | ||
fn status<'a>( | ||||
|
r47882 | &'a mut self, | ||
matcher: &'a (dyn Matcher + Sync), | ||||
root_dir: PathBuf, | ||||
ignore_files: Vec<PathBuf>, | ||||
options: StatusOptions, | ||||
|
r47880 | ) -> Result<(DirstateStatus<'a>, Vec<PatternFileWarning>), StatusError> | ||
{ | ||||
|
r47882 | super::status::status(self, matcher, root_dir, ignore_files, options) | ||
|
r47865 | } | ||
fn copy_map_len(&self) -> usize { | ||||
|
r47873 | self.nodes_with_copy_source_count | ||
|
r47865 | } | ||
fn copy_map_iter(&self) -> CopyMapIter<'_> { | ||||
|
r47870 | Box::new(self.iter_nodes().filter_map(|(path, node)| { | ||
node.copy_source | ||||
.as_ref() | ||||
.map(|copy_source| (path.full_path(), copy_source)) | ||||
})) | ||||
|
r47865 | } | ||
|
r47869 | fn copy_map_contains_key(&self, key: &HgPath) -> bool { | ||
if let Some(node) = self.get_node(key) { | ||||
node.copy_source.is_some() | ||||
} else { | ||||
false | ||||
} | ||||
|
r47865 | } | ||
|
r47869 | fn copy_map_get(&self, key: &HgPath) -> Option<&HgPathBuf> { | ||
self.get_node(key)?.copy_source.as_ref() | ||||
|
r47865 | } | ||
|
r47874 | fn copy_map_remove(&mut self, key: &HgPath) -> Option<HgPathBuf> { | ||
let count = &mut self.nodes_with_copy_source_count; | ||||
Self::get_node_mut(&mut self.root, key).and_then(|node| { | ||||
if node.copy_source.is_some() { | ||||
*count -= 1 | ||||
} | ||||
node.copy_source.take() | ||||
}) | ||||
|
r47865 | } | ||
fn copy_map_insert( | ||||
&mut self, | ||||
|
r47874 | key: HgPathBuf, | ||
value: HgPathBuf, | ||||
|
r47865 | ) -> Option<HgPathBuf> { | ||
|
r47874 | let node = Self::get_or_insert_node(&mut self.root, &key); | ||
if node.copy_source.is_none() { | ||||
self.nodes_with_copy_source_count += 1 | ||||
} | ||||
node.copy_source.replace(value) | ||||
|
r47865 | } | ||
fn len(&self) -> usize { | ||||
|
r47873 | self.nodes_with_entry_count | ||
|
r47865 | } | ||
|
r47869 | fn contains_key(&self, key: &HgPath) -> bool { | ||
self.get(key).is_some() | ||||
|
r47865 | } | ||
|
r47869 | fn get(&self, key: &HgPath) -> Option<&DirstateEntry> { | ||
self.get_node(key)?.entry.as_ref() | ||||
|
r47865 | } | ||
fn iter(&self) -> StateMapIter<'_> { | ||||
|
r47870 | Box::new(self.iter_nodes().filter_map(|(path, node)| { | ||
node.entry.as_ref().map(|entry| (path.full_path(), entry)) | ||||
})) | ||||
|
r47865 | } | ||
} | ||||