[PATCH 10 of 10] manifest: delete manifest.manifest class

Durham Goode durham at fb.com
Wed Nov 9 14:37:17 EST 2016


Also, this series depends on the 7 patch series before. It seems like 
1-6 of that series was queued, but #7 has not been yet (though the email 
says it's to be queued).


On 11/9/16 7:35 PM, Durham Goode wrote:
> Sorry for the long series, but this is the final series in the 
> manifest refactor. The last patch deletes the manifest class.  All the 
> patches are pretty easy too.
>
>
> On 11/9/16 7:31 PM, Durham Goode wrote:
>> # HG changeset patch
>> # User Durham Goode <durham at fb.com>
>> # Date 1478687226 28800
>> #      Wed Nov 09 02:27:06 2016 -0800
>> # Node ID 6b0d7823ab2c4442faacb4e517752ff9b3f79065
>> # Parent  5cc0f288a11fc7cbf1e2526ee4269dd79889383e
>> manifest: delete manifest.manifest class
>>
>> Now that nothing uses the primary manifest class, we can delete it.
>>
>> diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
>> --- a/mercurial/localrepo.py
>> +++ b/mercurial/localrepo.py
>> @@ -508,7 +508,7 @@ class localrepository(object):
>>           # 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 --git a/mercurial/manifest.py b/mercurial/manifest.py
>> --- a/mercurial/manifest.py
>> +++ b/mercurial/manifest.py
>> @@ -1558,22 +1558,3 @@ class treemanifestctx(object):
>>         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)
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel at mercurial-scm.org
>> https://urldefense.proofpoint.com/v2/url?u=https-3A__www.mercurial-2Dscm.org_mailman_listinfo_mercurial-2Ddevel&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=nuarHzhP1wi1T9iURRCj1A&m=lDx5zEd8t8-jhhF14RJsXBY3IMNpkNpSTX7gwTihdIg&s=4Og1LbD9xRPXB_Pz77JzrOwJJqYMH5L0qdnzN3VyX2A&e= 
>>
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://urldefense.proofpoint.com/v2/url?u=https-3A__www.mercurial-2Dscm.org_mailman_listinfo_mercurial-2Ddevel&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=nuarHzhP1wi1T9iURRCj1A&m=VU6sUqbldGnrPwq_Fc7CACMuWqR2ztGpmx-nnxw1J98&s=u0YT3P_4A0hhhx7kMgp66y6VVHZwRMKyYcdSlMmkx84&e= 




More information about the Mercurial-devel mailing list