Mercurial > hg

changeset 48321:f35529784079 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-v2: fix confusion between requirement and format config variable None of those outputs failed on the CI because dirstate-v2 is not fully tested yet. This also updates the documentation. Differential Revision: https://phab.mercurial-scm.org/D11746
author Raphaël Gomès <rgomes@octobus.net>
date Wed, 10 Nov 2021 11:42:13 +0100
parents 5d69a0a23f5b
children 6248607381f2
files mercurial/helptext/internals/dirstate-v2.txt tests/test-init.t tests/test-lfconvert.t tests/test-lfs-largefiles.t tests/test-narrow-clone-no-ellipsis.t tests/test-narrow-clone-stream.t tests/test-narrow-clone.t tests/test-narrow-sparse.t tests/test-phases.t tests/test-remotefilelog-clone-tree.t tests/test-remotefilelog-clone.t tests/test-remotefilelog-log.t tests/test-repo-compengines.t tests/test-requires.t tests/test-revlog-v2.t tests/test-share-safe.t tests/test-sparse-requirement.t tests/test-sqlitestore.t
diffstat 18 files changed, 49 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/helptext/internals/dirstate-v2.txt	Wed Nov 10 10:58:13 2021 +0100
+++ b/mercurial/helptext/internals/dirstate-v2.txt	Wed Nov 10 11:42:13 2021 +0100
@@ -101,7 +101,7 @@
 For versions that do support a format, the presence or absence of
 the corresponding requirement indicates whether to use that format.
 
-When the file contains a `exp-dirstate-v2` line,
+When the file contains a `dirstate-v2` line,
 the `dirstate-v2` format is used.
 With no such line `dirstate-v1` is used.
 
--- a/tests/test-init.t	Wed Nov 10 10:58:13 2021 +0100
+++ b/tests/test-init.t	Wed Nov 10 11:42:13 2021 +0100
@@ -19,7 +19,7 @@
   store created
   00changelog.i created
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   persistent-nodemap (rust !)
@@ -61,7 +61,7 @@
 
   $ hg --config format.usestore=false init old
   $ checknewrepo old
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   generaldelta
   persistent-nodemap (rust !)
   revlog-compression-zstd (zstd !)
@@ -75,7 +75,7 @@
   $ checknewrepo old2
   store created
   00changelog.i created
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   generaldelta
   persistent-nodemap (rust !)
   revlog-compression-zstd (zstd !)
@@ -90,7 +90,7 @@
   $ checknewrepo old3
   store created
   00changelog.i created
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   persistent-nodemap (rust !)
@@ -107,7 +107,7 @@
   store created
   00changelog.i created
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   persistent-nodemap (rust !)
   revlog-compression-zstd (zstd !)
@@ -226,7 +226,7 @@
   store created
   00changelog.i created
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   persistent-nodemap (rust !)
@@ -249,7 +249,7 @@
   store created
   00changelog.i created
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   persistent-nodemap (rust !)
@@ -268,7 +268,7 @@
   store created
   00changelog.i created
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   persistent-nodemap (rust !)
--- a/tests/test-lfconvert.t	Wed Nov 10 10:58:13 2021 +0100
+++ b/tests/test-lfconvert.t	Wed Nov 10 11:42:13 2021 +0100
@@ -96,7 +96,7 @@
 "lfconvert" adds 'largefiles' to .hg/requires.
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   largefiles
--- a/tests/test-lfs-largefiles.t	Wed Nov 10 10:58:13 2021 +0100
+++ b/tests/test-lfs-largefiles.t	Wed Nov 10 11:42:13 2021 +0100
@@ -290,7 +290,7 @@
 
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   lfs
--- a/tests/test-narrow-clone-no-ellipsis.t	Wed Nov 10 10:58:13 2021 +0100
+++ b/tests/test-narrow-clone-no-ellipsis.t	Wed Nov 10 11:42:13 2021 +0100
@@ -24,7 +24,7 @@
   $ cd narrow
   $ cat .hg/requires | grep -v generaldelta
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   narrowhg-experimental
   persistent-nodemap (rust !)
