Mercurial > public > mercurial-scm > hg
diff mercurial/localrepo.py @ 35248:c752fbe228fb
repoview: extract a factory function of proxy class
This makes sure that dynamically-created class objects are isolated from
local binding of repo instances. The type cache is moved to module level
as it isn't tied to each instance.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Tue, 05 Dec 2017 21:50:33 +0900 |
| parents | 9ce4e01f58ee |
| children | 137a08d82232 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Tue Dec 05 21:37:30 2017 +0900 +++ b/mercurial/localrepo.py Tue Dec 05 21:50:33 2017 +0900 @@ -502,9 +502,6 @@ # post-dirstate-status hooks self._postdsstatus = [] - # Cache of types representing filtered repos. - self._filteredrepotypes = weakref.WeakKeyDictionary() - # generic mapping between names and nodes self.names = namespaces.namespaces() @@ -680,20 +677,8 @@ def filtered(self, name): """Return a filtered version of a repository""" - # Python <3.4 easily leaks types via __mro__. See - # https://bugs.python.org/issue17950. We cache dynamically - # created types so this method doesn't leak on every - # invocation. - - key = self.unfiltered().__class__ - if key not in self._filteredrepotypes: - # Build a new type with the repoview mixin and the base - # class of this repo. - class filteredrepo(repoview.repoview, key): - pass - self._filteredrepotypes[key] = filteredrepo - - return self._filteredrepotypes[key](self, name) + cls = repoview.newtype(self.unfiltered().__class__) + return cls(self, name) @repofilecache('bookmarks', 'bookmarks.current') def _bookmarks(self):