stream-clone: stop considering working copy only requirements

Now that the ducks are properly aligned on there shelve, it becomes easy to fix
the list of requirements to consider for stream. We remove the working copy
specific ones and add some missing revlog specific ones.

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

mercurial/requirements.py

@@ -1,121 +1,120
 # 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_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_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,
-    DIRSTATE_V2_REQUIREMENT,
     GENERALDELTA_REQUIREMENT,
+    INTERNAL_PHASE_REQUIREMENT,
     NODEMAP_REQUIREMENT,
     REVLOG_COMPRESSION_ZSTD,
     REVLOGV1_REQUIREMENT,
     REVLOGV2_REQUIREMENT,
-    SHARESAFE_REQUIREMENT,
     SPARSEREVLOG_REQUIREMENT,
     TREEMANIFEST_REQUIREMENT,
 }

tests/test-clone-stream-format.t

@@ -1,283 +1,341
 This file contains tests case that deal with format change accross stream clone
 
 #require serve no-reposimplestore no-chg
 
 #testcases stream-legacy stream-bundle2
 
 #if stream-legacy
   $ cat << EOF >> $HGRCPATH
   > [server]
   > bundle2.stream = no
   > EOF
 #endif
 
 Initialize repository
 
-  $ hg init server
+  $ hg init server --config format.use-share-safe=yes
   $ cd server
   $ sh $TESTDIR/testlib/stream_clone_setup.sh
   adding 00changelog-ab349180a0405010.nd
   adding 00changelog.d
   adding 00changelog.i
   adding 00changelog.n
   adding 00manifest.d
   adding 00manifest.i
   adding container/isam-build-centos7/bazel-coverage-generator-sandboxfs-compatibility-0758e3e4f6057904d44399bd666faba9e7f40686.patch
   adding data/foo.d
   adding data/foo.i
   adding data/foo.n
   adding data/undo.babar
   adding data/undo.d
   adding data/undo.foo.d
   adding data/undo.foo.i
   adding data/undo.foo.n
   adding data/undo.i
   adding data/undo.n
   adding data/undo.py
   adding foo.d
   adding foo.i
   adding foo.n
   adding meta/foo.d
   adding meta/foo.i
   adding meta/foo.n
   adding meta/undo.babar
   adding meta/undo.d
   adding meta/undo.foo.d
   adding meta/undo.foo.i
   adding meta/undo.foo.n
   adding meta/undo.i
   adding meta/undo.n
   adding meta/undo.py
   adding savanah/foo.d
   adding savanah/foo.i
   adding savanah/foo.n
   adding savanah/undo.babar
   adding savanah/undo.d
   adding savanah/undo.foo.d
   adding savanah/undo.foo.i
   adding savanah/undo.foo.n
   adding savanah/undo.i
   adding savanah/undo.n
   adding savanah/undo.py
   adding store/C\xc3\xa9lesteVille_is_a_Capital_City (esc)
   adding store/foo.d
   adding store/foo.i
   adding store/foo.n
   adding store/undo.babar
   adding store/undo.d
   adding store/undo.foo.d
   adding store/undo.foo.i
   adding store/undo.foo.n
   adding store/undo.i
   adding store/undo.n
   adding store/undo.py
   adding undo.babar
   adding undo.d
   adding undo.foo.d
   adding undo.foo.i
   adding undo.foo.n
   adding undo.i
   adding undo.n
   adding undo.py
   $ cd ..
 
 
 Test streaming from/to repository without a store:
 ==================================================
 
   $ hg clone --pull --config format.usestore=no server server-no-store
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 1088 changes to 1088 files
   new changesets 96ee1d7354c4:5223b5e3265f
   updating to branch default
   1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R server-no-store
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 3 changesets with 1088 changes to 1088 files
   $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt
   $ cat hg-1.pid > $DAEMON_PIDS
   $ hg -R server-no-store serve -p $HGPORT2 -d --pid-file=hg-2.pid --error errors-2.txt
   $ cat hg-2.pid >> $DAEMON_PIDS
   $ hg debugrequires -R server | grep store
   store
   $ hg debugrequires -R server-no-store | grep store
   [1]
 
 store → no-store cloning
 
   $ hg clone --quiet --stream -U http://localhost:$HGPORT clone-remove-store --config format.usestore=no
   $ cat errors-1.txt
   $ hg -R clone-remove-store verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 3 changesets with 1088 changes to 1088 files
   $ hg debugrequires -R clone-remove-store | grep store
   [1]
 
 
 no-store → store cloning
 
   $ hg clone --quiet --stream -U http://localhost:$HGPORT2 clone-add-store --config format.usestore=yes
   $ cat errors-2.txt
   $ hg -R clone-add-store verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 3 changesets with 1088 changes to 1088 files
   $ hg debugrequires -R clone-add-store | grep store
   store
 
 
   $ killdaemons.py
 
 
 Test streaming from/to repository without a fncache
 ===================================================
 
   $ rm hg-*.pid errors-*.txt
   $ hg clone --pull --config format.usefncache=no server server-no-fncache
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 1088 changes to 1088 files
   new changesets 96ee1d7354c4:5223b5e3265f
   updating to branch default
   1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R server-no-fncache
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 3 changesets with 1088 changes to 1088 files
   $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt
   $ cat hg-1.pid > $DAEMON_PIDS
   $ hg -R server-no-fncache serve -p $HGPORT2 -d --pid-file=hg-2.pid --error errors-2.txt
   $ cat hg-2.pid >> $DAEMON_PIDS
   $ hg debugrequires -R server | grep fncache
   fncache
   $ hg debugrequires -R server-no-fncache | grep fncache
   [1]
 
 fncache → no-fncache cloning
 
   $ hg clone --quiet --stream -U http://localhost:$HGPORT clone-remove-fncache --config format.usefncache=no
   $ cat errors-1.txt
   $ hg -R clone-remove-fncache verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 3 changesets with 1088 changes to 1088 files
   $ hg debugrequires -R clone-remove-fncache | grep fncache
   [1]
 
 
 no-fncache → fncache cloning
 
   $ hg clone --quiet --stream -U http://localhost:$HGPORT2 clone-add-fncache --config format.usefncache=yes
   $ cat errors-2.txt
   $ hg -R clone-add-fncache verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 3 changesets with 1088 changes to 1088 files
   $ hg debugrequires -R clone-add-fncache | grep fncache
   fncache
 
 
   $ killdaemons.py
 
 
 
 Test streaming from/to repository without a dotencode
 ===================================================
 
   $ rm hg-*.pid errors-*.txt
   $ hg clone --pull --config format.dotencode=no server server-no-dotencode
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 1088 changes to 1088 files
   new changesets 96ee1d7354c4:5223b5e3265f
   updating to branch default
   1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R server-no-dotencode
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 3 changesets with 1088 changes to 1088 files
   $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt
   $ cat hg-1.pid > $DAEMON_PIDS
   $ hg -R server-no-dotencode serve -p $HGPORT2 -d --pid-file=hg-2.pid --error errors-2.txt
   $ cat hg-2.pid >> $DAEMON_PIDS
   $ hg debugrequires -R server | grep dotencode
   dotencode
   $ hg debugrequires -R server-no-dotencode | grep dotencode
   [1]
 
 dotencode → no-dotencode cloning
 
   $ hg clone --quiet --stream -U http://localhost:$HGPORT clone-remove-dotencode --config format.dotencode=no
   $ cat errors-1.txt
   $ hg -R clone-remove-dotencode verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 3 changesets with 1088 changes to 1088 files
   $ hg debugrequires -R clone-remove-dotencode | grep dotencode
   [1]
 
 
 no-dotencode → dotencode cloning
 
   $ hg clone --quiet --stream -U http://localhost:$HGPORT2 clone-add-dotencode --config format.dotencode=yes
   $ cat errors-2.txt
   $ hg -R clone-add-dotencode verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 3 changesets with 1088 changes to 1088 files
   $ hg debugrequires -R clone-add-dotencode | grep dotencode
   dotencode
 
 
   $ killdaemons.py
 
 Cloning from a share
 --------------------
 
 We should be able to clone from a "share" repository, it will use the source store for streaming.
 
 The resulting clone should not use share.
 
   $ rm hg-*.pid errors-*.txt
   $ hg share --config extensions.share= server server-share -U
   $ hg -R server-share serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt
   $ cat hg-1.pid > $DAEMON_PIDS
 
   $ hg clone --quiet --stream -U http://localhost:$HGPORT clone-from-share
   $ hg -R clone-from-share verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 3 changesets with 1088 changes to 1088 files
