This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12030

requirements: move "bookmark in store" requirements in the right module
ClosedPublic

Authored by marmoute on Jan 24 2022, 6:35 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGdfbfa802876b: requirements: move "bookmark in store" requirements in the right module
Summary

There seems to be no reasons to not have it with the others.

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

marmoute created this revision.Jan 24 2022, 6:35 AM
Alphare accepted this revision.Jan 24 2022, 9:18 AM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
mercurial/requirements.py
69

must be*

This revision is now accepted and ready to land.Jan 24 2022, 9:18 AM
marmoute updated this revision to Diff 31736.Jan 24 2022, 9:43 AM

Revision Contents
Changeset List

Diff 31906

mercurial/bookmarks.py

short, short,
) )
from .pycompat import getattr from .pycompat import getattr
from . import ( from . import (
encoding, encoding,
error, error,
obsutil, obsutil,
pycompat, pycompat,
requirements,
scmutil, scmutil,
txnutil, txnutil,
util, util,
) )
from .utils import ( from .utils import (
urlutil, urlutil,
) )
# label constants # label constants
# until 3.5, bookmarks.current was the advertised name, not # until 3.5, bookmarks.current was the advertised name, not
# bookmarks.active, so we must use both to avoid breaking old # bookmarks.active, so we must use both to avoid breaking old
# custom styles # custom styles
activebookmarklabel = b'bookmarks.active bookmarks.current' activebookmarklabel = b'bookmarks.active bookmarks.current'
BOOKMARKS_IN_STORE_REQUIREMENT = b'bookmarksinstore'
def bookmarksinstore(repo): def bookmarksinstore(repo):
return BOOKMARKS_IN_STORE_REQUIREMENT in repo.requirements return requirements.BOOKMARKS_IN_STORE_REQUIREMENT in repo.requirements
def bookmarksvfs(repo): def bookmarksvfs(repo):
return repo.svfs if bookmarksinstore(repo) else repo.vfs return repo.svfs if bookmarksinstore(repo) else repo.vfs
def _getbkfile(repo): def _getbkfile(repo):
"""Hook so that extensions that mess with the store can hook bm storage. """Hook so that extensions that mess with the store can hook bm storage.

mercurial/localrepo.py

