This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10105

requirements: add constant for revlog v1 requirement
ClosedPublic

Authored by Alphare on Mar 4 2021, 3:32 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGee91966aec0f: requirements: add constant for revlog v1 requirement
Summary

Since this series is adding a new requirement, we might as well clean up while
we're here.

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.

Event Timeline

Alphare created this revision.Mar 4 2021, 3:32 AM
pulkit accepted this revision.Mar 4 2021, 3:59 AM
This revision is now accepted and ready to land.Mar 4 2021, 3:59 AM
Alphare added a commit: rHGee91966aec0f: requirements: add constant for revlog v1 requirement.Mar 4 2021, 7:38 AM
Closed by commit rHGee91966aec0f: requirements: add constant for revlog v1 requirement (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 26061

mercurial/exchangev2.py

) )
from . import ( from . import (
bookmarks, bookmarks,
error, error,
mdiff, mdiff,
narrowspec, narrowspec,
phases, phases,
pycompat, pycompat,
requirements as requirementsmod,
setdiscovery, setdiscovery,
) )
from .interfaces import repository from .interfaces import repository
def pull(pullop): def pull(pullop):
"""Pull using wire protocol version 2.""" """Pull using wire protocol version 2."""
repo = pullop.repo repo = pullop.repo
return False return False
# Only works on empty repos. # Only works on empty repos.
if len(repo): if len(repo):
return False return False
# TODO This is super hacky. There needs to be a storage API for this. We # TODO This is super hacky. There needs to be a storage API for this. We
# also need to check for compatibility with the remote. # also need to check for compatibility with the remote.
if b'revlogv1' not in repo.requirements: if requirementsmod.REVLOGV1_REQUIREMENT not in repo.requirements:
return False return False
return True return True
def _fetchrawstorefiles(repo, remote): def _fetchrawstorefiles(repo, remote):
with remote.commandexecutor() as e: with remote.commandexecutor() as e:
objs = e.callcommand( objs = e.callcommand(

mercurial/localrepo.py

options[b'manifestcachesize'] = manifestcachesize options[b'manifestcachesize'] = manifestcachesize
# In the absence of another requirement superseding a revlog-related # In the absence of another requirement superseding a revlog-related
# requirement, we have to assume the repo is using revlog version 0. # requirement, we have to assume the repo is using revlog version 0.
# This revlog format is super old and we don't bother trying to parse # This revlog format is super old and we don't bother trying to parse
# opener options for it because those options wouldn't do anything # opener options for it because those options wouldn't do anything
# meaningful on such old repos. # meaningful on such old repos.
if ( if (
b'revlogv1' in requirements requirementsmod.REVLOGV1_REQUIREMENT in requirements
or requirementsmod.REVLOGV2_REQUIREMENT in requirements or requirementsmod.REVLOGV2_REQUIREMENT in requirements
): ):
options.update(resolverevlogstorevfsoptions(ui, requirements, features)) options.update(resolverevlogstorevfsoptions(ui, requirements, features))
else: # explicitly mark repo as using revlogv0 else: # explicitly mark repo as using revlogv0
options[b'revlogv0'] = True options[b'revlogv0'] = True
if requirementsmod.COPIESSDC_REQUIREMENT in requirements: if requirementsmod.COPIESSDC_REQUIREMENT in requirements:
options[b'copies-storage'] = b'changeset-sidedata' options[b'copies-storage'] = b'changeset-sidedata'
else: else:
writecopiesto = ui.config(b'experimental', b'copies.write-to') writecopiesto = ui.config(b'experimental', b'copies.write-to')
copiesextramode = (b'changeset-only', b'compatibility') copiesextramode = (b'changeset-only', b'compatibility')
if writecopiesto in copiesextramode: if writecopiesto in copiesextramode:
options[b'copies-storage'] = b'extra' options[b'copies-storage'] = b'extra'
return options return options
def resolverevlogstorevfsoptions(ui, requirements, features): def resolverevlogstorevfsoptions(ui, requirements, features):
"""Resolve opener options specific to revlogs.""" """Resolve opener options specific to revlogs."""
options = {} options = {}
options[b'flagprocessors'] = {} options[b'flagprocessors'] = {}
if b'revlogv1' in requirements: if requirementsmod.REVLOGV1_REQUIREMENT in requirements:
options[b'revlogv1'] = True options[b'revlogv1'] = True
if requirementsmod.REVLOGV2_REQUIREMENT in requirements: if requirementsmod.REVLOGV2_REQUIREMENT in requirements:
options[b'revlogv2'] = True options[b'revlogv2'] = True
if b'generaldelta' in requirements: if b'generaldelta' in requirements:
options[b'generaldelta'] = True options[b'generaldelta'] = True
# experimental config: format.chunkcachesize # experimental config: format.chunkcachesize
""" """
# 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
# being successful (repository sizes went up due to worse delta # being successful (repository sizes went up due to worse delta
# chains), and the code was deleted in 4.6. # chains), and the code was deleted in 4.6.
supportedformats = { supportedformats = {
b'revlogv1', requirementsmod.REVLOGV1_REQUIREMENT,
b'generaldelta', b'generaldelta',
requirementsmod.TREEMANIFEST_REQUIREMENT, requirementsmod.TREEMANIFEST_REQUIREMENT,
requirementsmod.COPIESSDC_REQUIREMENT, requirementsmod.COPIESSDC_REQUIREMENT,
requirementsmod.REVLOGV2_REQUIREMENT, requirementsmod.REVLOGV2_REQUIREMENT,
requirementsmod.SIDEDATA_REQUIREMENT, requirementsmod.SIDEDATA_REQUIREMENT,
requirementsmod.SPARSEREVLOG_REQUIREMENT, requirementsmod.SPARSEREVLOG_REQUIREMENT,
requirementsmod.NODEMAP_REQUIREMENT, requirementsmod.NODEMAP_REQUIREMENT,
bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT, bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT,
raise error.Abort( raise error.Abort(
_( _(
b'unable to determine repository requirements for ' b'unable to determine repository requirements for '
b'storage backend: %s' b'storage backend: %s'
) )
% createopts[b'backend'] % createopts[b'backend']
) )
requirements = {b'revlogv1'} requirements = {requirementsmod.REVLOGV1_REQUIREMENT}
if ui.configbool(b'format', b'usestore'): if ui.configbool(b'format', b'usestore'):
requirements.add(b'store') requirements.add(b'store')
if ui.configbool(b'format', b'usefncache'): if ui.configbool(b'format', b'usefncache'):
requirements.add(b'fncache') requirements.add(b'fncache')
if ui.configbool(b'format', b'dotencode'): if ui.configbool(b'format', b'dotencode'):
requirements.add(b'dotencode') requirements.add(b'dotencode')
compengines = ui.configlist(b'format', b'revlog-compression') compengines = ui.configlist(b'format', b'revlog-compression')
if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'): if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'):
requirements.add(requirementsmod.SIDEDATA_REQUIREMENT) requirements.add(requirementsmod.SIDEDATA_REQUIREMENT)
requirements.add(requirementsmod.COPIESSDC_REQUIREMENT) requirements.add(requirementsmod.COPIESSDC_REQUIREMENT)
if ui.configbool(b'experimental', b'treemanifest'): if ui.configbool(b'experimental', b'treemanifest'):
requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT) requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT)
revlogv2 = ui.config(b'experimental', b'revlogv2') revlogv2 = ui.config(b'experimental', b'revlogv2')
if revlogv2 == b'enable-unstable-format-and-corrupt-my-data': if revlogv2 == b'enable-unstable-format-and-corrupt-my-data':
requirements.remove(b'revlogv1') requirements.remove(requirementsmod.REVLOGV1_REQUIREMENT)
# generaldelta is implied by revlogv2. # generaldelta is implied by revlogv2.
requirements.discard(b'generaldelta') requirements.discard(b'generaldelta')
requirements.add(requirementsmod.REVLOGV2_REQUIREMENT) requirements.add(requirementsmod.REVLOGV2_REQUIREMENT)
# experimental config: format.internal-phase # experimental config: format.internal-phase
if ui.configbool(b'format', b'internal-phase'): if ui.configbool(b'format', b'internal-phase'):
requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT) requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT)
if createopts.get(b'narrowfiles'): if createopts.get(b'narrowfiles'):

