Mercurial > public > mercurial-scm > hg
diff mercurial/debugcommands.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 | b30a53ffbf9b |
line wrap: on
line diff
--- a/mercurial/debugcommands.py Thu Jul 15 23:02:17 2021 +0200 +++ b/mercurial/debugcommands.py Fri Jul 16 14:08:26 2021 +0200 @@ -942,7 +942,12 @@ ), (b'', b'dates', True, _(b'display the saved mtime')), (b'', b'datesort', None, _(b'sort by saved mtime')), - (b'', b'dirs', False, _(b'display directories')), + ( + b'', + b'all', + False, + _(b'display dirstate-v2 tree nodes that would not exist in v1'), + ), ], _(b'[OPTION]...'), ) @@ -961,9 +966,10 @@ ) # sort by mtime, then by filename else: keyfunc = None # sort by filename - entries = list(pycompat.iteritems(repo.dirstate)) - if opts['dirs']: - entries.extend(repo.dirstate.directories()) + if opts['all']: + entries = list(repo.dirstate._map.debug_iter()) + else: + entries = list(pycompat.iteritems(repo.dirstate)) entries.sort(key=keyfunc) for file_, ent in entries: if ent.v1_mtime() == -1: