Mercurial > public > mercurial-scm > hg
comparison mercurial/debugcommands.py @ 42926: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 |
comparison
equal
deleted
inserted
replaced
42925:9fd7710d9ae2 | 42926:34ed651ba7e4 |
---|---|
749 | 749 |
750 if datesort: | 750 if datesort: |
751 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename | 751 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename |
752 else: | 752 else: |
753 keyfunc = None # sort by filename | 753 keyfunc = None # sort by filename |
754 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc): | 754 for file_, ent in sorted(repo.dirstate.iteritems(), key=keyfunc): |
755 if ent[3] == -1: | 755 if ent[3] == -1: |
756 timestr = 'unset ' | 756 timestr = 'unset ' |
757 elif nodates: | 757 elif nodates: |
758 timestr = 'set ' | 758 timestr = 'set ' |
759 else: | 759 else: |