mercurial/requirements.py

# Enables the internal phase which is used to hide changesets instead # Enables the internal phase which is used to hide changesets instead
# of stripping them # of stripping them
INTERNAL_PHASE_REQUIREMENT = b'internal-phase' INTERNAL_PHASE_REQUIREMENT = b'internal-phase'
# Stores manifest in Tree structure # Stores manifest in Tree structure
TREEMANIFEST_REQUIREMENT = b'treemanifest' TREEMANIFEST_REQUIREMENT = b'treemanifest'
REVLOGV1_REQUIREMENT = b'revlogv1'
# Increment the sub-version when the revlog v2 format changes to lock out old # Increment the sub-version when the revlog v2 format changes to lock out old
# clients. # clients.
REVLOGV2_REQUIREMENT = b'exp-revlogv2.1' REVLOGV2_REQUIREMENT = b'exp-revlogv2.1'
# A repository with the sparserevlog feature will have delta chains that # A repository with the sparserevlog feature will have delta chains that
# can spread over a larger span. Sparse reading cuts these large spans into # can spread over a larger span. Sparse reading cuts these large spans into
# pieces, so that each piece isn't too big. # pieces, so that each piece isn't too big.
# Without the sparserevlog capability, reading from the repository could use # Without the sparserevlog capability, reading from the repository could use

