Mercurial > public > mercurial-scm > hg-stable
diff mercurial/dirstatemap.py @ 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 | 265cdfaad372 |
line wrap: on
line diff
--- a/mercurial/dirstatemap.py Thu Jul 15 23:02:17 2021 +0200 +++ b/mercurial/dirstatemap.py Fri Jul 16 14:08:26 2021 +0200 @@ -105,10 +105,6 @@ self._map return self.copymap - def directories(self): - # Rust / dirstate-v2 only - return [] - def clear(self): self._map.clear() self.copymap.clear() @@ -126,6 +122,8 @@ # forward for python2,3 compat iteritems = items + debug_iter = items + def __len__(self): return len(self._map) @@ -525,6 +523,9 @@ def directories(self): return self._rustmap.directories() + def debug_iter(self): + return self._rustmap.debug_iter() + def preload(self): self._rustmap @@ -746,6 +747,6 @@ def dirfoldmap(self): f = {} normcase = util.normcase - for name, _pseudo_entry in self.directories(): + for name in self._rustmap.tracked_dirs(): f[normcase(name)] = name return f