This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8911

repository: introduce constant for sparse repo requirement and use it
ClosedPublic

Authored by pulkit on Aug 7 2020, 8:45 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa1f51c7dce0f: repository: introduce constant for sparse repo requirement and use it
Summary

In future we will like to much cleaner logic around which requirement is for
working copy and which can go in store. To start with that, we first need to
de-clutter the requirement values spread around and replace them with constants.

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

Diff 22354

mercurial/interfaces/repository.py

from ..i18n import _ from ..i18n import _
from .. import error from .. import error
from . import util as interfaceutil from . import util as interfaceutil
# 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
SPARSE_REQUIREMENT = b'exp-sparse'
# Local repository feature string. # Local repository feature string.
# Revlogs are being used for file storage. # Revlogs are being used for file storage.
REPO_FEATURE_REVLOG_FILE_STORAGE = b'revlogfilestorage' REPO_FEATURE_REVLOG_FILE_STORAGE = b'revlogfilestorage'
# The storage part of the repository is shared from an external source. # The storage part of the repository is shared from an external source.
REPO_FEATURE_SHARED_STORAGE = b'sharedstore' REPO_FEATURE_SHARED_STORAGE = b'sharedstore'
# LFS supported for backing file storage. # LFS supported for backing file storage.
REPO_FEATURE_LFS = b'lfs' REPO_FEATURE_LFS = b'lfs'

mercurial/localrepo.py

repository opening to ensure that the set of requirements needed repository opening to ensure that the set of requirements needed
to open a repository is sane and compatible with config options. to open a repository is sane and compatible with config options.
Extensions can monkeypatch this function to perform additional Extensions can monkeypatch this function to perform additional
checking. checking.
``error.RepoError`` should be raised on failure. ``error.RepoError`` should be raised on failure.
""" """
if b'exp-sparse' in requirements and not sparse.enabled: if repository.SPARSE_REQUIREMENT in requirements and not sparse.enabled:
raise error.RepoError( raise error.RepoError(
_( _(
b'repository is using sparse feature but ' b'repository is using sparse feature but '
b'sparse is not enabled; enable the ' b'sparse is not enabled; enable the '
b'"sparse" extensions to access' b'"sparse" extensions to access'
) )
) )
bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT, bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT,
} }
_basesupported = supportedformats | { _basesupported = supportedformats | {
b'store', b'store',
b'fncache', b'fncache',
b'shared', b'shared',
b'relshared', b'relshared',
b'dotencode', b'dotencode',
b'exp-sparse', repository.SPARSE_REQUIREMENT,
b'internal-phase', b'internal-phase',
} }
# 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
# two, but pretty much all the existing code assume # two, but pretty much all the existing code assume

mercurial/sparse.py

match as matchmod, match as matchmod,
merge as mergemod, merge as mergemod,
mergestate as mergestatemod, mergestate as mergestatemod,
pathutil, pathutil,
pycompat, pycompat,
scmutil, scmutil,
util, util,
) )
from .interfaces import repository
from .utils import hashutil from .utils import hashutil
# Whether sparse features are enabled. This variable is intended to be # Whether sparse features are enabled. This variable is intended to be
# temporary to facilitate porting sparse to core. It should eventually be # temporary to facilitate porting sparse to core. It should eventually be
# a per-repo option, possibly a repo requirement. # a per-repo option, possibly a repo requirement.
enabled = False enabled = False
def parseconfig(ui, raw, action): def parseconfig(ui, raw, action):
"""Parse sparse config file content. """Parse sparse config file content.
# TODO remove this try..except once the matcher integrates better # TODO remove this try..except once the matcher integrates better
# with dirstate. We currently have to write the updated config # with dirstate. We currently have to write the updated config
# because that will invalidate the matcher cache and force a # because that will invalidate the matcher cache and force a
# re-read. We ideally want to update the cached matcher on the # re-read. We ideally want to update the cached matcher on the
# repo instance then flush the new config to disk once wdir is # repo instance then flush the new config to disk once wdir is
# updated. But this requires massive rework to matcher() and its # updated. But this requires massive rework to matcher() and its
# consumers. # consumers.
if b'exp-sparse' in oldrequires and removing: if repository.SPARSE_REQUIREMENT in oldrequires and removing:
repo.requirements.discard(b'exp-sparse') repo.requirements.discard(repository.SPARSE_REQUIREMENT)
scmutil.writereporequirements(repo) scmutil.writereporequirements(repo)
elif b'exp-sparse' not in oldrequires: elif repository.SPARSE_REQUIREMENT not in oldrequires:
repo.requirements.add(b'exp-sparse') repo.requirements.add(repository.SPARSE_REQUIREMENT)
scmutil.writereporequirements(repo) scmutil.writereporequirements(repo)
try: try:
writeconfig(repo, includes, excludes, profiles) writeconfig(repo, includes, excludes, profiles)
return refreshwdir(repo, oldstatus, oldmatch, force=force) return refreshwdir(repo, oldstatus, oldmatch, force=force)
except Exception: except Exception:
if repo.requirements != oldrequires: if repo.requirements != oldrequires:
repo.requirements.clear() repo.requirements.clear()