# HG changeset patch # User Pierre-Yves David # Date 1641891363 -3600 # Node ID 4a9570e389b2b052b9dd7bed37218d0a2dd97565 # Parent fc80752dbb24636353bcdb4a62cc8fbfd938c449 share-safe: add support for static-http repository 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. Differential Revision: https://phab.mercurial-scm.org/D11996 diff -r fc80752dbb24 -r 4a9570e389b2 mercurial/statichttprepo.py --- a/mercurial/statichttprepo.py Tue Jan 11 09:36:10 2022 +0100 +++ b/mercurial/statichttprepo.py Tue Jan 11 09:56:03 2022 +0100 @@ -22,6 +22,7 @@ namespaces, pathutil, pycompat, + requirements as requirementsmod, url, util, vfs as vfsmod, @@ -197,6 +198,9 @@ # we do not care about empty old-style repositories here msg = _(b"'%s' does not appear to be an hg repository") % path 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) localrepo.ensurerequirementsrecognized(