Mercurial > public > mercurial-scm > hg
diff rust/hg-core/src/dirstate_tree/dispatch.rs @ 47683:284a20269a97
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate
`dirstatemap.dirfoldmap` was recently changed to re-use a Rust iterator
that was added for the `hg debugdirstate` command.
That iterator was based on all nodes in the tree dirstate without an entry
only existing to hold child nodes, and therefore being directories.
However to optimize status further we may want to store additional nodes
for unknown or ignored files and directories. At that point the two users
of this iterator will want different things, so let?s make two iterators
instead.
See doc-comments in `dispatch.rs`.
Differential Revision: https://phab.mercurial-scm.org/D11099
| author | Simon Sapin <simon.sapin@octobus.net> |
|---|---|
| date | Fri, 16 Jul 2021 14:08:26 +0200 |
| parents | 78f7f0d490ee |
| children | e5fb14a07866 |
line wrap: on
line diff
--- a/rust/hg-core/src/dirstate_tree/dispatch.rs Thu Jul 15 23:02:17 2021 +0200 +++ b/rust/hg-core/src/dirstate_tree/dispatch.rs Fri Jul 16 14:08:26 2021 +0200 @@ -259,20 +259,40 @@ /// are `Result`s. fn iter(&self) -> StateMapIter<'_>; - /// In the tree dirstate, return an iterator of "directory" (entry-less) - /// nodes with the data stored for them. This is for `hg debugdirstate - /// --dirs`. + /// Returns an iterator of tracked directories. /// - /// In the flat dirstate, returns an empty iterator. + /// This is the paths for which `has_tracked_dir` would return true. + /// Or, in other words, the union of ancestor paths of all paths that have + /// an associated entry in a "tracked" state in this dirstate map. /// /// Because parse errors can happen during iteration, the iterated items /// are `Result`s. - fn iter_directories( + fn iter_tracked_dirs( + &mut self, + ) -> Result< + Box< + dyn Iterator<Item = Result<&HgPath, DirstateV2ParseError>> + + Send + + '_, + >, + DirstateError, + >; + + /// Return an iterator of `(path, (state, mode, size, mtime))` for every + /// node stored in this dirstate map, for the purpose of the `hg + /// debugdirstate` command. + /// + /// For nodes that don’t have an entry, `state` is the ASCII space. + /// An `mtime` may still be present. It is used to optimize `status`. + /// + /// Because parse errors can happen during iteration, the iterated items + /// are `Result`s. + fn debug_iter( &self, ) -> Box< dyn Iterator< Item = Result< - (&HgPath, Option<Timestamp>), + (&HgPath, (u8, i32, i32, i32)), DirstateV2ParseError, >, > + Send @@ -476,17 +496,41 @@ Box::new((&**self).iter().map(|(key, value)| Ok((&**key, *value)))) } - fn iter_directories( + fn iter_tracked_dirs( + &mut self, + ) -> Result< + Box< + dyn Iterator<Item = Result<&HgPath, DirstateV2ParseError>> + + Send + + '_, + >, + DirstateError, + > { + self.set_all_dirs()?; + Ok(Box::new( + self.all_dirs + .as_ref() + .unwrap() + .iter() + .map(|path| Ok(&**path)), + )) + } + + fn debug_iter( &self, ) -> Box< dyn Iterator< Item = Result< - (&HgPath, Option<Timestamp>), + (&HgPath, (u8, i32, i32, i32)), DirstateV2ParseError, >, > + Send + '_, > { - Box::new(std::iter::empty()) + Box::new( + (&**self) + .iter() + .map(|(path, entry)| Ok((&**path, entry.debug_tuple()))), + ) } }