requirementsmod.REVLOGV1_REQUIREMENT, requirementsmod.REVLOGV1_REQUIREMENT,
requirementsmod.GENERALDELTA_REQUIREMENT, requirementsmod.GENERALDELTA_REQUIREMENT,
requirementsmod.TREEMANIFEST_REQUIREMENT, requirementsmod.TREEMANIFEST_REQUIREMENT,
requirementsmod.COPIESSDC_REQUIREMENT, requirementsmod.COPIESSDC_REQUIREMENT,
requirementsmod.REVLOGV2_REQUIREMENT, requirementsmod.REVLOGV2_REQUIREMENT,
requirementsmod.CHANGELOGV2_REQUIREMENT, requirementsmod.CHANGELOGV2_REQUIREMENT,
requirementsmod.SPARSEREVLOG_REQUIREMENT, requirementsmod.SPARSEREVLOG_REQUIREMENT,
requirementsmod.NODEMAP_REQUIREMENT, requirementsmod.NODEMAP_REQUIREMENT,
bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT, requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT,
requirementsmod.SHARESAFE_REQUIREMENT, requirementsmod.SHARESAFE_REQUIREMENT,
requirementsmod.DIRSTATE_V2_REQUIREMENT, requirementsmod.DIRSTATE_V2_REQUIREMENT,
} }
_basesupported = supportedformats | { _basesupported = supportedformats | {
requirementsmod.STORE_REQUIREMENT, requirementsmod.STORE_REQUIREMENT,
requirementsmod.FNCACHE_REQUIREMENT, requirementsmod.FNCACHE_REQUIREMENT,
requirementsmod.SHARED_REQUIREMENT, requirementsmod.SHARED_REQUIREMENT,
requirementsmod.RELATIVE_SHARED_REQUIREMENT, requirementsmod.RELATIVE_SHARED_REQUIREMENT,
if createopts.get(b'narrowfiles'): if createopts.get(b'narrowfiles'):
requirements.add(requirementsmod.NARROW_REQUIREMENT) requirements.add(requirementsmod.NARROW_REQUIREMENT)
if createopts.get(b'lfs'): if createopts.get(b'lfs'):
requirements.add(b'lfs') requirements.add(b'lfs')
if ui.configbool(b'format', b'bookmarks-in-store'): if ui.configbool(b'format', b'bookmarks-in-store'):
requirements.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) requirements.add(requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT)
if ui.configbool(b'format', b'use-persistent-nodemap'): if ui.configbool(b'format', b'use-persistent-nodemap'):
requirements.add(requirementsmod.NODEMAP_REQUIREMENT) requirements.add(requirementsmod.NODEMAP_REQUIREMENT)
# if share-safe is enabled, let's create the new repository with the new # if share-safe is enabled, let's create the new repository with the new
# requirement # requirement
if ui.configbool(b'format', b'use-share-safe'): if ui.configbool(b'format', b'use-share-safe'):
requirements.add(requirementsmod.SHARESAFE_REQUIREMENT) requirements.add(requirementsmod.SHARESAFE_REQUIREMENT)
"""Checks compatibility of repository requirements enabled and disabled. """Checks compatibility of repository requirements enabled and disabled.
Returns a set of requirements which needs to be dropped because dependend Returns a set of requirements which needs to be dropped because dependend
requirements are not enabled. Also warns users about it""" requirements are not enabled. Also warns users about it"""
dropped = set() dropped = set()
if requirementsmod.STORE_REQUIREMENT not in requirements: if requirementsmod.STORE_REQUIREMENT not in requirements:
if bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT in requirements: if requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT in requirements:
ui.warn( ui.warn(
_( _(
b'ignoring enabled \'format.bookmarks-in-store\' config ' b'ignoring enabled \'format.bookmarks-in-store\' config '
b'beacuse it is incompatible with disabled ' b'beacuse it is incompatible with disabled '
b'\'format.usestore\' config\n' b'\'format.usestore\' config\n'
) )
) )
dropped.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT) dropped.add(requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT)
if ( if (
requirementsmod.SHARED_REQUIREMENT in requirements requirementsmod.SHARED_REQUIREMENT in requirements
or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements
): ):
raise error.Abort( raise error.Abort(
_( _(
b"cannot create shared repository as source was created" b"cannot create shared repository as source was created"

mercurial/requirements.py

# relative to the current repository root path # relative to the current repository root path
RELATIVE_SHARED_REQUIREMENT = b'relshared' RELATIVE_SHARED_REQUIREMENT = b'relshared'
# A repository with share implemented safely. The repository has different # A repository with share implemented safely. The repository has different
# store and working copy requirements i.e. both `.hg/requires` and # store and working copy requirements i.e. both `.hg/requires` and
# `.hg/store/requires` are present. # `.hg/store/requires` are present.
SHARESAFE_REQUIREMENT = b'share-safe' SHARESAFE_REQUIREMENT = b'share-safe'
# Bookmarks must be stored in the `store` part of the repository and will be
AlphareUnsubmitted
Not Done

must be*

Alphare: must be*
# share accross shares
BOOKMARKS_IN_STORE_REQUIREMENT = b'bookmarksinstore'
# List of requirements which are working directory specific # List of requirements which are working directory specific
# These requirements cannot be shared between repositories if they # These requirements cannot be shared between repositories if they
# share the same store # share the same store
# * sparse is a working directory specific functionality and hence working # * sparse is a working directory specific functionality and hence working
# directory specific requirement # directory specific requirement
# * SHARED_REQUIREMENT and RELATIVE_SHARED_REQUIREMENT are requirements which # * SHARED_REQUIREMENT and RELATIVE_SHARED_REQUIREMENT are requirements which
# represents that the current working copy/repository shares store of another # represents that the current working copy/repository shares store of another
# repo. Hence both of them should be stored in working copy # repo. Hence both of them should be stored in working copy