Read about our upcoming Code of Conduct on this issue

Commit 3f73adf0 authored by Raphaël Gomès's avatar Raphaël Gomès
Browse files

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

--HG--
branch : stable
parent 5d69a0a23f5b
......@@ -101,7 +101,7 @@ that uses a format that was introduced later.
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.
......
......@@ -19,7 +19,7 @@ creating 'local'
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 @@ creating repo with format.usestore=false
$ 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 @@ creating repo with format.usefncache=false
$ 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 @@ creating repo with format.dotencode=false
$ 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 @@ creating repo with format.dotencode=false
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 @@ creating 'local/sub/repo'
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 @@ init should (for consistency with clone) expand the url
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 @@ verify that clone also expand urls
store created
00changelog.i created
dotencode
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
fncache
generaldelta
persistent-nodemap (rust !)
......
......@@ -96,7 +96,7 @@ Test link+rename largefile codepath
"lfconvert" adds 'largefiles' to .hg/requires.
$ cat .hg/requires
dotencode
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
fncache
generaldelta
largefiles
......
......@@ -290,7 +290,7 @@ The requirement is added to the destination repo.
$ cat .hg/requires
dotencode
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
fncache
generaldelta
lfs
......
......@@ -24,7 +24,7 @@ narrow clone a file, f10
$ 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 !)
......
......@@ -64,7 +64,7 @@ Making sure we have the correct set of requirements
$ cat .hg/requires
dotencode (tree !)
dotencode (flat-fncache !)
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
fncache (tree !)
fncache (flat-fncache !)
generaldelta
......
......@@ -40,7 +40,7 @@ narrow clone a file, f10
$ 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 !)
......
......@@ -58,7 +58,7 @@ XXX: we should have a flag in `hg debugsparse` to list the sparse profile
$ cat .hg/requires
dotencode
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
fncache
generaldelta
narrowhg-experimental
......
......@@ -884,7 +884,7 @@ Check we deny its usage on older repository
$ 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 @@ Check it works fine with repository that supports it.
$ cd internal-phase
$ cat .hg/requires
dotencode
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
fncache
generaldelta
internal-phase
......
......@@ -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
......
......@@ -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 @@ check its contents separately.
$ 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
......
......@@ -27,7 +27,7 @@ Shallow clone from full
$ cd shallow
$ cat .hg/requires
dotencode
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
exp-remotefilelog-repo-req-1
fncache
generaldelta
......
......@@ -11,7 +11,7 @@ A new repository uses zlib storage, which doesn't need a requirement
$ 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 @@ with that engine or a requirement
$ cat .hg/requires
dotencode
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
fncache
generaldelta
persistent-nodemap (rust !)
......@@ -81,7 +81,7 @@ with that engine or a requirement
$ 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 @@ checking details of none compression
$ cat none-compression/.hg/requires
dotencode
exp-compression-none
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
fncache
generaldelta
persistent-nodemap (rust !)
......
......@@ -50,7 +50,7 @@ another repository of push/pull/clone on localhost:
> EOF
$ hg -R supported debugrequirements
dotencode
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
featuresetup-test
fncache
generaldelta
......
......@@ -22,7 +22,7 @@ Can create and open repo with revlog v2 requirement
$ cd new-repo
$ cat .hg/requires
dotencode
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
exp-revlogv2.2
fncache
generaldelta
......
......@@ -19,7 +19,7 @@ prepare source repo
$ 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 @@ prepare source repo
store
$ hg debugrequirements
dotencode
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
fncache
generaldelta
revlogv1
......@@ -54,13 +54,13 @@ Create a shared repo and check the requirements are shared and read correctly
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 @@ Create a shared repo and check the requirements are shared and read correctly
$ hg debugrequirements
dotencode
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
fncache
generaldelta
revlogv1
......@@ -327,7 +327,7 @@ Test that upgrading using debugupgraderepo works
$ cd non-share-safe
$ hg debugrequirements
dotencode
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
fncache
generaldelta
revlogv1
......@@ -346,7 +346,7 @@ Create a share before upgrading
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 @@ Upgrade
$ hg debugrequirements
dotencode
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
fncache
generaldelta
revlogv1
......@@ -403,7 +403,7 @@ Upgrade
store
$ cat .hg/requires
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
share-safe
$ cat .hg/store/requires
......@@ -485,7 +485,7 @@ Test that downgrading works too
$ hg debugrequirements
dotencode
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
fncache
generaldelta
revlogv1
......@@ -494,7 +494,7 @@ Test that downgrading works too
$ cat .hg/requires
dotencode
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
fncache
generaldelta
revlogv1
......@@ -564,7 +564,7 @@ Testing automatic upgrade of shares when config is set
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
......
......@@ -18,7 +18,7 @@ Enable sparse profile
$ cat .hg/requires
dotencode
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
fncache
generaldelta
persistent-nodemap (rust !)
......@@ -38,7 +38,7 @@ Requirement for sparse added when sparse is enabled
$ cat .hg/requires
dotencode
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
exp-sparse
fncache
generaldelta
......@@ -61,7 +61,7 @@ Requirement for sparse is removed when sparse is disabled
$ cat .hg/requires
dotencode
exp-rc-dirstate-v2 (dirstate-v2 !)
dirstate-v2 (dirstate-v2 !)
fncache
generaldelta
persistent-nodemap (rust !)
......
......@@ -15,7 +15,7 @@ New repo should not use SQLite by default
$ 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 @@ storage.new-repo-backend=sqlite is recognized
$ 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 @@ Can force compression to zlib
$ 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 @@ Can force compression to none
$ 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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment