mercurial-scm/hg: comparison mercurial/localrepo.py

equal deleted inserted replaced

-:2f067e365532
+:6a3162ed881d
 if e.errno != errno.ENOENT:
 raise
 raise error.RepoError(_(b'repository %s not found') % path)
+# .hg/requires file contains a newline-delimited list of
+# features/capabilities the opener (us) must have in order to use
+# the repository. This file was introduced in Mercurial 0.9.2,
+# which means very old repositories may not have one. We assume
+# a missing file translates to no requirements.
+try:
+requirements = set(hgvfs.read(b'requires').splitlines())
+except IOError as e:
+if e.errno != errno.ENOENT:
+raise
+requirements = set()
 # The .hg/hgrc file may load extensions or contain config options
 # that influence repository construction. Attempt to load it and
 # process any new extensions that it may have pulled in.
 try:
 ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base)
 baseui=baseui,
 ui=ui,
 origroot=path,
 wdirvfs=wdirvfs,
 hgvfs=hgvfs,
+requirements=requirements,
 intents=intents)
 @interfaceutil.implementer(repository.completelocalrepository)
 class localrepository(object):
 # this changeset was introduced. Someone should fix
 # the remainig bit and drop this line
 'bisect.state',
 }
-def __init__(self, baseui, ui, origroot, wdirvfs, hgvfs, intents=None):
+def __init__(self, baseui, ui, origroot, wdirvfs, hgvfs, requirements,
+intents=None):
 """Create a new local repository instance.
 Most callers should use ``hg.repository()``, ``localrepo.instance()``,
 or ``localrepo.makelocalrepository()`` for obtaining a new repository
 object.
 wdirvfs
 ``vfs.vfs`` rooted at the working directory.
 hgvfs
 ``vfs.vfs`` rooted at .hg/
+requirements
+``set`` of bytestrings representing repository opening requirements.
 intents
 ``set`` of system strings indicating what this repo will be used
 for.
 """
 for name in util.compengines:
 engine = util.compengines[name]
 if engine.revlogheader():
 self.supported.add('exp-compression-%s' % name)
-try:
+# Validate that all seen repository requirements are supported.
-self.requirements = scmutil.readrequires(self.vfs, self.supported)
+missingrequirements = []
-except IOError as inst:
+for r in requirements:
-if inst.errno != errno.ENOENT:
+if r not in self.supported:
-raise
+if not r or not r[0:1].isalnum():
-self.requirements = set()
+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')
 self.sharedpath = self.path
 try:
 sharedpath = self.vfs.read("sharedpath").rstrip('\n')

changeset 39692	6a3162ed881d
parent 39691	2f067e365532
child 39693	5b8e9b2060ef