Mercurial > hg-stable
changeset 30381:fccc3eea2ddb
manifest: delete unused dirlog and _newmanifest functions
As part of migrating all manifest functionality out of manifest.manifest, let's
migrate a couple spots off of manifest.dirlog() to use the revlog specific
accessor. Then we can delete manifest.dirlog() and other unused functions.
| author | Durham Goode <durham@fb.com> |
|---|---|
| date | Thu, 10 Nov 2016 02:13:19 -0800 |
| parents | 10c924596e5c |
| children | 7c7d845f8b64 |
| files | mercurial/cmdutil.py mercurial/manifest.py mercurial/repair.py |
| diffstat | 3 files changed, 2 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Thu Nov 10 02:13:19 2016 -0800 +++ b/mercurial/cmdutil.py Thu Nov 10 02:13:19 2016 -0800 @@ -555,7 +555,7 @@ if 'treemanifest' not in repo.requirements: raise error.Abort(_("--dir can only be used on repos with " "treemanifest enabled")) - dirlog = repo.manifest.dirlog(dir) + dirlog = repo.manifestlog._revlog.dirlog(dir) if len(dirlog): r = dirlog elif mf:
--- a/mercurial/manifest.py Thu Nov 10 02:13:19 2016 -0800 +++ b/mercurial/manifest.py Thu Nov 10 02:13:19 2016 -0800 @@ -1581,19 +1581,3 @@ self._mancache = util.lrucachedict(cachesize) self._treeinmem = usetreemanifest super(manifest, self).__init__(opener, dir=dir, dirlogcache=dirlogcache) - - def _newmanifest(self, data=''): - if self._treeinmem: - return treemanifest(self._dir, data) - return manifestdict(data) - - def dirlog(self, dir): - """This overrides the base revlog implementation to allow construction - 'manifest' types instead of manifestrevlog types. This is only needed - until we migrate off the 'manifest' type.""" - if dir: - assert self._treeondisk - if dir not in self._dirlogcache: - self._dirlogcache[dir] = manifest(self.opener, dir, - self._dirlogcache) - return self._dirlogcache[dir]
--- a/mercurial/repair.py Thu Nov 10 02:13:19 2016 -0800 +++ b/mercurial/repair.py Thu Nov 10 02:13:19 2016 -0800 @@ -174,7 +174,7 @@ if (unencoded.startswith('meta/') and unencoded.endswith('00manifest.i')): dir = unencoded[5:-12] - repo.manifest.dirlog(dir).strip(striprev, tr) + repo.manifestlog._revlog.dirlog(dir).strip(striprev, tr) for fn in files: repo.file(fn).strip(striprev, tr) tr.endgroup()