mercurial/streamclone.py

from .pycompat import open from .pycompat import open
from .interfaces import repository from .interfaces import repository
from . import ( from . import (
cacheutil, cacheutil,
error, error,
narrowspec, narrowspec,
phases, phases,
pycompat, pycompat,
requirements as requirementsmod,
scmutil, scmutil,
store, store,
util, util,
) )
def canperformstreamclone(pullop, bundle2=False): def canperformstreamclone(pullop, bundle2=False):
"""Whether it is possible to perform a streaming clone as part of pull. """Whether it is possible to perform a streaming clone as part of pull.
# requirements advertised by the server. # requirements advertised by the server.
# #
# The server advertises its requirements via the "stream" and "streamreqs" # The server advertises its requirements via the "stream" and "streamreqs"
# capability. "stream" (a value-less capability) is advertised if and only # capability. "stream" (a value-less capability) is advertised if and only
# if the only requirement is "revlogv1." Else, the "streamreqs" capability # if the only requirement is "revlogv1." Else, the "streamreqs" capability
# is advertised and contains a comma-delimited list of requirements. # is advertised and contains a comma-delimited list of requirements.
requirements = set() requirements = set()
if remote.capable(b'stream'): if remote.capable(b'stream'):
requirements.add(b'revlogv1') requirements.add(requirementsmod.REVLOGV1_REQUIREMENT)
else: else:
streamreqs = remote.capable(b'streamreqs') streamreqs = remote.capable(b'streamreqs')
# This is weird and shouldn't happen with modern servers. # This is weird and shouldn't happen with modern servers.
if not streamreqs: if not streamreqs:
pullop.repo.ui.warn( pullop.repo.ui.warn(
_( _(
b'warning: stream clone requested but server has them ' b'warning: stream clone requested but server has them '
b'disabled\n' b'disabled\n'

mercurial/upgrade_utils/actions.py

def requiredsourcerequirements(repo): def requiredsourcerequirements(repo):
"""Obtain requirements required to be present to upgrade a repo. """Obtain requirements required to be present to upgrade a repo.
An upgrade will not be allowed if the repository doesn't have the An upgrade will not be allowed if the repository doesn't have the
requirements returned by this function. requirements returned by this function.
""" """
return { return {
# Introduced in Mercurial 0.9.2. # Introduced in Mercurial 0.9.2.
b'revlogv1', requirements.REVLOGV1_REQUIREMENT,
# Introduced in Mercurial 0.9.2. # Introduced in Mercurial 0.9.2.
b'store', b'store',
} }
def blocksourcerequirements(repo): def blocksourcerequirements(repo):
"""Obtain requirements that will prevent an upgrade from occurring. """Obtain requirements that will prevent an upgrade from occurring.
the upgrade is disallowed. the upgrade is disallowed.
Extensions should monkeypatch this to add their custom requirements. Extensions should monkeypatch this to add their custom requirements.
""" """
supported = { supported = {
b'dotencode', b'dotencode',
b'fncache', b'fncache',
b'generaldelta', b'generaldelta',
b'revlogv1', requirements.REVLOGV1_REQUIREMENT,
b'store', b'store',
requirements.SPARSEREVLOG_REQUIREMENT, requirements.SPARSEREVLOG_REQUIREMENT,
requirements.SIDEDATA_REQUIREMENT, requirements.SIDEDATA_REQUIREMENT,
requirements.COPIESSDC_REQUIREMENT, requirements.COPIESSDC_REQUIREMENT,
requirements.NODEMAP_REQUIREMENT, requirements.NODEMAP_REQUIREMENT,
requirements.SHARESAFE_REQUIREMENT, requirements.SHARESAFE_REQUIREMENT,
} }
for name in compression.compengines: for name in compression.compengines:

mercurial/wireprotov1server.py

bundlecaches, bundlecaches,
changegroup as changegroupmod, changegroup as changegroupmod,
discovery, discovery,
encoding, encoding,
error, error,
exchange, exchange,
pushkey as pushkeymod, pushkey as pushkeymod,
pycompat, pycompat,
requirements as requirementsmod,
streamclone, streamclone,
util, util,
wireprototypes, wireprototypes,
) )
from .utils import ( from .utils import (
procutil, procutil,
stringutil, stringutil,
if commands.commandavailable(b'changegroupsubset', proto): if commands.commandavailable(b'changegroupsubset', proto):
caps.append(b'changegroupsubset') caps.append(b'changegroupsubset')
if streamclone.allowservergeneration(repo): if streamclone.allowservergeneration(repo):
if repo.ui.configbool(b'server', b'preferuncompressed'): if repo.ui.configbool(b'server', b'preferuncompressed'):
caps.append(b'stream-preferred') caps.append(b'stream-preferred')
requiredformats = repo.requirements & repo.supportedformats requiredformats = repo.requirements & repo.supportedformats
# if our local revlogs are just revlogv1, add 'stream' cap # if our local revlogs are just revlogv1, add 'stream' cap
if not requiredformats - {b'revlogv1'}: if not requiredformats - {requirementsmod.REVLOGV1_REQUIREMENT}:
caps.append(b'stream') caps.append(b'stream')
# otherwise, add 'streamreqs' detailing our local revlog format # otherwise, add 'streamreqs' detailing our local revlog format
else: else:
caps.append(b'streamreqs=%s' % b','.join(sorted(requiredformats))) caps.append(b'streamreqs=%s' % b','.join(sorted(requiredformats)))
if repo.ui.configbool(b'experimental', b'bundle2-advertise'): if repo.ui.configbool(b'experimental', b'bundle2-advertise'):
capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo, role=b'server')) capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo, role=b'server'))
caps.append(b'bundle2=' + urlreq.quote(capsblob)) caps.append(b'bundle2=' + urlreq.quote(capsblob))
caps.append(b'unbundle=%s' % b','.join(bundle2.bundlepriority)) caps.append(b'unbundle=%s' % b','.join(bundle2.bundlepriority))