# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 2020-08-08 17:06:32 # Node ID a1f51c7dce0f27554a61c1c0ebc55a080cba9945 # Parent c4fe2262435e063bbb21867364532a2b58c0f226 repository: introduce constant for sparse repo requirement and use it 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. Differential Revision: https://phab.mercurial-scm.org/D8911 diff --git a/mercurial/interfaces/repository.py b/mercurial/interfaces/repository.py --- a/mercurial/interfaces/repository.py +++ b/mercurial/interfaces/repository.py @@ -15,6 +15,9 @@ from . import util as interfaceutil # we should move this to just "narrow" or similar. NARROW_REQUIREMENT = b'narrowhg-experimental' +# Enables sparse working directory usage +SPARSE_REQUIREMENT = b'exp-sparse' + # Local repository feature string. # Revlogs are being used for file storage. diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -816,7 +816,7 @@ def ensurerequirementscompatible(ui, req ``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( _( b'repository is using sparse feature but ' @@ -1067,7 +1067,7 @@ class localrepository(object): b'shared', b'relshared', b'dotencode', - b'exp-sparse', + repository.SPARSE_REQUIREMENT, b'internal-phase', } diff --git a/mercurial/sparse.py b/mercurial/sparse.py --- a/mercurial/sparse.py +++ b/mercurial/sparse.py @@ -24,8 +24,10 @@ from . import ( scmutil, util, ) +from .interfaces import repository from .utils import hashutil + # Whether sparse features are enabled. This variable is intended to be # temporary to facilitate porting sparse to core. It should eventually be # a per-repo option, possibly a repo requirement. @@ -606,11 +608,11 @@ def _updateconfigandrefreshwdir( # updated. But this requires massive rework to matcher() and its # consumers. - if b'exp-sparse' in oldrequires and removing: - repo.requirements.discard(b'exp-sparse') + if repository.SPARSE_REQUIREMENT in oldrequires and removing: + repo.requirements.discard(repository.SPARSE_REQUIREMENT) scmutil.writereporequirements(repo) - elif b'exp-sparse' not in oldrequires: - repo.requirements.add(b'exp-sparse') + elif repository.SPARSE_REQUIREMENT not in oldrequires: + repo.requirements.add(repository.SPARSE_REQUIREMENT) scmutil.writereporequirements(repo) try: