branching: merge stable into default

contrib/heptapod-ci.yml

@@ -152,7 +152,6 b' check-pytype-py3:'
 # 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'

mercurial/cext/parsers.c

@@ -25,6 +25,12 b''
 #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";

mercurial/helptext/internals/dirstate-v2.txt

@@ -12,7 +12,7 b' It is made of a flat sequence of unorder'
 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 b' Since the dirstate is entirely local and'
 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 b' Upgrading or downgrading an existing loc'
 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 b' Requirements file'
 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 b' counted in bytes from the start of the f'
 * 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 b' nodes must be next to each other and sor'
 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 b' Node components are:'
   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 b' by enabling it to skip `readdir` in more'
     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 b' by enabling it to skip `readdir` in more'
     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 b' by enabling it to skip `readdir` in more'
     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 b' by enabling it to skip `readdir` in more'
     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.

tests/hghave.py

@@ -1061,7 +1061,7 b' def has_repofncache():'
 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'
     )
 
 

tests/test-censor.t

@@ -552,14 +552,14 b' Make sure the last revision is a delta a'
 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

tests/test-clone-stream.t

@@ -96,7 +96,7 b' Name with special characters'
 
 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

tests/test-init.t

@@ -19,7 +19,7 b" 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 b' 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 b' creating repo with format.usefncache=fal'
   $ 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 b' creating repo with format.dotencode=fals'
   $ 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 b' creating repo with format.dotencode=fals'
   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 b" 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 b' init should (for consistency with clone)'
   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 b' 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 !)

tests/test-lfconvert.t

@@ -96,7 +96,7 b' 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

tests/test-lfs-largefiles.t

@@ -290,7 +290,7 b' The requirement is added to the destinat'
 
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   lfs

tests/test-narrow-clone-no-ellipsis.t

@@ -24,7 +24,7 b' 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 !)

tests/test-narrow-clone-stream.t

@@ -64,7 +64,7 b' Making sure we have the correct set of r'
   $ cat .hg/requires
   dotencode (tree !)
   dotencode (flat-fncache !)
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache (tree !)
   fncache (flat-fncache !)
   generaldelta

tests/test-narrow-clone.t

@@ -40,7 +40,7 b' 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 !)

tests/test-narrow-sparse.t

@@ -58,7 +58,7 b' XXX: we should have a flag in `hg debugs'
 
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   narrowhg-experimental

tests/test-persistent-nodemap.t

@@ -988,9 +988,10 b' truncate the file'
   $ 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)

tests/test-phases.t

@@ -884,7 +884,7 b' Check we deny its usage on older reposit'
   $ 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 b' Check it works fine with repository that'
   $ cd internal-phase
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   internal-phase

tests/test-remotefilelog-clone-tree.t

@@ -27,7 +27,7 b''
   $ 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 b''
   $ 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 b''
   $ 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

tests/test-remotefilelog-clone.t

@@ -24,7 +24,7 b''
   $ 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 b''
   $ 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 b' 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

tests/test-remotefilelog-log.t

@@ -27,7 +27,7 b' 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

tests/test-repo-compengines.t

@@ -11,7 +11,7 b' A new repository uses zlib storage, whic'
   $ 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 b' 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 b' 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 b' 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 !)

tests/test-requires.t

@@ -50,7 +50,7 b' another repository of push/pull/clone on'
   > EOF
   $ hg -R supported debugrequirements
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   featuresetup-test
   fncache
   generaldelta

tests/test-revlog-v2.t

@@ -22,7 +22,7 b' Can create and open repo with revlog v2 '
   $ cd new-repo
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   exp-revlogv2.2
   fncache
   generaldelta

tests/test-share-safe.t

@@ -19,7 +19,7 b' 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 b' prepare source repo'
   store
   $ hg debugrequirements
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   revlogv1
@@ -54,13 +54,13 b' Create a shared repo and check the requi'
   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 b' Create a shared repo and check the requi'
 
   $ hg debugrequirements
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   revlogv1
@@ -327,7 +327,7 b' Test that upgrading using debugupgradere'
   $ cd non-share-safe
   $ hg debugrequirements
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   revlogv1
@@ -346,7 +346,7 b' 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 b' Upgrade'
 
   $ hg debugrequirements
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   revlogv1
@@ -403,7 +403,7 b' 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 b' 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 b' 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 b' Testing automatic upgrade of shares when'
   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

tests/test-sparse-requirement.t

@@ -18,7 +18,7 b' 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 b' Requirement for sparse added when sparse'
 
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   exp-sparse
   fncache
   generaldelta
@@ -61,7 +61,7 b' Requirement for sparse is removed when s'
 
   $ cat .hg/requires
   dotencode
-  exp-rc-dirstate-v2 (dirstate-v2 !)
+  dirstate-v2 (dirstate-v2 !)
   fncache
   generaldelta
   persistent-nodemap (rust !)

tests/test-sqlitestore.t

@@ -15,7 +15,7 b' New repo should not use SQLite by defaul'
   $ 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 b' storage.new-repo-backend=sqlite is recog'
   $ 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 b' 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 b' 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