Mercurial > public > mercurial-scm > hg-stable
diff mercurial/debugcommands.py @ 42930:34ed651ba7e4
cleanup: fix leakage of dirstate._map to client code
We already had proper accessors for most of the behavior of
dirstate._map that callers cared about exposed in the actual dirstate
class as public methods. Sigh.
There are two remaining privacy violations in the codebase after this change:
1) In the perf extension, which I suspect has to stick around because
it's really testing the dirstate implementation directly
2) In largefiles, where we deal with standins and mutating status. Looking at
this, I _strongly_ suspect a formal dirstate interface would allow
this to work via composition instead of inheritance and
monkeypatching. Fortunately, such wins are a part of my motivation
for this work. I anticipate we'll come back to this in due time.
Differential Revision: https://phab.mercurial-scm.org/D6837
author | Augie Fackler <augie@google.com> |
---|---|
date | Tue, 10 Sep 2019 09:41:58 -0400 |
parents | 38392d5bde8e |
children | 559ac8411f12 |
line wrap: on
line diff
--- a/mercurial/debugcommands.py Sun Sep 08 20:26:36 2019 -0400 +++ b/mercurial/debugcommands.py Tue Sep 10 09:41:58 2019 -0400 @@ -751,7 +751,7 @@ keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename else: keyfunc = None # sort by filename - for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc): + for file_, ent in sorted(repo.dirstate.iteritems(), key=keyfunc): if ent[3] == -1: timestr = 'unset ' elif nodates: