| hg-reviewers |
The manifest should ideally not know at all about the repo, so this is
just a little step towards cleaning that up.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/bundlerepo.py (3 lines) | |||
| M | mercurial/localrepo.py (3 lines) | |||
| M | mercurial/manifest.py (4 lines) | |||
| M | mercurial/statichttprepo.py (3 lines) | |||
| M | mercurial/unionrepo.py (3 lines) | |||
| M | tests/test-check-interfaces.py (3 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| def manifestlog(self): | def manifestlog(self): | ||||
| self._cgunpacker.seek(self.manstart) | self._cgunpacker.seek(self.manstart) | ||||
| # consume the header if it exists | # consume the header if it exists | ||||
| self._cgunpacker.manifestheader() | self._cgunpacker.manifestheader() | ||||
| linkmapper = self.unfiltered().changelog.rev | linkmapper = self.unfiltered().changelog.rev | ||||
| rootstore = bundlemanifest(self.svfs, self._cgunpacker, linkmapper) | rootstore = bundlemanifest(self.svfs, self._cgunpacker, linkmapper) | ||||
| self.filestart = self._cgunpacker.tell() | self.filestart = self._cgunpacker.tell() | ||||
| return manifest.manifestlog(self.svfs, self, rootstore) | return manifest.manifestlog(self.svfs, self, rootstore, | ||||
| self.narrowmatch()) | |||||
| def _consumemanifest(self): | def _consumemanifest(self): | ||||
| """Consumes the manifest portion of the bundle, setting filestart so the | """Consumes the manifest portion of the bundle, setting filestart so the | ||||
| file portion can be read.""" | file portion can be read.""" | ||||
| self._cgunpacker.seek(self.manstart) | self._cgunpacker.seek(self.manstart) | ||||
| self._cgunpacker.manifestheader() | self._cgunpacker.manifestheader() | ||||
| for delta in self._cgunpacker.deltaiter(): | for delta in self._cgunpacker.deltaiter(): | ||||
| pass | pass | ||||
| @storecache('00changelog.i') | @storecache('00changelog.i') | ||||
| def changelog(self): | def changelog(self): | ||||
| return changelog.changelog(self.svfs, | return changelog.changelog(self.svfs, | ||||
| trypending=txnutil.mayhavepending(self.root)) | trypending=txnutil.mayhavepending(self.root)) | ||||
| @storecache('00manifest.i') | @storecache('00manifest.i') | ||||
| def manifestlog(self): | def manifestlog(self): | ||||
| rootstore = manifest.manifestrevlog(self.svfs) | rootstore = manifest.manifestrevlog(self.svfs) | ||||
| return manifest.manifestlog(self.svfs, self, rootstore) | return manifest.manifestlog(self.svfs, self, rootstore, | ||||
| self.narrowmatch()) | |||||
| @repofilecache('dirstate') | @repofilecache('dirstate') | ||||
| def dirstate(self): | def dirstate(self): | ||||
| return self._makedirstate() | return self._makedirstate() | ||||
| def _makedirstate(self): | def _makedirstate(self): | ||||
| """Extension point for wrapping the dirstate per-repo.""" | """Extension point for wrapping the dirstate per-repo.""" | ||||
| sparsematchfn = lambda: sparse.matcher(self) | sparsematchfn = lambda: sparse.matcher(self) | ||||
| class manifestlog(object): | class manifestlog(object): | ||||
| """A collection class representing the collection of manifest snapshots | """A collection class representing the collection of manifest snapshots | ||||
| referenced by commits in the repository. | referenced by commits in the repository. | ||||
| In this situation, 'manifest' refers to the abstract concept of a snapshot | In this situation, 'manifest' refers to the abstract concept of a snapshot | ||||
| of the list of files in the given commit. Consumers of the output of this | of the list of files in the given commit. Consumers of the output of this | ||||
| class do not care about the implementation details of the actual manifests | class do not care about the implementation details of the actual manifests | ||||
| they receive (i.e. tree or flat or lazily loaded, etc).""" | they receive (i.e. tree or flat or lazily loaded, etc).""" | ||||
| def __init__(self, opener, repo, rootstore): | def __init__(self, opener, repo, rootstore, narrowmatch): | ||||
| usetreemanifest = False | usetreemanifest = False | ||||
| cachesize = 4 | cachesize = 4 | ||||
| opts = getattr(opener, 'options', None) | opts = getattr(opener, 'options', None) | ||||
| if opts is not None: | if opts is not None: | ||||
| usetreemanifest = opts.get('treemanifest', usetreemanifest) | usetreemanifest = opts.get('treemanifest', usetreemanifest) | ||||
| cachesize = opts.get('manifestcachesize', cachesize) | cachesize = opts.get('manifestcachesize', cachesize) | ||||
| self._treemanifests = usetreemanifest | self._treemanifests = usetreemanifest | ||||
| self._rootstore = rootstore | self._rootstore = rootstore | ||||
| self._rootstore._setupmanifestcachehooks(repo) | self._rootstore._setupmanifestcachehooks(repo) | ||||
| self._narrowmatch = repo.narrowmatch() | self._narrowmatch = narrowmatch | ||||
| # A cache of the manifestctx or treemanifestctx for each directory | # A cache of the manifestctx or treemanifestctx for each directory | ||||
| self._dirmancache = {} | self._dirmancache = {} | ||||
| self._dirmancache[''] = util.lrucachedict(cachesize) | self._dirmancache[''] = util.lrucachedict(cachesize) | ||||
| self._cachesize = cachesize | self._cachesize = cachesize | ||||
| def __getitem__(self, node): | def __getitem__(self, node): | ||||
| self.store = localrepo.makestore(requirements, self.path, vfsclass) | self.store = localrepo.makestore(requirements, self.path, vfsclass) | ||||
| self.spath = self.store.path | self.spath = self.store.path | ||||
| self.svfs = self.store.opener | self.svfs = self.store.opener | ||||
| self.sjoin = self.store.join | self.sjoin = self.store.join | ||||
| self._filecache = {} | self._filecache = {} | ||||
| self.requirements = requirements | self.requirements = requirements | ||||
| rootmanifest = manifest.manifestrevlog(self.svfs) | rootmanifest = manifest.manifestrevlog(self.svfs) | ||||
| self.manifestlog = manifest.manifestlog(self.svfs, self, rootmanifest) | self.manifestlog = manifest.manifestlog(self.svfs, self, rootmanifest, | ||||
| self.narrowmatch()) | |||||
| self.changelog = changelog.changelog(self.svfs) | self.changelog = changelog.changelog(self.svfs) | ||||
| self._tags = None | self._tags = None | ||||
| self.nodetagscache = None | self.nodetagscache = None | ||||
| self._branchcaches = {} | self._branchcaches = {} | ||||
| self._revbranchcache = None | self._revbranchcache = None | ||||
| self.encodepats = None | self.encodepats = None | ||||
| self.decodepats = None | self.decodepats = None | ||||
| self._transref = None | self._transref = None | ||||
| @localrepo.unfilteredpropertycache | @localrepo.unfilteredpropertycache | ||||
| def changelog(self): | def changelog(self): | ||||
| return unionchangelog(self.svfs, self.repo2.svfs) | return unionchangelog(self.svfs, self.repo2.svfs) | ||||
| @localrepo.unfilteredpropertycache | @localrepo.unfilteredpropertycache | ||||
| def manifestlog(self): | def manifestlog(self): | ||||
| rootstore = unionmanifest(self.svfs, self.repo2.svfs, | rootstore = unionmanifest(self.svfs, self.repo2.svfs, | ||||
| self.unfiltered()._clrev) | self.unfiltered()._clrev) | ||||
| return manifest.manifestlog(self.svfs, self, rootstore) | return manifest.manifestlog(self.svfs, self, rootstore, | ||||
| self.narrowmatch()) | |||||
| def _clrev(self, rev2): | def _clrev(self, rev2): | ||||
| """map from repo2 changelog rev to temporary rev in self.changelog""" | """map from repo2 changelog rev to temporary rev in self.changelog""" | ||||
| node = self.repo2.changelog.node(rev2) | node = self.repo2.changelog.node(rev2) | ||||
| return self.changelog.rev(node) | return self.changelog.rev(node) | ||||
| def url(self): | def url(self): | ||||
| return self._url | return self._url | ||||
| ziverify.verifyClass(repository.imanifestlog, manifest.manifestlog) | ziverify.verifyClass(repository.imanifestlog, manifest.manifestlog) | ||||
| ziverify.verifyClass(repository.imanifeststorage, manifest.manifestrevlog) | ziverify.verifyClass(repository.imanifeststorage, manifest.manifestrevlog) | ||||
| vfs = vfsmod.vfs(b'.') | vfs = vfsmod.vfs(b'.') | ||||
| fl = filelog.filelog(vfs, b'dummy.i') | fl = filelog.filelog(vfs, b'dummy.i') | ||||
| checkzobject(fl, allowextra=True) | checkzobject(fl, allowextra=True) | ||||
| # Conforms to imanifestlog. | # Conforms to imanifestlog. | ||||
| ml = manifest.manifestlog(vfs, repo, manifest.manifestrevlog(repo.svfs)) | ml = manifest.manifestlog(vfs, repo, manifest.manifestrevlog(repo.svfs), | ||||
| repo.narrowmatch()) | |||||
| checkzobject(ml) | checkzobject(ml) | ||||
| checkzobject(repo.manifestlog) | checkzobject(repo.manifestlog) | ||||
| # Conforms to imanifestrevision. | # Conforms to imanifestrevision. | ||||
| mctx = ml[repo[0].manifestnode()] | mctx = ml[repo[0].manifestnode()] | ||||
| checkzobject(mctx) | checkzobject(mctx) | ||||
| # Conforms to imanifestrevisionwritable. | # Conforms to imanifestrevisionwritable. | ||||