-  $ hg debugrequires -R clone-from-share | grep share
+  $ hg debugrequires -R clone-from-share | egrep 'share$'
   [1]
 
   $ killdaemons.py
+
+Test streaming from/to repository without a share-safe
+======================================================
+
+  $ rm hg-*.pid errors-*.txt
+  $ hg clone --pull --config format.use-share-safe=no server server-no-share-safe
+  requesting all changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 3 changesets with 1088 changes to 1088 files
+  new changesets 96ee1d7354c4:5223b5e3265f
+  updating to branch default
+  1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg verify -R server-no-share-safe
+  checking changesets
+  checking manifests
+  crosschecking files in changesets and manifests
+  checking files
+  checked 3 changesets with 1088 changes to 1088 files
+  $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt
+  $ cat hg-1.pid > $DAEMON_PIDS
+  $ hg -R server-no-share-safe serve -p $HGPORT2 -d --pid-file=hg-2.pid --error errors-2.txt
+  $ cat hg-2.pid >> $DAEMON_PIDS
+  $ hg debugrequires -R server | grep share-safe
+  share-safe
+  $ hg debugrequires -R server-no-share-safe | grep share-safe
+  [1]
+
+share-safe → no-share-safe cloning
+
+  $ hg clone --quiet --stream -U http://localhost:$HGPORT clone-remove-share-safe --config format.use-share-safe=no
+  $ cat errors-1.txt
+  $ hg -R clone-remove-share-safe verify
+  checking changesets
+  checking manifests
+  crosschecking files in changesets and manifests
+  checking files
+  checked 3 changesets with 1088 changes to 1088 files
+  $ hg debugrequires -R clone-remove-share-safe | grep share-safe
+  [1]
+
+
+no-share-safe → share-safe cloning
+
+  $ hg clone --quiet --stream -U http://localhost:$HGPORT2 clone-add-share-safe --config format.use-share-safe=yes
+  $ cat errors-2.txt
+  $ hg -R clone-add-share-safe verify
+  checking changesets
+  checking manifests
+  crosschecking files in changesets and manifests
+  checking files
+  checked 3 changesets with 1088 changes to 1088 files
+  $ hg debugrequires -R clone-add-share-safe | grep share-safe
+  share-safe
+
+
+  $ killdaemons.py