This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10107

requirements: also add a dotencode constant
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc3773636ddbb: requirements: also add a dotencode constant
Summary

Continue the cleanup to the remaining requirements

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 requested changes to this revision.Mar 4 2021, 4:01 AM
pulkit added a subscriber: pulkit.
pulkit added inline comments.
mercurial/upgrade_utils/actions.py
969

hm, seems like an unrelated change.

This revision now requires changes to proceed.Mar 4 2021, 4:01 AM
Alphare added inline comments.Mar 4 2021, 4:04 AM
mercurial/upgrade_utils/actions.py
969

Ha! Yeah rebasing all of this was evil, this got through.

pulkit accepted this revision.Mar 5 2021, 3:52 AM
This revision is now accepted and ready to land.Mar 5 2021, 3:52 AM
Alphare added a commit: rHGc3773636ddbb: requirements: also add a dotencode constant.Mar 5 2021, 4:34 AM
Closed by commit rHGc3773636ddbb: requirements: also add a dotencode constant (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 26102

mercurial/localrepo.py

) )
) )
def makestore(requirements, path, vfstype): def makestore(requirements, path, vfstype):
"""Construct a storage object for a repository.""" """Construct a storage object for a repository."""
if b'store' in requirements: if b'store' in requirements:
if b'fncache' in requirements: if b'fncache' in requirements:
return storemod.fncachestore( dotencode = requirementsmod.DOTENCODE_REQUIREMENT in requirements
path, vfstype, b'dotencode' in requirements return storemod.fncachestore(path, vfstype, dotencode)
)
return storemod.encodedstore(path, vfstype) return storemod.encodedstore(path, vfstype)
return storemod.basicstore(path, vfstype) return storemod.basicstore(path, vfstype)
def resolvestorevfsoptions(ui, requirements, features): def resolvestorevfsoptions(ui, requirements, features):
"""Resolve the options to pass to the store vfs opener. """Resolve the options to pass to the store vfs opener.
bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT, bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT,
requirementsmod.SHARESAFE_REQUIREMENT, requirementsmod.SHARESAFE_REQUIREMENT,
} }
_basesupported = supportedformats | { _basesupported = supportedformats | {
b'store', b'store',
b'fncache', b'fncache',
requirementsmod.SHARED_REQUIREMENT, requirementsmod.SHARED_REQUIREMENT,
requirementsmod.RELATIVE_SHARED_REQUIREMENT, requirementsmod.RELATIVE_SHARED_REQUIREMENT,
b'dotencode', requirementsmod.DOTENCODE_REQUIREMENT,
requirementsmod.SPARSE_REQUIREMENT, requirementsmod.SPARSE_REQUIREMENT,
requirementsmod.INTERNAL_PHASE_REQUIREMENT, requirementsmod.INTERNAL_PHASE_REQUIREMENT,
} }
# list of prefix for file which can be written without 'wlock' # list of prefix for file which can be written without 'wlock'
# Extensions should extend this list when needed # Extensions should extend this list when needed
_wlockfreeprefix = { _wlockfreeprefix = {
# We migh consider requiring 'wlock' for the next # We migh consider requiring 'wlock' for the next
) )
requirements = {requirementsmod.REVLOGV1_REQUIREMENT} 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(requirementsmod.DOTENCODE_REQUIREMENT)
compengines = ui.configlist(b'format', b'revlog-compression') compengines = ui.configlist(b'format', b'revlog-compression')
for compengine in compengines: for compengine in compengines:
if compengine in util.compengines: if compengine in util.compengines:
break break
else: else:
raise error.Abort( raise error.Abort(
_( _(

mercurial/requirements.py

# requirements.py - objects and functions related to repository requirements # requirements.py - objects and functions related to repository requirements
# #
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com> # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
GENERALDELTA_REQUIREMENT = b'generaldelta' GENERALDELTA_REQUIREMENT = b'generaldelta'
DOTENCODE_REQUIREMENT = b'dotencode'
# When narrowing is finalized and no longer subject to format changes, # When narrowing is finalized and no longer subject to format changes,
# we should move this to just "narrow" or similar. # we should move this to just "narrow" or similar.
NARROW_REQUIREMENT = b'narrowhg-experimental' NARROW_REQUIREMENT = b'narrowhg-experimental'
# Enables sparse working directory usage # Enables sparse working directory usage
SPARSE_REQUIREMENT = b'exp-sparse' SPARSE_REQUIREMENT = b'exp-sparse'

mercurial/upgrade_utils/actions.py

b'operations should be improved' b'operations should be improved'
) )
@registerformatvariant @registerformatvariant
class dotencode(requirementformatvariant): class dotencode(requirementformatvariant):
name = b'dotencode' name = b'dotencode'
_requirement = b'dotencode' _requirement = requirements.DOTENCODE_REQUIREMENT
default = True default = True
description = _( description = _(
b'storage of filenames beginning with a period or ' b'storage of filenames beginning with a period or '
b'space may not work correctly' b'space may not work correctly'
) )
"""Obtain requirements that upgrade supports in the destination. """Obtain requirements that upgrade supports in the destination.
If the result of the upgrade would create requirements not in this set, If the result of the upgrade would create requirements not in this set,
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', requirements.DOTENCODE_REQUIREMENT,
b'fncache', b'fncache',
requirements.GENERALDELTA_REQUIREMENT, requirements.GENERALDELTA_REQUIREMENT,
requirements.REVLOGV1_REQUIREMENT, 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,
This is used to disallow proposed requirements from being added when This is used to disallow proposed requirements from being added when
they weren't present before. they weren't present before.
We use a list of allowed requirement additions instead of a list of known We use a list of allowed requirement additions instead of a list of known
bad additions because the whitelist approach is safer and will prevent bad additions because the whitelist approach is safer and will prevent
future, unknown requirements from accidentally being added. future, unknown requirements from accidentally being added.
""" """
supported = { supported = {
b'dotencode', requirements.DOTENCODE_REQUIREMENT,
b'fncache', b'fncache',
pulkitUnsubmitted
Not Done

hm, seems like an unrelated change.

pulkit: hm, seems like an unrelated change.
AlphareAuthorUnsubmitted
Done

Ha! Yeah rebasing all of this was evil, this got through.

Alphare: Ha! Yeah rebasing all of this was evil, this got through.
requirements.GENERALDELTA_REQUIREMENT, requirements.GENERALDELTA_REQUIREMENT,
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: