A later changset will use this in another place.
This is an associated function (that Python would call static method)
instead of a free function so it doesn’t need to be imported separately.
It’s on Node rather than ChildNodes because the latter is a type alias
to an external type (HashMap) so that would require an extension trait
which needs to be imported separately.
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | rust/hg-core/src/dirstate_tree/dirstate_map.rs (17 lines) | |||
| M | rust/hg-core/src/dirstate_tree/status.rs (4 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 5828d7716de9 | d18273cd8d24 | Simon Sapin | May 14 2021, 4:38 AM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin |
| /// Number of nodes anywhere in the tree that have | /// Number of nodes anywhere in the tree that have | ||||
| /// `.copy_source.is_some()`. | /// `.copy_source.is_some()`. | ||||
| nodes_with_copy_source_count: usize, | nodes_with_copy_source_count: usize, | ||||
| } | } | ||||
| /// Using a plain `HgPathBuf` of the full path from the repository root as a | /// 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 | /// 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 | /// path, so comparing full paths gives the same result as comparing base | ||||
| /// names. However `BTreeMap` would waste time always re-comparing the same | /// names. However `HashMap` would waste time always re-hashing the same | ||||
| /// string prefix. | /// string prefix. | ||||
| pub(super) type NodeKey<'on_disk> = WithBasename<Cow<'on_disk, HgPath>>; | |||||
| pub(super) type ChildNodes<'on_disk> = | pub(super) type ChildNodes<'on_disk> = | ||||
| FastHashMap<WithBasename<Cow<'on_disk, HgPath>>, Node<'on_disk>>; | FastHashMap<NodeKey<'on_disk>, Node<'on_disk>>; | ||||
| /// Represents a file or a directory | /// Represents a file or a directory | ||||
| #[derive(Default)] | #[derive(Default)] | ||||
| pub(super) struct Node<'on_disk> { | pub(super) struct Node<'on_disk> { | ||||
| /// `None` for directories | /// `None` for directories | ||||
| pub(super) entry: Option<DirstateEntry>, | pub(super) entry: Option<DirstateEntry>, | ||||
| pub(super) copy_source: Option<Cow<'on_disk, HgPath>>, | pub(super) copy_source: Option<Cow<'on_disk, HgPath>>, | ||||
| pub(super) children: ChildNodes<'on_disk>, | pub(super) children: ChildNodes<'on_disk>, | ||||
| /// How many (non-inclusive) descendants of this node are tracked files | /// How many (non-inclusive) descendants of this node are tracked files | ||||
| tracked_descendants_count: usize, | tracked_descendants_count: usize, | ||||
| } | } | ||||
| impl Node<'_> { | impl<'on_disk> Node<'on_disk> { | ||||
| pub(super) fn state(&self) -> Option<EntryState> { | pub(super) fn state(&self) -> Option<EntryState> { | ||||
| self.entry.as_ref().map(|entry| entry.state) | self.entry.as_ref().map(|entry| entry.state) | ||||
| } | } | ||||
| pub(super) fn sorted<'tree>( | |||||
| nodes: &'tree mut ChildNodes<'on_disk>, | |||||
| ) -> Vec<(&'tree NodeKey<'on_disk>, &'tree mut Self)> { | |||||
| let mut vec: Vec<_> = nodes.iter_mut().collect(); | |||||
| // `sort_unstable_by_key` doesn’t allow keys borrowing from the value: | |||||
| // https://github.com/rust-lang/rust/issues/34162 | |||||
| vec.sort_unstable_by(|(path1, _), (path2, _)| path1.cmp(path2)); | |||||
| vec | |||||
| } | |||||
| } | } | ||||
| /// `(full_path, entry, copy_source)` | /// `(full_path, entry, copy_source)` | ||||
| type NodeDataMut<'tree, 'on_disk> = ( | type NodeDataMut<'tree, 'on_disk> = ( | ||||
| &'tree HgPath, | &'tree HgPath, | ||||
| &'tree mut Option<DirstateEntry>, | &'tree mut Option<DirstateEntry>, | ||||
| &'tree mut Option<Cow<'on_disk, HgPath>>, | &'tree mut Option<Cow<'on_disk, HgPath>>, | ||||
| ); | ); | ||||
| ) { | ) { | ||||
| entries | entries | ||||
| } else { | } else { | ||||
| return; | return; | ||||
| }; | }; | ||||
| // `merge_join_by` requires both its input iterators to be sorted: | // `merge_join_by` requires both its input iterators to be sorted: | ||||
| let mut dirstate_nodes: Vec<_> = dirstate_nodes.iter_mut().collect(); | let dirstate_nodes = Node::sorted(dirstate_nodes); | ||||
| // `sort_unstable_by_key` doesn’t allow keys borrowing from the value: | // `sort_unstable_by_key` doesn’t allow keys borrowing from the value: | ||||
| // https://github.com/rust-lang/rust/issues/34162 | // https://github.com/rust-lang/rust/issues/34162 | ||||
| dirstate_nodes | |||||
| .sort_unstable_by(|(path1, _), (path2, _)| path1.cmp(path2)); | |||||
| fs_entries.sort_unstable_by(|e1, e2| e1.base_name.cmp(&e2.base_name)); | fs_entries.sort_unstable_by(|e1, e2| e1.base_name.cmp(&e2.base_name)); | ||||
| itertools::merge_join_by( | itertools::merge_join_by( | ||||
| dirstate_nodes, | dirstate_nodes, | ||||
| &fs_entries, | &fs_entries, | ||||
| |(full_path, _node), fs_entry| { | |(full_path, _node), fs_entry| { | ||||
| full_path.base_name().cmp(&fs_entry.base_name) | full_path.base_name().cmp(&fs_entry.base_name) | ||||
| }, | }, | ||||