Mercurial > public > mercurial-scm > hg
diff contrib/dirstatenonnormalcheck.py @ 34674:60927b19ed65
dirstate: move nonnormal and otherparent sets to dirstatemap
As part of separating dirstate business logic from storage, let's move the
nonnormal and otherparent storage to the dirstatemap class. This will allow
alternative dirstate storage to persist these sets instead of recomputing them.
Differential Revision: https://phab.mercurial-scm.org/D979
| author | Durham Goode <durham@fb.com> |
|---|---|
| date | Thu, 05 Oct 2017 11:34:41 -0700 |
| parents | 3fd94f603190 |
| children | 6e7fae8f1c6c |
line wrap: on
line diff
--- a/contrib/dirstatenonnormalcheck.py Thu Oct 05 11:34:41 2017 -0700 +++ b/contrib/dirstatenonnormalcheck.py Thu Oct 05 11:34:41 2017 -0700 @@ -32,9 +32,10 @@ def _checkdirstate(orig, self, arg): """Check nonnormal set consistency before and after the call to orig""" - checkconsistency(self._ui, orig, self._map, self._nonnormalset, "before") + checkconsistency(self._ui, orig, self._map, self._map.nonnormalset, + "before") r = orig(self, arg) - checkconsistency(self._ui, orig, self._map, self._nonnormalset, "after") + checkconsistency(self._ui, orig, self._map, self._map.nonnormalset, "after") return r def extsetup(ui):