tracked-key: update the requirement value

We renamed the config option but we forgot to change the actual value…

Differential Revision: https://phab.mercurial-scm.org/D12199

mercurial/requirements.py

@@ -1,121 +1,121 b''
 # requirements.py - objects and functions related to repository requirements
 #
 # Copyright 2005-2007 Olivia Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 from __future__ import absolute_import
 
 # obsolete experimental requirements:
 #  - manifestv2: An experimental new manifest format that allowed
 #    for stem compression of long paths. Experiment ended up not
 #    being successful (repository sizes went up due to worse delta
 #    chains), and the code was deleted in 4.6.
 
 GENERALDELTA_REQUIREMENT = b'generaldelta'
 DOTENCODE_REQUIREMENT = b'dotencode'
 STORE_REQUIREMENT = b'store'
 FNCACHE_REQUIREMENT = b'fncache'
 
-DIRSTATE_TRACKED_KEY_V1 = b'exp-dirstate-tracked-key-v1'
+DIRSTATE_TRACKED_KEY_V1 = b'dirstate-tracked-key-v1'
 DIRSTATE_V2_REQUIREMENT = b'dirstate-v2'
 
 # When narrowing is finalized and no longer subject to format changes,
 # we should move this to just "narrow" or similar.
 NARROW_REQUIREMENT = b'narrowhg-experimental'
 
 # Enables sparse working directory usage
 SPARSE_REQUIREMENT = b'exp-sparse'
 
 # Enables the internal phase which is used to hide changesets instead
 # of stripping them
 INTERNAL_PHASE_REQUIREMENT = b'internal-phase'
 
 # Stores manifest in Tree structure
 TREEMANIFEST_REQUIREMENT = b'treemanifest'
 
 REVLOGV1_REQUIREMENT = b'revlogv1'
 
 # allow using ZSTD as compression engine for revlog content
 REVLOG_COMPRESSION_ZSTD = b'revlog-compression-zstd'
 
 # Increment the sub-version when the revlog v2 format changes to lock out old
 # clients.
 CHANGELOGV2_REQUIREMENT = b'exp-changelog-v2'
 
 # Increment the sub-version when the revlog v2 format changes to lock out old
 # clients.
 REVLOGV2_REQUIREMENT = b'exp-revlogv2.2'
 
 # A repository with the sparserevlog feature will have delta chains that
 # can spread over a larger span. Sparse reading cuts these large spans into
 # pieces, so that each piece isn't too big.
 # Without the sparserevlog capability, reading from the repository could use
 # huge amounts of memory, because the whole span would be read at once,
 # including all the intermediate revisions that aren't pertinent for the chain.
 # This is why once a repository has enabled sparse-read, it becomes required.
 SPARSEREVLOG_REQUIREMENT = b'sparserevlog'
 
 # A repository with the the copies-sidedata-changeset requirement will store
 # copies related information in changeset's sidedata.
 COPIESSDC_REQUIREMENT = b'exp-copies-sidedata-changeset'
 
 # The repository use persistent nodemap for the changelog and the manifest.
 NODEMAP_REQUIREMENT = b'persistent-nodemap'
 
 # Denotes that the current repository is a share
 SHARED_REQUIREMENT = b'shared'
 
 # Denotes that current repository is a share and the shared source path is
 # relative to the current repository root path
 RELATIVE_SHARED_REQUIREMENT = b'relshared'
 
 # A repository with share implemented safely. The repository has different
 # store and working copy requirements i.e. both `.hg/requires` and
 # `.hg/store/requires` are present.
 SHARESAFE_REQUIREMENT = b'share-safe'
 
 # Bookmarks must be stored in the `store` part of the repository and will be
 # share accross shares
 BOOKMARKS_IN_STORE_REQUIREMENT = b'bookmarksinstore'
 
 # List of requirements which are working directory specific
 # These requirements cannot be shared between repositories if they
 # share the same store
 # * sparse is a working directory specific functionality and hence working
 #   directory specific requirement
 # * SHARED_REQUIREMENT and RELATIVE_SHARED_REQUIREMENT are requirements which
 #   represents that the current working copy/repository shares store of another
 #   repo. Hence both of them should be stored in working copy
 # * SHARESAFE_REQUIREMENT needs to be stored in working dir to mark that rest of
 #   the requirements are stored in store's requires
 # * DIRSTATE_V2_REQUIREMENT affects .hg/dirstate, of which there is one per
 #   working directory.
 WORKING_DIR_REQUIREMENTS = {
     SPARSE_REQUIREMENT,
     SHARED_REQUIREMENT,
     RELATIVE_SHARED_REQUIREMENT,
     SHARESAFE_REQUIREMENT,
     DIRSTATE_TRACKED_KEY_V1,
     DIRSTATE_V2_REQUIREMENT,
 }
 
 # List of requirement that impact "stream-clone" (and hardlink clone) and
 # cannot be changed in such cases.
 #
 # requirements not in this list are safe to be altered during stream-clone.
 #
 # note: the list is currently inherited from previous code and miss some relevant requirement while containing some irrelevant ones.
 STREAM_FIXED_REQUIREMENTS = {
     BOOKMARKS_IN_STORE_REQUIREMENT,
     CHANGELOGV2_REQUIREMENT,
     COPIESSDC_REQUIREMENT,
     GENERALDELTA_REQUIREMENT,
     INTERNAL_PHASE_REQUIREMENT,
     REVLOG_COMPRESSION_ZSTD,
     REVLOGV1_REQUIREMENT,
     REVLOGV2_REQUIREMENT,
     SPARSEREVLOG_REQUIREMENT,
     TREEMANIFEST_REQUIREMENT,
 }

tests/test-status-tracked-key.t