--- a/tests/test-narrow-clone-stream.t	Wed Nov 10 10:58:13 2021 +0100
+++ b/tests/test-narrow-clone-stream.t	Wed Nov 10 11:42:13 2021 +0100
@@ -64,7 +64,7 @@
   $ cat .hg/requires
   dotencode (tree !)
   dotencode (flat-fncache !)
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache (tree !)
   fncache (flat-fncache !)
   generaldelta
--- a/tests/test-narrow-clone.t	Wed Nov 10 10:58:13 2021 +0100
+++ b/tests/test-narrow-clone.t	Wed Nov 10 11:42:13 2021 +0100
@@ -40,7 +40,7 @@
   $ cd narrow
   $ cat .hg/requires | grep -v generaldelta
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   narrowhg-experimental
   persistent-nodemap (rust !)
--- a/tests/test-narrow-sparse.t	Wed Nov 10 10:58:13 2021 +0100
+++ b/tests/test-narrow-sparse.t	Wed Nov 10 11:42:13 2021 +0100
@@ -58,7 +58,7 @@
 
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   narrowhg-experimental
--- a/tests/test-phases.t	Wed Nov 10 10:58:13 2021 +0100
+++ b/tests/test-phases.t	Wed Nov 10 11:42:13 2021 +0100
@@ -884,7 +884,7 @@
   $ cd no-internal-phase
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   persistent-nodemap (rust !)
@@ -913,7 +913,7 @@
   $ cd internal-phase
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   internal-phase
--- a/tests/test-remotefilelog-clone-tree.t	Wed Nov 10 10:58:13 2021 +0100
+++ b/tests/test-remotefilelog-clone-tree.t	Wed Nov 10 11:42:13 2021 +0100
@@ -27,7 +27,7 @@
   $ cd shallow
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   exp-remotefilelog-repo-req-1
   fncache
   generaldelta
@@ -71,7 +71,7 @@
   $ cd shallow2
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   exp-remotefilelog-repo-req-1
   fncache
   generaldelta
@@ -115,7 +115,7 @@
   $ ls shallow3/.hg/store/data
   $ cat shallow3/.hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   exp-remotefilelog-repo-req-1
   fncache
   generaldelta
--- a/tests/test-remotefilelog-clone.t	Wed Nov 10 10:58:13 2021 +0100
+++ b/tests/test-remotefilelog-clone.t	Wed Nov 10 11:42:13 2021 +0100
@@ -24,7 +24,7 @@
   $ cd shallow
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   exp-remotefilelog-repo-req-1
   fncache
   generaldelta
@@ -61,7 +61,7 @@
   $ cd shallow2
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   exp-remotefilelog-repo-req-1
   fncache
   generaldelta
@@ -113,7 +113,7 @@
   $ ls shallow3/.hg/store/data
   $ cat shallow3/.hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   exp-remotefilelog-repo-req-1
   fncache
   generaldelta
--- a/tests/test-remotefilelog-log.t	Wed Nov 10 10:58:13 2021 +0100
+++ b/tests/test-remotefilelog-log.t	Wed Nov 10 11:42:13 2021 +0100
@@ -27,7 +27,7 @@
   $ cd shallow
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   exp-remotefilelog-repo-req-1
   fncache
   generaldelta
--- a/tests/test-repo-compengines.t	Wed Nov 10 10:58:13 2021 +0100
+++ b/tests/test-repo-compengines.t	Wed Nov 10 11:42:13 2021 +0100
@@ -11,7 +11,7 @@
   $ cd default
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   persistent-nodemap (rust !)
@@ -61,7 +61,7 @@
 
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   persistent-nodemap (rust !)
@@ -81,7 +81,7 @@
   $ cd zstd
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   persistent-nodemap (rust !)
@@ -186,7 +186,7 @@
   $ cat none-compression/.hg/requires
   dotencode
   exp-compression-none
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   persistent-nodemap (rust !)
--- a/tests/test-requires.t	Wed Nov 10 10:58:13 2021 +0100
+++ b/tests/test-requires.t	Wed Nov 10 11:42:13 2021 +0100
@@ -50,7 +50,7 @@
   > EOF
   $ hg -R supported debugrequirements
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   featuresetup-test
   fncache
   generaldelta
