| Alphare |
| hg-reviewers |
We need to read the second requirements file in the static-http case too. Otherwise, static-http would miss most of the requirements and misbehave.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/statichttprepo.py (4 lines) |
| branchmap, | branchmap, | ||||
| changelog, | changelog, | ||||
| error, | error, | ||||
| localrepo, | localrepo, | ||||
| manifest, | manifest, | ||||
| namespaces, | namespaces, | ||||
| pathutil, | pathutil, | ||||
| pycompat, | pycompat, | ||||
| requirements as requirementsmod, | |||||
| url, | url, | ||||
| util, | util, | ||||
| vfs as vfsmod, | vfs as vfsmod, | ||||
| ) | ) | ||||
| from .utils import ( | from .utils import ( | ||||
| urlutil, | urlutil, | ||||
| ) | ) | ||||
| fp.read(1) | fp.read(1) | ||||
| fp.close() | fp.close() | ||||
| except IOError as inst: | except IOError as inst: | ||||
| if inst.errno != errno.ENOENT: | if inst.errno != errno.ENOENT: | ||||
| raise | raise | ||||
| # we do not care about empty old-style repositories here | # we do not care about empty old-style repositories here | ||||
| msg = _(b"'%s' does not appear to be an hg repository") % path | msg = _(b"'%s' does not appear to be an hg repository") % path | ||||
| raise error.RepoError(msg) | raise error.RepoError(msg) | ||||
| if requirementsmod.SHARESAFE_REQUIREMENT in requirements: | |||||
| storevfs = vfsclass(self.vfs.join(b'store')) | |||||
| requirements |= set(storevfs.read(b'requires').splitlines()) | |||||
| supportedrequirements = localrepo.gathersupportedrequirements(ui) | supportedrequirements = localrepo.gathersupportedrequirements(ui) | ||||
| localrepo.ensurerequirementsrecognized( | localrepo.ensurerequirementsrecognized( | ||||
| requirements, supportedrequirements | requirements, supportedrequirements | ||||
| ) | ) | ||||
| localrepo.ensurerequirementscompatible(ui, requirements) | localrepo.ensurerequirementscompatible(ui, requirements) | ||||
| self.nodeconstants = sha1nodeconstants | self.nodeconstants = sha1nodeconstants | ||||
| self.nullid = self.nodeconstants.nullid | self.nullid = self.nodeconstants.nullid | ||||