@@ -1,204 +1,204 b''
 ==============================
 Test the "tracked key" feature
 ==============================
 
 The tracked key feature provide a file that get updated when the set of tracked
 files get updated.
 
 basic setup
 
   $ cat << EOF >> $HGRCPATH
   > [format]
   > dirstate-tracked-key=yes
   > EOF
 
   $ hg init tracked-key-test
   $ cd tracked-key-test
   $ hg debugbuilddag '.+10' -n
   $ hg log -G -T '{rev} {desc} {files}\n'
   o  10 r10 nf10
   |
   o  9 r9 nf9
   |
   o  8 r8 nf8
   |
   o  7 r7 nf7
   |
   o  6 r6 nf6
   |
   o  5 r5 nf5
   |
   o  4 r4 nf4
   |
   o  3 r3 nf3
   |
   o  2 r2 nf2
   |
   o  1 r1 nf1
   |
   o  0 r0 nf0
   
   $ hg up tip
   11 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg files
   nf0
   nf1
   nf10
   nf2
   nf3
   nf4
   nf5
   nf6
   nf7
   nf8
   nf9
 
 key-file exists
 -----------
 
 The tracked key file should exist
 
   $ ls -1 .hg/dirstate*
   .hg/dirstate
   .hg/dirstate-tracked-key
 
 key-file stay the same if the tracked set is unchanged
 ------------------------------------------------------
 
 (copy its content for later comparison)
 
   $ cp .hg/dirstate-tracked-key ../key-bck
   $ echo foo >> nf0
   $ sleep 1
   $ hg status
   M nf0
   $ diff --brief .hg/dirstate-tracked-key ../key-bck
   $ hg revert -C nf0
   $ sleep 1
   $ hg status
   $ diff --brief .hg/dirstate-tracked-key ../key-bck
 
 key-file change if the tracked set is changed manually
 ------------------------------------------------------
 
 adding a file to tracking
 
   $ cp .hg/dirstate-tracked-key ../key-bck
   $ echo x > x
   $ hg add x
   $ diff --brief .hg/dirstate-tracked-key ../key-bck
   Files .hg/dirstate-tracked-key and ../key-bck differ
   [1]
 
 remove a file from tracking
 (forget)
 
   $ cp .hg/dirstate-tracked-key ../key-bck
   $ hg forget x
   $ diff --brief .hg/dirstate-tracked-key ../key-bck
   Files .hg/dirstate-tracked-key and ../key-bck differ
   [1]
 
 (remove)
 
   $ cp .hg/dirstate-tracked-key ../key-bck
   $ hg remove nf1
   $ diff --brief .hg/dirstate-tracked-key ../key-bck
   Files .hg/dirstate-tracked-key and ../key-bck differ
   [1]
 
 key-file changes on revert (when applicable)
 --------------------------------------------
 
   $ cp .hg/dirstate-tracked-key ../key-bck
   $ hg status
   R nf1
   ? x
   $ hg revert --all
   undeleting nf1
   $ hg status
   ? x
   $ diff --brief .hg/dirstate-tracked-key ../key-bck
   Files .hg/dirstate-tracked-key and ../key-bck differ
   [1]
 
 
 `hg update` does affect the key-file (when needed)
 --------------------------------------------------
 
 update changing the tracked set
 
 (removing)
 
   $ cp .hg/dirstate-tracked-key ../key-bck
   $ hg status --rev . --rev '.#generations[-1]'
   R nf10
   $ hg up '.#generations[-1]'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ diff --brief .hg/dirstate-tracked-key ../key-bck
   Files .hg/dirstate-tracked-key and ../key-bck differ
   [1]
 
 (adding)
 
   $ cp .hg/dirstate-tracked-key ../key-bck
   $ hg status --rev . --rev '.#generations[1]'
   A nf10
   $ hg up '.#generations[1]'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ diff --brief .hg/dirstate-tracked-key ../key-bck
   Files .hg/dirstate-tracked-key and ../key-bck differ
   [1]
 
 update not affecting the tracked set
 
   $ echo foo >> nf0
   $ hg commit -m foo
 
   $ cp .hg/dirstate-tracked-key ../key-bck
   $ hg status --rev . --rev '.#generations[-1]'
   M nf0
   $ hg up '.#generations[-1]'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ diff --brief .hg/dirstate-tracked-key ../key-bck
 
 Test upgrade and downgrade
 ==========================
 
   $ ls .hg/dirstate-tracked-key
   .hg/dirstate-tracked-key
   $ hg debugrequires | grep 'tracked'
-  exp-dirstate-tracked-key-v1
+  dirstate-tracked-key-v1
 
 downgrade
 
   $ hg debugupgraderepo --config format.dirstate-tracked-key=no --run --quiet
   upgrade will perform the following actions:
   
   requirements
      preserved: * (glob)
-     removed: exp-dirstate-tracked-key-v1
+     removed: dirstate-tracked-key-v1
   
   no revlogs to process
   
   $ ls -1 .hg/dirstate-tracked-key
   ls: cannot access '.hg/dirstate-tracked-key': $ENOENT$
   [2]
   $ hg debugrequires | grep 'tracked'
   [1]
 
 upgrade
 
   $ hg debugupgraderepo --config format.dirstate-tracked-key=yes --run --quiet
   upgrade will perform the following actions:
   
   requirements
      preserved: * (glob)
-     added: exp-dirstate-tracked-key-v1
+     added: dirstate-tracked-key-v1
   
   no revlogs to process
   
   $ ls -1 .hg/dirstate-tracked-key
   .hg/dirstate-tracked-key
   $ hg debugrequires | grep 'tracked'
-  exp-dirstate-tracked-key-v1
+  dirstate-tracked-key-v1