| pulkit |
| hg-reviewers |
newreporequirements() is called as part of creating a new repository.
It doesn't make much sense for it to receive a repo instance as part
of determining what requirements for new repos should be.
.. api::
localrepo.newreporequirements() receives a ui instead of a repo
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/localrepo.py (7 lines) | |||
| M | mercurial/upgrade.py (8 lines) | |||
| M | tests/simplestorerepo.py (4 lines) |
| # Add compression engines. | # Add compression engines. | ||||
| for name in util.compengines: | for name in util.compengines: | ||||
| engine = util.compengines[name] | engine = util.compengines[name] | ||||
| if engine.revlogheader(): | if engine.revlogheader(): | ||||
| self.supported.add('exp-compression-%s' % name) | self.supported.add('exp-compression-%s' % name) | ||||
| if not self.vfs.isdir(): | if not self.vfs.isdir(): | ||||
| if create: | if create: | ||||
| self.requirements = newreporequirements(self) | self.requirements = newreporequirements(self.ui) | ||||
| if not self.wvfs.exists(): | if not self.wvfs.exists(): | ||||
| self.wvfs.makedirs() | self.wvfs.makedirs() | ||||
| self.vfs.makedir(notindexed=True) | self.vfs.makedir(notindexed=True) | ||||
| if 'store' in self.requirements: | if 'store' in self.requirements: | ||||
| self.vfs.mkdir("store") | self.vfs.mkdir("store") | ||||
| def instance(ui, path, create, intents=None): | def instance(ui, path, create, intents=None): | ||||
| return localrepository(ui, util.urllocalpath(path), create, | return localrepository(ui, util.urllocalpath(path), create, | ||||
| intents=intents) | intents=intents) | ||||
| def islocal(path): | def islocal(path): | ||||
| return True | return True | ||||
| def newreporequirements(repo): | def newreporequirements(ui): | ||||
| """Determine the set of requirements for a new local repository. | """Determine the set of requirements for a new local repository. | ||||
| Extensions can wrap this function to specify custom requirements for | Extensions can wrap this function to specify custom requirements for | ||||
| new repositories. | new repositories. | ||||
| """ | """ | ||||
| ui = repo.ui | |||||
| requirements = {'revlogv1'} | requirements = {'revlogv1'} | ||||
| if ui.configbool('format', 'usestore'): | if ui.configbool('format', 'usestore'): | ||||
| requirements.add('store') | requirements.add('store') | ||||
| if ui.configbool('format', 'usefncache'): | if ui.configbool('format', 'usefncache'): | ||||
| requirements.add('fncache') | requirements.add('fncache') | ||||
| if ui.configbool('format', 'dotencode'): | if ui.configbool('format', 'dotencode'): | ||||
| requirements.add('dotencode') | requirements.add('dotencode') | ||||
| revlogv2 = ui.config('experimental', 'revlogv2') | revlogv2 = ui.config('experimental', 'revlogv2') | ||||
| if revlogv2 == 'enable-unstable-format-and-corrupt-my-data': | if revlogv2 == 'enable-unstable-format-and-corrupt-my-data': | ||||
| requirements.remove('revlogv1') | requirements.remove('revlogv1') | ||||
| # generaldelta is implied by revlogv2. | # generaldelta is implied by revlogv2. | ||||
| requirements.discard('generaldelta') | requirements.discard('generaldelta') | ||||
| requirements.add(REVLOGV2_REQUIREMENT) | requirements.add(REVLOGV2_REQUIREMENT) | ||||
| # experimental config: format.internal-phase | # experimental config: format.internal-phase | ||||
| if repo.ui.configbool('format', 'internal-phase'): | if ui.configbool('format', 'internal-phase'): | ||||
| requirements.add('internal-phase') | requirements.add('internal-phase') | ||||
| return requirements | return requirements | ||||
| Many format variant are controlled by a 'requirement'. We define a small | Many format variant are controlled by a 'requirement'. We define a small | ||||
| subclass to factor the code. | subclass to factor the code. | ||||
| """ | """ | ||||
| # the requirement that control this format variant | # the requirement that control this format variant | ||||
| _requirement = None | _requirement = None | ||||
| @staticmethod | @staticmethod | ||||
| def _newreporequirements(repo): | def _newreporequirements(ui): | ||||
| return localrepo.newreporequirements(repo) | return localrepo.newreporequirements(ui) | ||||
| @classmethod | @classmethod | ||||
| def fromrepo(cls, repo): | def fromrepo(cls, repo): | ||||
| assert cls._requirement is not None | assert cls._requirement is not None | ||||
| return cls._requirement in repo.requirements | return cls._requirement in repo.requirements | ||||
| @classmethod | @classmethod | ||||
| def fromconfig(cls, repo): | def fromconfig(cls, repo): | ||||
| assert cls._requirement is not None | assert cls._requirement is not None | ||||
| return cls._requirement in cls._newreporequirements(repo) | return cls._requirement in cls._newreporequirements(repo.ui) | ||||
| @registerformatvariant | @registerformatvariant | ||||
| class fncache(requirementformatvariant): | class fncache(requirementformatvariant): | ||||
| name = 'fncache' | name = 'fncache' | ||||
| _requirement = 'fncache' | _requirement = 'fncache' | ||||
| default = True | default = True | ||||
| blockedreqs = blocksourcerequirements(repo) & repo.requirements | blockedreqs = blocksourcerequirements(repo) & repo.requirements | ||||
| if blockedreqs: | if blockedreqs: | ||||
| raise error.Abort(_('cannot upgrade repository; unsupported source ' | raise error.Abort(_('cannot upgrade repository; unsupported source ' | ||||
| 'requirement: %s') % | 'requirement: %s') % | ||||
| _(', ').join(sorted(blockedreqs))) | _(', ').join(sorted(blockedreqs))) | ||||
| # FUTURE there is potentially a need to control the wanted requirements via | # FUTURE there is potentially a need to control the wanted requirements via | ||||
| # command arguments or via an extension hook point. | # command arguments or via an extension hook point. | ||||
| newreqs = localrepo.newreporequirements(repo) | newreqs = localrepo.newreporequirements(repo.ui) | ||||
| newreqs.update(preservedrequirements(repo)) | newreqs.update(preservedrequirements(repo)) | ||||
| noremovereqs = (repo.requirements - newreqs - | noremovereqs = (repo.requirements - newreqs - | ||||
| supportremovedrequirements(repo)) | supportremovedrequirements(repo)) | ||||
| if noremovereqs: | if noremovereqs: | ||||
| raise error.Abort(_('cannot upgrade repository; requirement would be ' | raise error.Abort(_('cannot upgrade repository; requirement would be ' | ||||
| 'removed: %s') % _(', ').join(sorted(noremovereqs))) | 'removed: %s') % _(', ').join(sorted(noremovereqs))) | ||||
| def file(self, f): | def file(self, f): | ||||
| return filestorage(self.svfs, f) | return filestorage(self.svfs, f) | ||||
| repo.__class__ = simplestorerepo | repo.__class__ = simplestorerepo | ||||
| def featuresetup(ui, supported): | def featuresetup(ui, supported): | ||||
| supported.add(REQUIREMENT) | supported.add(REQUIREMENT) | ||||
| def newreporequirements(orig, repo): | def newreporequirements(orig, ui): | ||||
| """Modifies default requirements for new repos to use the simple store.""" | """Modifies default requirements for new repos to use the simple store.""" | ||||
| requirements = orig(repo) | requirements = orig(ui) | ||||
| # These requirements are only used to affect creation of the store | # These requirements are only used to affect creation of the store | ||||
| # object. We have our own store. So we can remove them. | # object. We have our own store. So we can remove them. | ||||
| # TODO do this once we feel like taking the test hit. | # TODO do this once we feel like taking the test hit. | ||||
| #if 'fncache' in requirements: | #if 'fncache' in requirements: | ||||
| # requirements.remove('fncache') | # requirements.remove('fncache') | ||||
| #if 'dotencode' in requirements: | #if 'dotencode' in requirements: | ||||
| # requirements.remove('dotencode') | # requirements.remove('dotencode') | ||||