--- a/tests/test-revlog-v2.t	Wed Nov 10 10:58:13 2021 +0100
+++ b/tests/test-revlog-v2.t	Wed Nov 10 11:42:13 2021 +0100
@@ -22,7 +22,7 @@
   $ cd new-repo
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   exp-revlogv2.2
   fncache
   generaldelta
--- a/tests/test-share-safe.t	Wed Nov 10 10:58:13 2021 +0100
+++ b/tests/test-share-safe.t	Wed Nov 10 11:42:13 2021 +0100
@@ -19,7 +19,7 @@
   $ hg init source
   $ cd source
   $ cat .hg/requires
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   share-safe
   $ cat .hg/store/requires
   dotencode
@@ -30,7 +30,7 @@
   store
   $ hg debugrequirements
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   revlogv1
@@ -54,13 +54,13 @@
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd shared1
   $ cat .hg/requires
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   share-safe
   shared
 
   $ hg debugrequirements -R ../source
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   revlogv1
@@ -70,7 +70,7 @@
 
   $ hg debugrequirements
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   revlogv1
@@ -327,7 +327,7 @@
   $ cd non-share-safe
   $ hg debugrequirements
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   revlogv1
@@ -346,7 +346,7 @@
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg debugrequirements -R nss-share
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   revlogv1
@@ -394,7 +394,7 @@
 
   $ hg debugrequirements
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   revlogv1
@@ -403,7 +403,7 @@
   store
 
   $ cat .hg/requires
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   share-safe
 
   $ cat .hg/store/requires
@@ -485,7 +485,7 @@
 
   $ hg debugrequirements
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   revlogv1
@@ -494,7 +494,7 @@
 
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   revlogv1
@@ -564,7 +564,7 @@
   repository upgraded to share safe mode, existing shares will still work in old non-safe mode. Re-share existing shares to use them in safe mode New shares will be created in safe mode.
   $ hg debugrequirements
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   revlogv1
--- a/tests/test-sparse-requirement.t	Wed Nov 10 10:58:13 2021 +0100
+++ b/tests/test-sparse-requirement.t	Wed Nov 10 11:42:13 2021 +0100
@@ -18,7 +18,7 @@
 
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   persistent-nodemap (rust !)
@@ -38,7 +38,7 @@
 
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   exp-sparse
   fncache
   generaldelta
@@ -61,7 +61,7 @@
 
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   persistent-nodemap (rust !)
--- a/tests/test-sqlitestore.t	Wed Nov 10 10:58:13 2021 +0100
+++ b/tests/test-sqlitestore.t	Wed Nov 10 11:42:13 2021 +0100
@@ -15,7 +15,7 @@
   $ hg init empty-no-sqlite
   $ cat empty-no-sqlite/.hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   persistent-nodemap (rust !)
@@ -29,7 +29,7 @@
   $ hg --config storage.new-repo-backend=sqlite init empty-sqlite
   $ cat empty-sqlite/.hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   exp-sqlite-001
   exp-sqlite-comp-001=zstd (zstd !)
   exp-sqlite-comp-001=$BUNDLE2_COMPRESSIONS$ (no-zstd !)
@@ -51,7 +51,7 @@
   $ hg --config storage.sqlite.compression=zlib init empty-zlib
   $ cat empty-zlib/.hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   exp-sqlite-001
   exp-sqlite-comp-001=$BUNDLE2_COMPRESSIONS$
   fncache
@@ -67,7 +67,7 @@
   $ hg --config storage.sqlite.compression=none init empty-none
   $ cat empty-none/.hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   exp-sqlite-001
   exp-sqlite-comp-001=none
   fncache