| hg-reviewers |
Just because we know how to handle each listed requirement doesn't
mean that set of requirements is reasonable.
This commit introduces an extension-wrappable function to validate
that a set of requirements makes sense.
We could combine this with ensurerequirementsrecognized(). But I think
having a line between basic membership testing and compatibility
checking is more powerful as it will help differentiate between
missing support and buggy behavior.
| 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 (28 lines) | |||
| M | mercurial/statichttprepo.py (1 line) |
| try: | try: | ||||
| ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base) | ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base) | ||||
| except IOError: | except IOError: | ||||
| pass | pass | ||||
| else: | else: | ||||
| extensions.loadall(ui) | extensions.loadall(ui) | ||||
| supportedrequirements = gathersupportedrequirements(ui) | supportedrequirements = gathersupportedrequirements(ui) | ||||
| # We first validate the requirements are known. | |||||
| ensurerequirementsrecognized(requirements, supportedrequirements) | ensurerequirementsrecognized(requirements, supportedrequirements) | ||||
| # Then we validate that the known set is reasonable to use together. | |||||
| ensurerequirementscompatible(ui, requirements) | |||||
| # At this point, we know we should be capable of opening the repository. | # At this point, we know we should be capable of opening the repository. | ||||
| # Now get on with doing that. | # Now get on with doing that. | ||||
| return localrepository( | return localrepository( | ||||
| baseui=baseui, | baseui=baseui, | ||||
| ui=ui, | ui=ui, | ||||
| origroot=path, | origroot=path, | ||||
| wdirvfs=wdirvfs, | wdirvfs=wdirvfs, | ||||
| if missing: | if missing: | ||||
| raise error.RequirementError( | raise error.RequirementError( | ||||
| _(b'repository requires features unknown to this Mercurial: %s') % | _(b'repository requires features unknown to this Mercurial: %s') % | ||||
| b' '.join(sorted(missing)), | b' '.join(sorted(missing)), | ||||
| hint=_(b'see https://mercurial-scm.org/wiki/MissingRequirement ' | hint=_(b'see https://mercurial-scm.org/wiki/MissingRequirement ' | ||||
| b'for more information')) | b'for more information')) | ||||
| def ensurerequirementscompatible(ui, requirements): | |||||
| """Validates that a set of recognized requirements is mutually compatible. | |||||
| Some requirements may not be compatible with others or require | |||||
| config options that aren't enabled. This function is called during | |||||
| repository opening to ensure that the set of requirements needed | |||||
| to open a repository is sane and compatible with config options. | |||||
| Extensions can monkeypatch this function to perform additional | |||||
| checking. | |||||
| ``error.RepoError`` should be raised on failure. | |||||
| """ | |||||
| if b'exp-sparse' in requirements and not sparse.enabled: | |||||
| raise error.RepoError(_(b'repository is using sparse feature but ' | |||||
| b'sparse is not enabled; enable the ' | |||||
| b'"sparse" extensions to access')) | |||||
| @interfaceutil.implementer(repository.completelocalrepository) | @interfaceutil.implementer(repository.completelocalrepository) | ||||
| class localrepository(object): | class localrepository(object): | ||||
| # obsolete experimental requirements: | # obsolete experimental requirements: | ||||
| # - manifestv2: An experimental new manifest format that allowed | # - manifestv2: An experimental new manifest format that allowed | ||||
| # for stem compression of long paths. Experiment ended up not | # for stem compression of long paths. Experiment ended up not | ||||
| # being successful (repository sizes went up due to worse delta | # being successful (repository sizes went up due to worse delta | ||||
| # chains), and the code was deleted in 4.6. | # chains), and the code was deleted in 4.6. | ||||
| if not vfs.exists(): | if not vfs.exists(): | ||||
| raise error.RepoError( | raise error.RepoError( | ||||
| _('.hg/sharedpath points to nonexistent directory %s') % s) | _('.hg/sharedpath points to nonexistent directory %s') % s) | ||||
| self.sharedpath = s | self.sharedpath = s | ||||
| except IOError as inst: | except IOError as inst: | ||||
| if inst.errno != errno.ENOENT: | if inst.errno != errno.ENOENT: | ||||
| raise | raise | ||||
| if 'exp-sparse' in self.requirements and not sparse.enabled: | |||||
| raise error.RepoError(_('repository is using sparse feature but ' | |||||
| 'sparse is not enabled; enable the ' | |||||
| '"sparse" extensions to access')) | |||||
| self.store = store.store( | self.store = store.store( | ||||
| self.requirements, self.sharedpath, | self.requirements, self.sharedpath, | ||||
| lambda base: vfsmod.vfs(base, cacheaudited=True)) | lambda base: vfsmod.vfs(base, cacheaudited=True)) | ||||
| self.spath = self.store.path | self.spath = self.store.path | ||||
| self.svfs = self.store.vfs | self.svfs = self.store.vfs | ||||
| self.sjoin = self.store.join | self.sjoin = self.store.join | ||||
| self.vfs.createmode = self.store.createmode | self.vfs.createmode = self.store.createmode | ||||
| self.cachevfs = vfsmod.vfs(cachepath, cacheaudited=True) | self.cachevfs = vfsmod.vfs(cachepath, cacheaudited=True) | ||||
| raise | raise | ||||
| # we do not care about empty old-style repositories here | # we do not care about empty old-style repositories here | ||||
| msg = _("'%s' does not appear to be an hg repository") % path | msg = _("'%s' does not appear to be an hg repository") % path | ||||
| raise error.RepoError(msg) | raise error.RepoError(msg) | ||||
| supportedrequirements = localrepo.gathersupportedrequirements(ui) | supportedrequirements = localrepo.gathersupportedrequirements(ui) | ||||
| localrepo.ensurerequirementsrecognized(requirements, | localrepo.ensurerequirementsrecognized(requirements, | ||||
| supportedrequirements) | supportedrequirements) | ||||
| localrepo.ensurerequirementscompatible(ui, requirements) | |||||
| # setup store | # setup store | ||||
| self.store = store.store(requirements, self.path, vfsclass) | self.store = store.store(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 | ||||