This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4568

localrepo: read requirements file in makelocalrepository()
ClosedPublic

Authored by indygreg on Sep 13 2018, 12:29 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6a3162ed881d: localrepo: read requirements file in makelocalrepository()
Summary

Previously, scmutil.readrequires() loaded the requirements file
and validated its content against what was supported.

Requirements translate to repository features and are critical to
our plans to dynamically create local repository types. So, we must
load them in makelocalrepository() before a repository instance is
constructed.

This commit moves the reading of the .hg/requires file to
makelocalrepository(). Because scmutil.readrequires() was performing
I/O and validation, we inlined the validation into
localrepository.init and removed scmutil.readrequires().

I plan to remove scmutil.readrequires() in a future commit (we can't
do it now because statichttprepo uses it).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (42 lines)

Diff 11166

mercurial/localrepo.py

try: try:
hgvfs.stat() hgvfs.stat()
except OSError as e: except OSError as e:
if e.errno != errno.ENOENT: if e.errno != errno.ENOENT:
raise raise
raise error.RepoError(_(b'repository %s not found') % path) 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 # The .hg/hgrc file may load extensions or contain config options
# that influence repository construction. Attempt to load it and # that influence repository construction. Attempt to load it and
# 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)
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,
intents=intents) intents=intents)
@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
# XXX shouldn't be dirstate covered by the wlock? # XXX shouldn't be dirstate covered by the wlock?
'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, intents=None): def __init__(self, baseui, ui, origroot, wdirvfs, hgvfs, requirements,
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:
baseui baseui
``ui.ui`` instance that ``ui`` argument was based off of. ``ui.ui`` instance that ``ui`` argument was based off of.
ui ui
``ui.ui`` instance for use by the repository. ``ui.ui`` instance for use by the repository.
origroot origroot
``bytes`` path to working directory root of this repository. ``bytes`` path to working directory root of this repository.
wdirvfs wdirvfs
``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
``set`` of bytestrings representing repository opening 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.
color.setup(self.ui) color.setup(self.ui)
# Add compression engines. # Add compression engines.
for name in util.compengines: for name in util.compengines:
engine = util.compengines[name] engine = util.compengines[name]
if engine.revlogheader(): if engine.revlogheader():
self.supported.add('exp-compression-%s' % name) 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') 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)