# HG changeset patch # User Durham Goode # Date 1478772799 28800 # Node ID 2019fbdab07505c8f9153f1c8639c22e9f40c3b2 # Parent f84fc6a9281740d56d9be5f95176d4a803f032da manifest: delete manifest.manifest class Now that nothing uses the primary manifest class, we can delete it. diff -r f84fc6a92817 -r 2019fbdab075 mercurial/localrepo.py --- a/mercurial/localrepo.py Thu Nov 10 02:13:19 2016 -0800 +++ b/mercurial/localrepo.py Thu Nov 10 02:13:19 2016 -0800 @@ -508,7 +508,7 @@ # This is a temporary function while we migrate from manifest to # manifestlog. It allows bundlerepo and unionrepo to intercept the # manifest creation. - return manifest.manifest(self.svfs) + return manifest.manifestrevlog(self.svfs) @storecache('00manifest.i') def manifestlog(self): diff -r f84fc6a92817 -r 2019fbdab075 mercurial/manifest.py --- a/mercurial/manifest.py Thu Nov 10 02:13:19 2016 -0800 +++ b/mercurial/manifest.py Thu Nov 10 02:13:19 2016 -0800 @@ -1558,22 +1558,3 @@ def find(self, key): return self.read().find(key) - -class manifest(manifestrevlog): - def __init__(self, opener, dir='', dirlogcache=None): - '''The 'dir' and 'dirlogcache' arguments are for internal use by - manifest.manifest only. External users should create a root manifest - log with manifest.manifest(opener) and call dirlog() on it. - ''' - # During normal operations, we expect to deal with not more than four - # revs at a time (such as during commit --amend). When rebasing large - # stacks of commits, the number can go up, hence the config knob below. - cachesize = 4 - usetreemanifest = False - opts = getattr(opener, 'options', None) - if opts is not None: - cachesize = opts.get('manifestcachesize', cachesize) - usetreemanifest = opts.get('treemanifest', usetreemanifest) - self._mancache = util.lrucachedict(cachesize) - self._treeinmem = usetreemanifest - super(manifest, self).__init__(opener, dir=dir, dirlogcache=dirlogcache)