| hg-reviewers |
This should be a glorified code move. I did take the opportunity to
refactor things. We now have a separate function for gathering
requirements and one for validating them.
I also mode cosmetic changes to the code, such as not using
abbreviations and using a set instead of list to model missing
requirements.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/localrepo.py (96 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Gregory Szorc | Sep 12 2018, 5:54 PM |
| # process any new extensions that it may have pulled in. | # process any new extensions that it may have pulled in. | ||||
| 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) | |||||
| ensurerequirementsrecognized(requirements, supportedrequirements) | |||||
| # At this point, we know we should be capable of opening the repository. | |||||
| # 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, | ||||
| hgvfs=hgvfs, | hgvfs=hgvfs, | ||||
| requirements=requirements, | requirements=requirements, | ||||
| supportedrequirements=supportedrequirements, | |||||
| intents=intents) | intents=intents) | ||||
| def gathersupportedrequirements(ui): | |||||
| """Determine the complete set of recognized requirements.""" | |||||
| # Start with all requirements supported by this file. | |||||
| supported = set(localrepository._basesupported) | |||||
| # Execute ``featuresetupfuncs`` entries if they belong to an extension | |||||
| # relevant to this ui instance. | |||||
| modules = {m.__name__ for n, m in extensions.extensions(ui)} | |||||
| for fn in featuresetupfuncs: | |||||
| if fn.__module__ in modules: | |||||
| fn(ui, supported) | |||||
| # Add derived requirements from registered compression engines. | |||||
| for name in util.compengines: | |||||
| engine = util.compengines[name] | |||||
| if engine.revlogheader(): | |||||
| supported.add(b'exp-compression-%s' % name) | |||||
| return supported | |||||
| def ensurerequirementsrecognized(requirements, supported): | |||||
| """Validate that a set of local requirements is recognized. | |||||
| Receives a set of requirements. Raises an ``error.RepoError`` if there | |||||
| exists any requirement in that set that currently loaded code doesn't | |||||
| recognize. | |||||
| Returns a set of supported requirements. | |||||
| """ | |||||
| missing = set() | |||||
| for requirement in requirements: | |||||
| if requirement in supported: | |||||
| continue | |||||
| if not requirement or not requirement[0:1].isalnum(): | |||||
| raise error.RequirementError(_(b'.hg/requires file is corrupt')) | |||||
| missing.add(requirement) | |||||
| if missing: | |||||
| raise error.RequirementError( | |||||
| _(b'repository requires features unknown to this Mercurial: %s') % | |||||
| b' '.join(sorted(missing)), | |||||
| hint=_(b'see https://mercurial-scm.org/wiki/MissingRequirement ' | |||||
| b'for more information')) | |||||
| @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. | ||||
| 'dirstate', | 'dirstate', | ||||
| # XXX bisect was still a bit too messy at the time | # XXX bisect was still a bit too messy at the time | ||||
| # this changeset was introduced. Someone should fix | # this changeset was introduced. Someone should fix | ||||
| # the remainig bit and drop this line | # the remainig bit and drop this line | ||||
| 'bisect.state', | 'bisect.state', | ||||
| } | } | ||||
| def __init__(self, baseui, ui, origroot, wdirvfs, hgvfs, requirements, | def __init__(self, baseui, ui, origroot, wdirvfs, hgvfs, requirements, | ||||
| intents=None): | supportedrequirements, intents=None): | ||||
| """Create a new local repository instance. | """Create a new local repository instance. | ||||
| Most callers should use ``hg.repository()``, ``localrepo.instance()``, | Most callers should use ``hg.repository()``, ``localrepo.instance()``, | ||||
| or ``localrepo.makelocalrepository()`` for obtaining a new repository | or ``localrepo.makelocalrepository()`` for obtaining a new repository | ||||
| object. | object. | ||||
| Arguments: | Arguments: | ||||
| ``vfs.vfs`` rooted at the working directory. | ``vfs.vfs`` rooted at the working directory. | ||||
| hgvfs | hgvfs | ||||
| ``vfs.vfs`` rooted at .hg/ | ``vfs.vfs`` rooted at .hg/ | ||||
| requirements | requirements | ||||
| ``set`` of bytestrings representing repository opening requirements. | ``set`` of bytestrings representing repository opening requirements. | ||||
| supportedrequirements | |||||
| ``set`` of bytestrings representing repository requirements that we | |||||
| know how to open. May be a supetset of ``requirements``. | |||||
| intents | intents | ||||
| ``set`` of system strings indicating what this repo will be used | ``set`` of system strings indicating what this repo will be used | ||||
| for. | for. | ||||
| """ | """ | ||||
| self.baseui = baseui | self.baseui = baseui | ||||
| self.ui = ui | self.ui = ui | ||||
| self.origroot = origroot | self.origroot = origroot | ||||
| # vfs rooted at working directory. | # vfs rooted at working directory. | ||||
| self.wvfs = wdirvfs | self.wvfs = wdirvfs | ||||
| self.root = wdirvfs.base | self.root = wdirvfs.base | ||||
| # vfs rooted at .hg/. Used to access most non-store paths. | # vfs rooted at .hg/. Used to access most non-store paths. | ||||
| self.vfs = hgvfs | self.vfs = hgvfs | ||||
| self.path = hgvfs.base | self.path = hgvfs.base | ||||
| self.requirements = requirements | |||||
| self.supported = supportedrequirements | |||||
| self.filtername = None | self.filtername = None | ||||
| # svfs: usually rooted at .hg/store, used to access repository history | # svfs: usually rooted at .hg/store, used to access repository history | ||||
| # If this is a shared repository, this vfs may point to another | # If this is a shared repository, this vfs may point to another | ||||
| # repository's .hg/store directory. | # repository's .hg/store directory. | ||||
| self.svfs = None | self.svfs = None | ||||
| if (self.ui.configbool('devel', 'all-warnings') or | if (self.ui.configbool('devel', 'all-warnings') or | ||||
| self.ui.configbool('devel', 'check-locks')): | self.ui.configbool('devel', 'check-locks')): | ||||
| self.vfs.audit = self._getvfsward(self.vfs.audit) | self.vfs.audit = self._getvfsward(self.vfs.audit) | ||||
| # A list of callback to shape the phase if no data were found. | # A list of callback to shape the phase if no data were found. | ||||
| # Callback are in the form: func(repo, roots) --> processed root. | # Callback are in the form: func(repo, roots) --> processed root. | ||||
| # This list it to be filled by extension during repo setup | # This list it to be filled by extension during repo setup | ||||
| self._phasedefaults = [] | self._phasedefaults = [] | ||||
| if featuresetupfuncs: | |||||
| self.supported = set(self._basesupported) # use private copy | |||||
| extmods = set(m.__name__ for n, m | |||||
| in extensions.extensions(self.ui)) | |||||
| for setupfunc in featuresetupfuncs: | |||||
| if setupfunc.__module__ in extmods: | |||||
| setupfunc(self.ui, self.supported) | |||||
| else: | |||||
| self.supported = self._basesupported | |||||
| color.setup(self.ui) | color.setup(self.ui) | ||||
| # Add compression engines. | |||||
| for name in util.compengines: | |||||
| engine = util.compengines[name] | |||||
| if engine.revlogheader(): | |||||
| self.supported.add('exp-compression-%s' % name) | |||||
| # Validate that all seen repository requirements are supported. | |||||
| missingrequirements = [] | |||||
| for r in requirements: | |||||
| if r not in self.supported: | |||||
| if not r or not r[0:1].isalnum(): | |||||
| raise error.RequirementError( | |||||
| _(".hg/requires file is corrupt")) | |||||
| missingrequirements.append(r) | |||||
| missingrequirements.sort() | |||||
| if missingrequirements: | |||||
| raise error.RequirementError( | |||||
| _("repository requires features unknown to this Mercurial: %s") | |||||
| % " ".join(missingrequirements), | |||||
| hint=_("see https://mercurial-scm.org/wiki/MissingRequirement" | |||||
| " for more information")) | |||||
| self.requirements = requirements | |||||
| cachepath = self.vfs.join('cache') | cachepath = self.vfs.join('cache') | ||||
| self.sharedpath = self.path | self.sharedpath = self.path | ||||
| try: | try: | ||||
| sharedpath = self.vfs.read("sharedpath").rstrip('\n') | sharedpath = self.vfs.read("sharedpath").rstrip('\n') | ||||
| if 'relshared' in self.requirements: | if 'relshared' in self.requirements: | ||||
| sharedpath = self.vfs.join(sharedpath) | sharedpath = self.vfs.join(sharedpath) | ||||
| vfs = vfsmod.vfs(sharedpath, realpath=True) | vfs = vfsmod.vfs(sharedpath, realpath=True) | ||||
| cachepath = vfs.join('cache') | cachepath = vfs.join('cache') | ||||