--- a/contrib/heptapod-ci.yml Wed Nov 10 08:09:34 2021 -0800
+++ b/contrib/heptapod-ci.yml Fri Nov 19 11:20:10 2021 +0100
@@ -107,7 +107,6 @@
# that satisfies the various shebang lines and delegates to `py -3`.
.window_runtests_template: &windows_runtests
<<: *all
- when: manual # we don't have any Windows runners anymore at the moment
stage: tests
before_script:
- C:/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && ls -1 tests/test-check-*.* > C:/Temp/check-tests.txt'
--- a/mercurial/cext/parsers.c Wed Nov 10 08:09:34 2021 -0800
+++ b/mercurial/cext/parsers.c Fri Nov 19 11:20:10 2021 +0100
@@ -25,6 +25,12 @@
#define PyInt_FromLong PyLong_FromLong
#define PyInt_FromSsize_t PyLong_FromSsize_t
#define PyInt_AsLong PyLong_AsLong
+#else
+/* Windows on Python 2.7 doesn't define S_IFLNK. Python 3+ defines via
+ * pyport.h. */
+#ifndef S_IFLNK
+#define S_IFLNK 0120000
+#endif
#endif
static const char *const versionerrortext = "Python minor version mismatch";
--- a/mercurial/helptext/internals/dirstate-v2.txt Wed Nov 10 08:09:34 2021 -0800
+++ b/mercurial/helptext/internals/dirstate-v2.txt Fri Nov 19 11:20:10 2021 +0100
@@ -12,7 +12,7 @@
so accessing any information in it requires parsing all of it.
Similarly, saving changes requires rewriting the entire file.
-The newer `dirsate-v2` file format is designed to fix these limitations
+The newer `dirstate-v2` file format is designed to fix these limitations
and make `hg status` faster.
User guide
@@ -33,18 +33,18 @@
When `share-safe` is enabled, different repositories sharing the same store
can use different dirstate formats.
-Enabling `dirsate-v2` for new local repositories
+Enabling `dirstate-v2` for new local repositories
------------------------------------------------
When creating a new local repository such as with `hg init` or `hg clone`,
-the `exp-dirstate-v2` boolean in the `format` configuration section
+the `exp-rc-dirstate-v2` boolean in the `format` configuration section
controls whether to use this file format.
This is disabled by default as of this writing.
To enable it for a single repository, run for example::
- $ hg init my-project --config format.exp-dirstate-v2=1
+ $ hg init my-project --config format.exp-rc-dirstate-v2=1
-Checking the format of an existing local repsitory
+Checking the format of an existing local repository
--------------------------------------------------
The `debugformat` commands prints information about
@@ -63,15 +63,15 @@
The `debugupgrade` command does various upgrades or downgrades
on a local repository
based on the current Mercurial version and on configuration.
-The same `format.exp-dirstate-v2` configuration is used again.
+The same `format.exp-rc-dirstate-v2` configuration is used again.
Example to upgrade::
- $ hg debugupgrade --config format.exp-dirstate-v2=1
+ $ hg debugupgrade --config format.exp-rc-dirstate-v2=1
Example to downgrade to `dirstate-v1`::
- $ hg debugupgrade --config format.exp-dirstate-v2=0
+ $ hg debugupgrade --config format.exp-rc-dirstate-v2=0
Both of this commands do nothing but print a list of proposed changes,
which may include changes unrelated to the dirstate.
@@ -96,19 +96,19 @@
The `.hg/requires` file indicates which of various optional file formats
are used by a given repository.
Mercurial aborts when seeing a requirement it does not know about,
-which avoids older version accidentally messing up a respository
+which avoids older version accidentally messing up a repository
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.
High level description
----------------------
-Whereas `dirstate-v1` uses a single `.hg/disrtate` file,
+Whereas `dirstate-v1` uses a single `.hg/dirstate` file,
in `dirstate-v2` that file is a "docket" file
that only contains some metadata
and points to separate data file named `.hg/dirstate.{ID}`,
@@ -173,7 +173,7 @@
* Offset 120:
The used size of the data file, as a 32-bit big-endian integer.
The actual size of the data file may be larger
- (if another Mercurial processis in appending to it
+ (if another Mercurial process is appending to it
but has not updated the docket yet).
That extra data must be ignored.
@@ -303,15 +303,15 @@
Contiguity lets the parent refer to them all
by their count and a single pseudo-pointer,
instead of storing one pseudo-pointer per child node.
-Sorting allows using binary seach to find a child node with a given name
+Sorting allows using binary search to find a child node with a given name
in `O(log(n))` byte sequence comparisons.
-The current implemention writes paths and child node before a given node
+The current implementation writes paths and child node before a given node
for ease of figuring out the value of pseudo-pointers by the time the are to be
written, but this is not an obligation and readers must not rely on it.
A path is stored as a byte string anywhere in the file, without delimiter.
-It is refered to by one or more node by a pseudo-pointer to its start, and its
+It is referred to by one or more node by a pseudo-pointer to its start, and its
length in bytes. Since there is no delimiter,
when a path is a substring of another the same bytes could be reused,
although the implementation does not exploit this as of this writing.
@@ -418,7 +418,7 @@
as a 32-bit integer.
When `mtime` is used,
this is the number of nanoseconds since `mtime.seconds`,
- always stritctly less than one billion.
+ always strictly less than one billion.
This may be zero if more precision is not available.
(This can happen because of limitations in any of Mercurial, Python,
@@ -503,8 +503,8 @@
file system.
* When `HAS_MTIME` is set a directory has been seen on the file system and
- `mtime` matches its last modificiation time. However, `HAS_MTIME` not being set
- does not indicate the lack of directory on the file system.
+ `mtime` matches its last modification time. However, `HAS_MTIME` not
+ being set does not indicate the lack of directory on the file system.
* When not tracked anywhere, this node does not represent an ignored or
unknown file on disk.
@@ -562,8 +562,8 @@
where present.
Also note that having this flag unset does not imply that no "unknown"
- children have been recorded. Some might be present, but there is no garantee
- that is will be all of them.
+ children have been recorded. Some might be present, but there is
+ no guarantee that is will be all of them.
`ALL_IGNORED_RECORDED`
If set, all "ignored" children existing on disk (at the time of the last
@@ -575,8 +575,8 @@
where present.
Also note that having this flag unset does not imply that no "ignored"
- children have been recorded. Some might be present, but there is no garantee
- that is will be all of them.
+ children have been recorded. Some might be present, but there is
+ no guarantee that is will be all of them.
`HAS_FALLBACK_EXEC`
If this flag is set, the entry carries "fallback" information for the
@@ -612,5 +612,5 @@
This flag is relevant only when `HAS_FILE_MTIME` is set. When set, the
`mtime` stored in the entry is only valid for comparison with timestamps
that have nanosecond information. If available timestamp does not carries
- nanosecond information, the `mtime` should be ignored and no optimisation
+ nanosecond information, the `mtime` should be ignored and no optimization
can be applied.
--- a/tests/hghave.py Wed Nov 10 08:09:34 2021 -0800
+++ b/tests/hghave.py Fri Nov 19 11:20:10 2021 +0100
@@ -1061,7 +1061,7 @@
def has_dirstate_v2():
# Keep this logic in sync with `newreporequirements()` in `mercurial/localrepo.py`
return has_rust() and matchoutput(
- 'hg config format.exp-dirstate-v2', b'(?i)1|yes|true|on|always'
+ 'hg config format.exp-rc-dirstate-v2', b'(?i)1|yes|true|on|always'
)
--- a/tests/test-censor.t Wed Nov 10 08:09:34 2021 -0800
+++ b/tests/test-censor.t Fri Nov 19 11:20:10 2021 +0100
@@ -552,14 +552,14 @@
Censor the file
$ hg cat -r $B1 target | wc -l
- 50002 (re)
+ *50002 (re)
$ hg censor -r $B1 target
$ hg cat -r $B1 target | wc -l
- 0 (re)
+ *0 (re)
Check the children is fine
$ hg cat -r $B2 target | wc -l
- 50003 (re)
+ *50003 (re)
#endif
--- a/tests/test-clone-stream.t Wed Nov 10 08:09:34 2021 -0800
+++ b/tests/test-clone-stream.t Fri Nov 19 11:20:10 2021 +0100
@@ -96,7 +96,7 @@
name causing issue6581
- $ mkdir --parents container/isam-build-centos7/
+ $ mkdir -p container/isam-build-centos7/
$ touch container/isam-build-centos7/bazel-coverage-generator-sandboxfs-compatibility-0758e3e4f6057904d44399bd666faba9e7f40686.patch
Add all that
--- a/tests/test-init.t Wed Nov 10 08:09:34 2021 -0800
+++ b/tests/test-init.t Fri Nov 19 11:20:10 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 08:09:34 2021 -0800
+++ b/tests/test-lfconvert.t Fri Nov 19 11:20:10 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 08:09:34 2021 -0800
+++ b/tests/test-lfs-largefiles.t Fri Nov 19 11:20:10 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 08:09:34 2021 -0800
+++ b/tests/test-narrow-clone-no-ellipsis.t Fri Nov 19 11:20:10 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 08:09:34 2021 -0800
+++ b/tests/test-narrow-clone-stream.t Fri Nov 19 11:20:10 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 08:09:34 2021 -0800
+++ b/tests/test-narrow-clone.t Fri Nov 19 11:20:10 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 08:09:34 2021 -0800
+++ b/tests/test-narrow-sparse.t Fri Nov 19 11:20:10 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-persistent-nodemap.t Wed Nov 10 08:09:34 2021 -0800
+++ b/tests/test-persistent-nodemap.t Fri Nov 19 11:20:10 2021 +0100
@@ -988,9 +988,10 @@
$ datafilepath=`ls corruption-test-repo/.hg/store/00changelog*.nd`
$ f -s $datafilepath
corruption-test-repo/.hg/store/00changelog-*.nd: size=121088 (glob)
- $ dd if=$datafilepath bs=1000 count=10 of=$datafilepath-tmp status=noxfer
+ $ dd if=$datafilepath bs=1000 count=10 of=$datafilepath-tmp
10+0 records in
10+0 records out
+ * bytes * (glob)
$ mv $datafilepath-tmp $datafilepath
$ f -s $datafilepath
corruption-test-repo/.hg/store/00changelog-*.nd: size=10000 (glob)
--- a/tests/test-phases.t Wed Nov 10 08:09:34 2021 -0800
+++ b/tests/test-phases.t Fri Nov 19 11:20:10 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 08:09:34 2021 -0800
+++ b/tests/test-remotefilelog-clone-tree.t Fri Nov 19 11:20:10 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 08:09:34 2021 -0800
+++ b/tests/test-remotefilelog-clone.t Fri Nov 19 11:20:10 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 08:09:34 2021 -0800
+++ b/tests/test-remotefilelog-log.t Fri Nov 19 11:20:10 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 08:09:34 2021 -0800
+++ b/tests/test-repo-compengines.t Fri Nov 19 11:20:10 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 08:09:34 2021 -0800
+++ b/tests/test-requires.t Fri Nov 19 11:20:10 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 08:09:34 2021 -0800
+++ b/tests/test-revlog-v2.t Fri Nov 19 11:20:10 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 08:09:34 2021 -0800
+++ b/tests/test-share-safe.t Fri Nov 19 11:20:10 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 08:09:34 2021 -0800
+++ b/tests/test-sparse-requirement.t Fri Nov 19 11:20:10 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 08:09:34 2021 -0800
+++ b/tests/test-sqlitestore.t Fri Nov 19 11:20:10 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