| durin42 | |
| indygreg |
| hg-reviewers |
With this and the previous patch, I couldn't measure any significant
difference from hg files -r . in a FireFox repo with 65k files. I
tried with both a flat-manifest and a tree-manifest version of
it. Neither had the narrow extension enabled.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/narrow/narrowrepo.py (6 lines) | |||
| M | hgext/narrow/narrowrevlog.py (9 lines) | |||
| M | mercurial/manifest.py (3 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| # We have to use a different caching property decorator for | # We have to use a different caching property decorator for | ||||
| # bundlerepo because storecache blows up in strange ways on a | # bundlerepo because storecache blows up in strange ways on a | ||||
| # bundlerepo. Fortunately, there's no risk of data changing in | # bundlerepo. Fortunately, there's no risk of data changing in | ||||
| # a bundlerepo. | # a bundlerepo. | ||||
| cacheprop = lambda name: localrepo.unfilteredpropertycache | cacheprop = lambda name: localrepo.unfilteredpropertycache | ||||
| class narrowrepository(repo.__class__): | class narrowrepository(repo.__class__): | ||||
| @cacheprop('00manifest.i') | |||||
| def manifestlog(self): | |||||
| mfl = super(narrowrepository, self).manifestlog | |||||
| narrowrevlog.makenarrowmanifestlog(mfl, self) | |||||
| return mfl | |||||
| def file(self, f): | def file(self, f): | ||||
| fl = super(narrowrepository, self).file(f) | fl = super(narrowrepository, self).file(f) | ||||
| narrowrevlog.makenarrowfilelog(fl, self.narrowmatch()) | narrowrevlog.makenarrowfilelog(fl, self.narrowmatch()) | ||||
| return fl | return fl | ||||
| # I'm not sure this is the right place to do this filter. | # I'm not sure this is the right place to do this filter. | ||||
| # context._manifestmatches() would probably be better, or perhaps | # context._manifestmatches() would probably be better, or perhaps | ||||
| # move it to a later place, in case some of the callers do want to know | # move it to a later place, in case some of the callers do want to know | ||||
| # narrowrevlog.py - revlog storing irrelevant nodes as "ellipsis" nodes | # narrowrevlog.py - revlog storing irrelevant nodes as "ellipsis" nodes | ||||
| # | # | ||||
| # Copyright 2017 Google, Inc. | # Copyright 2017 Google, Inc. | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| from mercurial import ( | from mercurial import ( | ||||
| manifest, | |||||
| revlog, | revlog, | ||||
| util, | util, | ||||
| ) | ) | ||||
| def readtransform(self, text): | def readtransform(self, text): | ||||
| return text, False | return text, False | ||||
| def writetransform(self, text): | def writetransform(self, text): | ||||
| return text, False | return text, False | ||||
| def rawtransform(self, text): | def rawtransform(self, text): | ||||
| return False | return False | ||||
| revlog.addflagprocessor(revlog.REVIDX_ELLIPSIS, | revlog.addflagprocessor(revlog.REVIDX_ELLIPSIS, | ||||
| (readtransform, writetransform, rawtransform)) | (readtransform, writetransform, rawtransform)) | ||||
| def setup(): | def setup(): | ||||
| # We just wanted to add the flag processor, which is done at module | # We just wanted to add the flag processor, which is done at module | ||||
| # load time. | # load time. | ||||
| pass | pass | ||||
| def makenarrowmanifestlog(mfl, repo): | |||||
| class narrowmanifestlog(mfl.__class__): | |||||
| def get(self, dir, node, verify=True): | |||||
| if not repo.narrowmatch().visitdir(dir[:-1] or '.'): | |||||
| return manifest.excludeddirmanifestctx(dir, node) | |||||
| return super(narrowmanifestlog, self).get(dir, node, verify=verify) | |||||
| mfl.__class__ = narrowmanifestlog | |||||
| def makenarrowfilelog(fl, narrowmatch): | def makenarrowfilelog(fl, narrowmatch): | ||||
| class narrowfilelog(fl.__class__): | class narrowfilelog(fl.__class__): | ||||
| def renamed(self, node): | def renamed(self, node): | ||||
| # Renames that come from outside the narrowspec are | # Renames that come from outside the narrowspec are | ||||
| # problematic at least for git-diffs, because we lack the | # problematic at least for git-diffs, because we lack the | ||||
| # base text for the rename. This logic was introduced in | # base text for the rename. This logic was introduced in | ||||
| # 3cd72b1 of narrowhg (authored by martinvonz, reviewed by | # 3cd72b1 of narrowhg (authored by martinvonz, reviewed by | ||||
| # adgar), but that revision doesn't have any additional | # adgar), but that revision doesn't have any additional | ||||
| LookupError if not found. | LookupError if not found. | ||||
| `verify` - if True an exception will be thrown if the node is not in | `verify` - if True an exception will be thrown if the node is not in | ||||
| the revlog | the revlog | ||||
| """ | """ | ||||
| if node in self._dirmancache.get(dir, ()): | if node in self._dirmancache.get(dir, ()): | ||||
| return self._dirmancache[dir][node] | return self._dirmancache[dir][node] | ||||
| if not self._narrowmatch.always(): | |||||
| if not self._narrowmatch.visitdir(dir[:-1] or '.'): | |||||
| return excludeddirmanifestctx(dir, node) | |||||
| if dir: | if dir: | ||||
| if self._revlog._treeondisk: | if self._revlog._treeondisk: | ||||
| if verify: | if verify: | ||||
| dirlog = self._revlog.dirlog(dir) | dirlog = self._revlog.dirlog(dir) | ||||
| if node not in dirlog.nodemap: | if node not in dirlog.nodemap: | ||||
| raise LookupError(node, dirlog.indexfile, | raise LookupError(node, dirlog.indexfile, | ||||
| _('no node')) | _('no node')) | ||||
| m = treemanifestctx(self, dir, node) | m = treemanifestctx(self, dir, node) | ||||