This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4570

statichttprepo: use new functions for requirements validation
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6192980553b4: statichttprepo: use new functions for requirements validation
Summary

The new code in localrepo for requirements gathering and validation
is more robust than scmutil.readrequires(). Let's port statichttprepo
to it.

Since scmutil.readrequires() is no longer used, it has been removed.

It is possible extensions were monkeypatching this to supplement the
set of supported requirements. But the proper way to do that is to
register a featuresetupfuncs. I'm comfortable forcing the API break
because featuresetupfuncs is more robust and has been supported for
a while.

.. api::

``scmutil.readrequires()`` has been removed.

Use ``localrepo.featuresetupfuncs`` to register new repository
requirements.

Use ``localrepo.ensurerequirementsrecognized()`` to validate them.

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/scmutil.py (19 lines)
Mmercurial/statichttprepo.py (7 lines)

Diff 11168

mercurial/scmutil.py

ui.warn(_("%s has not been committed yet, so no copy " ui.warn(_("%s has not been committed yet, so no copy "
"data will be stored for %s.\n") "data will be stored for %s.\n")
% (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd))) % (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd)))
if repo.dirstate[dst] in '?r' and not dryrun: if repo.dirstate[dst] in '?r' and not dryrun:
wctx.add([dst]) wctx.add([dst])
elif not dryrun: elif not dryrun:
wctx.copy(origsrc, dst) wctx.copy(origsrc, dst)
def readrequires(opener, supported):
'''Reads and parses .hg/requires and checks if all entries found
are in the list of supported features.'''
requirements = set(opener.read("requires").splitlines())
missings = []
for r in requirements:
if r not in supported:
if not r or not r[0:1].isalnum():
raise error.RequirementError(_(".hg/requires file is corrupt"))
missings.append(r)
missings.sort()
if missings:
raise error.RequirementError(
_("repository requires features unknown to this Mercurial: %s")
% " ".join(missings),
hint=_("see https://mercurial-scm.org/wiki/MissingRequirement"
" for more information"))
return requirements
def writerequires(opener, requirements): def writerequires(opener, requirements):
with opener('requires', 'w') as fp: with opener('requires', 'w') as fp:
for r in sorted(requirements): for r in sorted(requirements):
fp.write("%s\n" % r) fp.write("%s\n" % r)
class filecachesubentry(object): class filecachesubentry(object):
def __init__(self, path, stat): def __init__(self, path, stat):
self.path = path self.path = path

mercurial/statichttprepo.py

from .i18n import _ from .i18n import _
from . import ( from . import (
changelog, changelog,
error, error,
localrepo, localrepo,
manifest, manifest,
namespaces, namespaces,
pathutil, pathutil,
scmutil,
store, store,
url, url,
util, util,
vfs as vfsmod, vfs as vfsmod,
) )
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
self.vfs = vfsclass(self.path) self.vfs = vfsclass(self.path)
self.cachevfs = vfsclass(self.vfs.join('cache')) self.cachevfs = vfsclass(self.vfs.join('cache'))
self._phasedefaults = [] self._phasedefaults = []
self.names = namespaces.namespaces() self.names = namespaces.namespaces()
self.filtername = None self.filtername = None
try: try:
requirements = scmutil.readrequires(self.vfs, self.supported) requirements = set(self.vfs.read(b'requires').splitlines())
except IOError as inst: except IOError as inst:
if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT:
raise raise
requirements = set() requirements = set()
# check if it is a non-empty old-style repository # check if it is a non-empty old-style repository
try: try:
fp = self.vfs("00changelog.i") fp = self.vfs("00changelog.i")
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 = _("'%s' does not appear to be an hg repository") % path msg = _("'%s' does not appear to be an hg repository") % path
raise error.RepoError(msg) raise error.RepoError(msg)
supportedrequirements = localrepo.gathersupportedrequirements(ui)
localrepo.ensurerequirementsrecognized(requirements,
supportedrequirements)
# setup store # setup store
self.store = store.store(requirements, self.path, vfsclass) self.store = store.store(requirements, self.path, vfsclass)
self.spath = self.store.path self.spath = self.store.path
self.svfs = self.store.opener self.svfs = self.store.opener
self.sjoin = self.store.join self.sjoin = self.store.join
self._filecache = {} self._filecache = {}
self.requirements = requirements self.requirements = requirements