Mercurial > hg

changeset 51906:0f26ee69cf36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rev-branch-cache: increment the version to "v2" We want to ensure no older clients will truncate the file under us. So we need to change their name. We don't change the rest of the format (unfortunaly).
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 24 Sep 2024 03:16:35 +0200
parents c564be351754
children bd7359c18d69
files mercurial/branching/rev_cache.py mercurial/cacheutil.py tests/test-acl.t tests/test-branches.t tests/test-cache-abuse.t tests/test-clone-stream-revlog-split.t tests/test-clone-stream.t tests/test-clone.t tests/test-debugcommands.t tests/test-fncache.t tests/test-hardlinks.t tests/test-inherit-mode.t tests/test-rebase-conflicts.t tests/test-remote-hidden.t tests/test-server-view.t tests/test-share.t tests/test-static-http.t tests/test-stream-bundle-v2.t tests/test-strip.t tests/test-tags.t
diffstat 20 files changed, 109 insertions(+), 107 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/branching/rev_cache.py	Tue Sep 24 00:16:23 2024 +0200
+++ b/mercurial/branching/rev_cache.py	Tue Sep 24 03:16:35 2024 +0200
@@ -28,7 +28,9 @@
 
 # Revision branch info cache
 
-_rbcversion = b'-v1'
+# The "V2" version use the same format as the "V1" but garantee it won't be
+# truncated, preventing SIGBUS when it is mmap-ed
+_rbcversion = b'-v2'
 _rbcnames = b'rbc-names' + _rbcversion
 _rbcrevs = b'rbc-revs' + _rbcversion
 # [4 byte hash prefix][4 byte branch name number with sign bit indicating open]
--- a/mercurial/cacheutil.py	Tue Sep 24 00:16:23 2024 +0200
+++ b/mercurial/cacheutil.py	Tue Sep 24 03:16:35 2024 +0200
@@ -18,7 +18,7 @@
     cachefiles += [b'branch2-%s' % f for f in repoview.filtertable]
     cachefiles += [b'branch3']
     cachefiles += [b'branch3-%s' % f for f in repoview.filtertable]
-    cachefiles += [b'rbc-names-v1', b'rbc-revs-v1']
+    cachefiles += [b'rbc-names-v2', b'rbc-revs-v2']
     cachefiles += [b'tags2']
     cachefiles += [b'tags2-%s' % f for f in repoview.filtertable]
     cachefiles += [b'hgtagsfnodes1']
--- a/tests/test-acl.t	Tue Sep 24 00:16:23 2024 +0200
+++ b/tests/test-acl.t	Tue Sep 24 03:16:35 2024 +0200
@@ -202,7 +202,7 @@
   bundle2-input-part: "phase-heads" supported
   bundle2-input-part: total payload size * (glob)
   bundle2-input-bundle: 5 parts total
-  resetting content of cache/rbc-revs-v1
+  resetting content of cache/rbc-revs-v2
   updating the branch cache
   added 3 changesets with 3 changes to 3 files
   bundle2-output-bundle: "HG20", 1 parts total
@@ -280,7 +280,7 @@
   bundle2-input-part: "phase-heads" supported
   bundle2-input-part: total payload size * (glob)
   bundle2-input-bundle: 5 parts total
-  resetting content of cache/rbc-revs-v1
+  resetting content of cache/rbc-revs-v2
   updating the branch cache
   added 3 changesets with 3 changes to 3 files
   bundle2-output-bundle: "HG20", 1 parts total
@@ -355,7 +355,7 @@
   bundle2-input-bundle: 5 parts total
   transaction abort!
   rollback completed
-  resetting content of cache/rbc-revs-v1
+  resetting content of cache/rbc-revs-v2
   abort: acl: user "fred" not allowed on "foo/file.txt" (changeset "ef1ea85a6374")
   no rollback information available
   0:6675d58eff77
@@ -879,7 +879,7 @@
   bundle2-input-bundle: 7 parts total
   transaction abort!
   rollback completed
-  resetting content of cache/rbc-revs-v1
+  resetting content of cache/rbc-revs-v2
   abort: acl: user "fred" denied on bookmark "moving-bookmark" (changeset "ef1ea85a6374b77d6da9dcda9541f498f2d17df7")
   no rollback information available
   0:6675d58eff77
@@ -1048,7 +1048,7 @@
   bundle2-input-bundle: 5 parts total
   transaction abort!
   rollback completed
-  resetting content of cache/rbc-revs-v1
+  resetting content of cache/rbc-revs-v2
   abort: acl: user "wilma" not allowed on "quux/file.py" (changeset "911600dab2ae")
   no rollback information available
   0:6675d58eff77
@@ -1380,7 +1380,7 @@
   bundle2-input-part: "phase-heads" supported
   bundle2-input-part: total payload size * (glob)
   bundle2-input-bundle: 5 parts total
-  resetting content of cache/rbc-revs-v1
+  resetting content of cache/rbc-revs-v2
   updating the branch cache
   added 3 changesets with 3 changes to 3 files
   bundle2-output-bundle: "HG20", 1 parts total
@@ -1464,7 +1464,7 @@
   bundle2-input-bundle: 5 parts total
   transaction abort!
   rollback completed
-  resetting content of cache/rbc-revs-v1
+  resetting content of cache/rbc-revs-v2
   abort: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")
   no rollback information available
   0:6675d58eff77
@@ -1632,7 +1632,7 @@
   bundle2-input-bundle: 5 parts total
   transaction abort!
   rollback completed
-  resetting content of cache/rbc-revs-v1
+  resetting content of cache/rbc-revs-v2
   abort: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")
   no rollback information available
   0:6675d58eff77
--- a/tests/test-branches.t	Tue Sep 24 00:16:23 2024 +0200
+++ b/tests/test-branches.t	Tue Sep 24 03:16:35 2024 +0200
@@ -790,14 +790,14 @@
   $ rm -rf .hg/cache; hg head a -T '{rev}\n'
   5
   $ f --hexdump --size .hg/cache/rbc-*
-  .hg/cache/rbc-names-v1: size=92
+  .hg/cache/rbc-names-v2: size=92
   0000: 64 65 66 61 75 6c 74 00 61 00 62 00 63 00 61 20 |default.a.b.c.a |
   0010: 62 72 61 6e 63 68 20 6e 61 6d 65 20 6d 75 63 68 |branch name much|
   0020: 20 6c 6f 6e 67 65 72 20 74 68 61 6e 20 74 68 65 | longer than the|
   0030: 20 64 65 66 61 75 6c 74 20 6a 75 73 74 69 66 69 | default justifi|
   0040: 63 61 74 69 6f 6e 20 75 73 65 64 20 62 79 20 62 |cation used by b|
   0050: 72 61 6e 63 68 65 73 00 6d 00 6d 64             |ranches.m.md|
-  .hg/cache/rbc-revs-v1: size=160
+  .hg/cache/rbc-revs-v2: size=160
   0000: 19 70 9c 5a 00 00 00 00 dd 6b 44 0d 00 00 00 01 |.p.Z.....kD.....|
   0010: 88 1f e2 b9 00 00 00 01 ac 22 03 33 00 00 00 02 |.........".3....|
   0020: ae e3 9c d1 00 00 00 02 d8 cb c6 1d 00 00 00 01 |................|
@@ -811,70 +811,70 @@
 
 no errors when revbranchcache is not writable
 
-  $ echo >> .hg/cache/rbc-revs-v1
-  $ mv .hg/cache/rbc-revs-v1 .hg/cache/rbc-revs-v1_
-  $ mkdir .hg/cache/rbc-revs-v1
+  $ echo >> .hg/cache/rbc-revs-v2
+  $ mv .hg/cache/rbc-revs-v2 .hg/cache/rbc-revs-v2_
+  $ mkdir .hg/cache/rbc-revs-v2
   $ rm -f .hg/cache/branch* && hg head a -T '{rev}\n'
   5
-  $ rmdir .hg/cache/rbc-revs-v1
-  $ mv .hg/cache/rbc-revs-v1_ .hg/cache/rbc-revs-v1
+  $ rmdir .hg/cache/rbc-revs-v2
+  $ mv .hg/cache/rbc-revs-v2_ .hg/cache/rbc-revs-v2
 
 no errors when wlock cannot be acquired
 
 #if unix-permissions
-  $ mv .hg/cache/rbc-revs-v1 .hg/cache/rbc-revs-v1_
+  $ mv .hg/cache/rbc-revs-v2 .hg/cache/rbc-revs-v2_
   $ rm -f .hg/cache/branch*
   $ chmod 555 .hg
   $ hg head a -T '{rev}\n'
   5
   $ chmod 755 .hg
-  $ mv .hg/cache/rbc-revs-v1_ .hg/cache/rbc-revs-v1
+  $ mv .hg/cache/rbc-revs-v2_ .hg/cache/rbc-revs-v2
 #endif
 
 recovery from invalid cache revs file with trailing data
-  $ echo >> .hg/cache/rbc-revs-v1
+  $ echo >> .hg/cache/rbc-revs-v2
   $ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug
   5
-  overwriting 2 bytes from 160 in cache/rbc-revs-v1 leaving (2 trailing bytes)
+  overwriting 2 bytes from 160 in cache/rbc-revs-v2 leaving (2 trailing bytes)
   $ f --size .hg/cache/rbc-revs*
-  .hg/cache/rbc-revs-v1: size=162
+  .hg/cache/rbc-revs-v2: size=162
 
 recovery from invalid cache file with partial last record
-  $ mv .hg/cache/rbc-revs-v1 .
-  $ f -qDB 119 rbc-revs-v1 > .hg/cache/rbc-revs-v1
+  $ mv .hg/cache/rbc-revs-v2 .
+  $ f -qDB 119 rbc-revs-v2 > .hg/cache/rbc-revs-v2
   $ f --size .hg/cache/rbc-revs*
-  .hg/cache/rbc-revs-v1: size=119
+  .hg/cache/rbc-revs-v2: size=119
   $ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug
   5
-  resetting content of cache/rbc-revs-v1
+  resetting content of cache/rbc-revs-v2
   $ f --size .hg/cache/rbc-revs*
-  .hg/cache/rbc-revs-v1: size=160
+  .hg/cache/rbc-revs-v2: size=160
 
 recovery from invalid cache file with missing record - no truncation
-  $ mv .hg/cache/rbc-revs-v1 .
-  $ f -qDB 112 rbc-revs-v1 > .hg/cache/rbc-revs-v1
+  $ mv .hg/cache/rbc-revs-v2 .
+  $ f -qDB 112 rbc-revs-v2 > .hg/cache/rbc-revs-v2
   $ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug
   5
   $ f --size .hg/cache/rbc-revs*
-  .hg/cache/rbc-revs-v1: size=160
+  .hg/cache/rbc-revs-v2: size=160
 
 recovery from invalid cache file with some bad records
-  $ mv .hg/cache/rbc-revs-v1 .
-  $ f -qDB 8 rbc-revs-v1 > .hg/cache/rbc-revs-v1
+  $ mv .hg/cache/rbc-revs-v2 .
+  $ f -qDB 8 rbc-revs-v2 > .hg/cache/rbc-revs-v2
   $ f --size .hg/cache/rbc-revs*
-  .hg/cache/rbc-revs-v1: size=8
-  $ f -qDB 112 rbc-revs-v1 >> .hg/cache/rbc-revs-v1
+  .hg/cache/rbc-revs-v2: size=8
+  $ f -qDB 112 rbc-revs-v2 >> .hg/cache/rbc-revs-v2
   $ f --size .hg/cache/rbc-revs*
-  .hg/cache/rbc-revs-v1: size=120
+  .hg/cache/rbc-revs-v2: size=120
   $ hg log -r 'branch(.)' -T '{rev} ' --debug
   history modification detected - truncating revision branch cache to revision * (glob)
   history modification detected - truncating revision branch cache to revision 1
-  3 4 8 9 10 11 12 13 resetting content of cache/rbc-revs-v1
+  3 4 8 9 10 11 12 13 resetting content of cache/rbc-revs-v2
   $ rm -f .hg/cache/branch* && hg head a -T '{rev}\n' --debug
   5
-  resetting content of cache/rbc-revs-v1
+  resetting content of cache/rbc-revs-v2
   $ f --size --hexdump --bytes=16 .hg/cache/rbc-revs*
-  .hg/cache/rbc-revs-v1: size=160
+  .hg/cache/rbc-revs-v2: size=160
   0000: 19 70 9c 5a 00 00 00 00 dd 6b 44 0d 00 00 00 01 |.p.Z.....kD.....|
 
 cache is updated when committing
@@ -882,36 +882,36 @@
   marked working directory as branch i-will-regret-this
   $ hg ci -m regrets
   $ f --size .hg/cache/rbc-*
-  .hg/cache/rbc-names-v1: size=111
-  .hg/cache/rbc-revs-v1: size=168
+  .hg/cache/rbc-names-v2: size=111
+  .hg/cache/rbc-revs-v2: size=168
 
 update after rollback - the cache will be correct but rbc-names will will still
 contain the branch name even though it no longer is used
   $ hg up -qr '.^'
   $ hg rollback -qf
   $ f --size .hg/cache/rbc-names-*
-  .hg/cache/rbc-names-v1: size=111
+  .hg/cache/rbc-names-v2: size=111
   $ grep "i-will-regret-this" .hg/cache/rbc-names-* > /dev/null
   $ f --size .hg/cache/rbc-revs-*
-  .hg/cache/rbc-revs-v1: size=168
+  .hg/cache/rbc-revs-v2: size=168
 
 cache is updated/truncated when stripping - it is thus very hard to get in a
 situation where the cache is out of sync and the hash check detects it
   $ hg --config extensions.strip= strip -r tip --nob
   $ f --size .hg/cache/rbc-revs*
-  .hg/cache/rbc-revs-v1: size=152
+  .hg/cache/rbc-revs-v2: size=152
 
 cache is rebuilt when corruption is detected
-  $ echo > .hg/cache/rbc-names-v1
+  $ echo > .hg/cache/rbc-names-v2
   $ hg log -r '5:&branch(.)' -T '{rev} ' --debug
   referenced branch names not found - rebuilding revision branch cache from scratch
   8 9 10 11 12 13  (no-eol)
   $ f --size .hg/cache/rbc-names-*
-  .hg/cache/rbc-names-v1: size=84
+  .hg/cache/rbc-names-v2: size=84
   $ grep "i-will-regret-this" .hg/cache/rbc-names-* > /dev/null
   [1]
   $ f --size .hg/cache/rbc-revs-*
-  .hg/cache/rbc-revs-v1: size=152
+  .hg/cache/rbc-revs-v2: size=152
 
 Test that cache files are created and grows correctly:
 
@@ -923,12 +923,12 @@
 
 #if v2
   $ f --size .hg/cache/rbc-*
-  .hg/cache/rbc-names-v1: size=1
-  .hg/cache/rbc-revs-v1: size=48
+  .hg/cache/rbc-names-v2: size=1
+  .hg/cache/rbc-revs-v2: size=48
 #else
   $ f --size .hg/cache/rbc-*
-  .hg/cache/rbc-names-v1: size=84
-  .hg/cache/rbc-revs-v1: size=152
+  .hg/cache/rbc-names-v2: size=84
+  .hg/cache/rbc-revs-v2: size=152
 #endif
 
   $ cd ..
@@ -947,16 +947,16 @@
 #if v2
 
   $ f --size --sha256 .hg/cache/rbc-*
-  .hg/cache/rbc-names-v1: size=14, sha256=d376f7eea9a7e28fac6470e78dae753c81a5543c9ad436e96999590e004a281c
-  .hg/cache/rbc-revs-v1: size=24, sha256=ec89032fd4e66e7282cb6e403848c681a855a9c36c6b44d19179218553b78779
+  .hg/cache/rbc-names-v2: size=14, sha256=d376f7eea9a7e28fac6470e78dae753c81a5543c9ad436e96999590e004a281c
+  .hg/cache/rbc-revs-v2: size=24, sha256=ec89032fd4e66e7282cb6e403848c681a855a9c36c6b44d19179218553b78779
 
-  $ : > .hg/cache/rbc-revs-v1
+  $ : > .hg/cache/rbc-revs-v2
 
 No superfluous rebuilding of cache:
   $ hg log -r "branch(null)&branch(branch)" --debug
   $ f --size --sha256 .hg/cache/rbc-*
-  .hg/cache/rbc-names-v1: size=14, sha256=d376f7eea9a7e28fac6470e78dae753c81a5543c9ad436e96999590e004a281c
-  .hg/cache/rbc-revs-v1: size=24, sha256=ec89032fd4e66e7282cb6e403848c681a855a9c36c6b44d19179218553b78779
+  .hg/cache/rbc-names-v2: size=14, sha256=d376f7eea9a7e28fac6470e78dae753c81a5543c9ad436e96999590e004a281c
+  .hg/cache/rbc-revs-v2: size=24, sha256=ec89032fd4e66e7282cb6e403848c681a855a9c36c6b44d19179218553b78779
 #endif
 
   $ cd ..
--- a/tests/test-cache-abuse.t	Tue Sep 24 00:16:23 2024 +0200
+++ b/tests/test-cache-abuse.t	Tue Sep 24 03:16:35 2024 +0200
@@ -82,13 +82,13 @@
   $ damage branches branch2-base "rm .hg/cache/branch2-[vs]*"
   $ damage branches branch2-served "rm .hg/cache/branch2-[bv]*"
   $ damage branches branch2-visible
-  $ damage "log -r branch(.)" rbc-names-v1
-  $ damage "log -r branch(default)" rbc-names-v1
-  $ damage "log -r branch(b2)" rbc-revs-v1
+  $ damage "log -r branch(.)" rbc-names-v2
+  $ damage "log -r branch(default)" rbc-names-v2
+  $ damage "log -r branch(b2)" rbc-revs-v2
 
 We currently can't detect an rbc cache with unknown names:
 
-  $ damage "log -qr branch(b2)" rbc-names-v1
+  $ damage "log -qr branch(b2)" rbc-names-v2
   --- before	* (glob)
   +++ after	* (glob)
   @@ -1,8 +?,0 @@ (glob)
--- a/tests/test-clone-stream-revlog-split.t	Tue Sep 24 00:16:23 2024 +0200
+++ b/tests/test-clone-stream-revlog-split.t	Tue Sep 24 03:16:35 2024 +0200
@@ -115,8 +115,8 @@
   adding [s] 00changelog.d (189 bytes)
   adding [s] 00changelog.i (192 bytes)
   adding [c] branch2-served (94 bytes)
-  adding [c] rbc-names-v1 (7 bytes)
-  adding [c] rbc-revs-v1 (24 bytes)
+  adding [c] rbc-names-v2 (7 bytes)
+  adding [c] rbc-revs-v2 (24 bytes)
   updating the branch cache
   transferred 2.11 KB in * seconds (* */sec) (glob) (no-rust !)
   transferred 2.29 KB in * seconds (* */sec) (glob) (rust !)
--- a/tests/test-clone-stream.t	Tue Sep 24 00:16:23 2024 +0200
+++ b/tests/test-clone-stream.t	Tue Sep 24 03:16:35 2024 +0200
@@ -221,8 +221,8 @@
   $ ls -1 clone1/.hg/cache
   branch2-base
   branch2-served
-  rbc-names-v1
-  rbc-revs-v1
+  rbc-names-v2
+  rbc-revs-v2
   tags2
   tags2-served
 #endif
--- a/tests/test-clone.t	Tue Sep 24 00:16:23 2024 +0200
+++ b/tests/test-clone.t	Tue Sep 24 03:16:35 2024 +0200
@@ -33,8 +33,8 @@
   default                       10:a7949464abda
   $ ls .hg/cache
   branch2-served
-  rbc-names-v1
-  rbc-revs-v1
+  rbc-names-v2
+  rbc-revs-v2
 
 Default operation:
 
@@ -48,8 +48,8 @@
   $ ls .hg/cache
   branch2-base
   branch2-served
-  rbc-names-v1
-  rbc-revs-v1
+  rbc-names-v2
+  rbc-revs-v2
   tags2
   tags2-served
 
@@ -114,8 +114,8 @@
   $ ls .hg/cache
   branch2-base
   branch2-served
-  rbc-names-v1
-  rbc-revs-v1
+  rbc-names-v2
+  rbc-revs-v2
   tags2
   tags2-served
 
--- a/tests/test-debugcommands.t	Tue Sep 24 00:16:23 2024 +0200
+++ b/tests/test-debugcommands.t	Tue Sep 24 03:16:35 2024 +0200
@@ -649,8 +649,8 @@
   $ ls -r .hg/cache/*
   .hg/cache/tags2-served
   .hg/cache/tags2
-  .hg/cache/rbc-revs-v1
-  .hg/cache/rbc-names-v1
+  .hg/cache/rbc-revs-v2
+  .hg/cache/rbc-names-v2
   .hg/cache/hgtagsfnodes1
   .hg/cache/branch2-served
 
--- a/tests/test-fncache.t	Tue Sep 24 00:16:23 2024 +0200
+++ b/tests/test-fncache.t	Tue Sep 24 03:16:35 2024 +0200
@@ -96,8 +96,8 @@
   .hg/branch
   .hg/cache
   .hg/cache/branch2-served
-  .hg/cache/rbc-names-v1
-  .hg/cache/rbc-revs-v1
+  .hg/cache/rbc-names-v2
+  .hg/cache/rbc-revs-v2
   .hg/data
   .hg/data/tst.d.hg
   .hg/data/tst.d.hg/foo.i
@@ -131,8 +131,8 @@
   .hg/branch
   .hg/cache
   .hg/cache/branch2-served
-  .hg/cache/rbc-names-v1
-  .hg/cache/rbc-revs-v1
+  .hg/cache/rbc-names-v2
+  .hg/cache/rbc-revs-v2
   .hg/dirstate
   .hg/fsmonitor.state (fsmonitor !)
   .hg/last-message.txt
--- a/tests/test-hardlinks.t	Tue Sep 24 00:16:23 2024 +0200
+++ b/tests/test-hardlinks.t	Tue Sep 24 03:16:35 2024 +0200
@@ -264,8 +264,8 @@
   [24] r4/.hg/branch (re)
   2 r4/.hg/cache/branch2-base
   2 r4/.hg/cache/branch2-served
-  2 r4/.hg/cache/rbc-names-v1
-  2 r4/.hg/cache/rbc-revs-v1
+  2 r4/.hg/cache/rbc-names-v2
+  2 r4/.hg/cache/rbc-revs-v2
   2 r4/.hg/cache/tags2
   2 r4/.hg/cache/tags2-served
   2 r4/.hg/dirstate
@@ -317,8 +317,8 @@
   1 r4/.hg/branch
   2 r4/.hg/cache/branch2-base
   2 r4/.hg/cache/branch2-served
-  2 r4/.hg/cache/rbc-names-v1
-  2 r4/.hg/cache/rbc-revs-v1
+  2 r4/.hg/cache/rbc-names-v2
+  2 r4/.hg/cache/rbc-revs-v2
   2 r4/.hg/cache/tags2
   2 r4/.hg/cache/tags2-served
   1 r4/.hg/dirstate
--- a/tests/test-inherit-mode.t	Tue Sep 24 00:16:23 2024 +0200
+++ b/tests/test-inherit-mode.t	Tue Sep 24 03:16:35 2024 +0200
@@ -71,8 +71,8 @@
   00660 ./.hg/branch
   00770 ./.hg/cache/
   00660 ./.hg/cache/branch2-served
-  00660 ./.hg/cache/rbc-names-v1
-  00660 ./.hg/cache/rbc-revs-v1
+  00660 ./.hg/cache/rbc-names-v2
+  00660 ./.hg/cache/rbc-revs-v2
   00660 ./.hg/dirstate
   00660 ./.hg/fsmonitor.state (fsmonitor !)
   00660 ./.hg/last-message.txt
@@ -136,8 +136,8 @@
   00660 ../push/.hg/branch
   00770 ../push/.hg/cache/
   00660 ../push/.hg/cache/branch2-base
-  00660 ../push/.hg/cache/rbc-names-v1
-  00660 ../push/.hg/cache/rbc-revs-v1
+  00660 ../push/.hg/cache/rbc-names-v2
+  00660 ../push/.hg/cache/rbc-revs-v2
   00660 ../push/.hg/requires
   00770 ../push/.hg/store/
   00660 ../push/.hg/store/00changelog-b870a51b.nd (rust !)
--- a/tests/test-rebase-conflicts.t	Tue Sep 24 00:16:23 2024 +0200
+++ b/tests/test-rebase-conflicts.t	Tue Sep 24 03:16:35 2024 +0200
@@ -319,14 +319,14 @@
   bundle2-input-part: "phase-heads" supported
   bundle2-input-part: total payload size 24
   bundle2-input-bundle: 3 parts total
-  resetting content of cache/rbc-revs-v1
+  resetting content of cache/rbc-revs-v2
   added 2 changesets with 2 changes to 1 files
   updating the branch cache
   invalid branch cache (served): tip differs
   history modification detected - truncating revision branch cache to revision 1
   invalid branch cache (served.hidden): tip differs
   rebase completed
-  resetting content of cache/rbc-revs-v1
+  resetting content of cache/rbc-revs-v2
 
 Test minimization of merge conflicts
   $ hg up -q null
--- a/tests/test-remote-hidden.t	Tue Sep 24 00:16:23 2024 +0200
+++ b/tests/test-remote-hidden.t	Tue Sep 24 03:16:35 2024 +0200
@@ -85,8 +85,8 @@
   branch2-served
   branch2-served.hidden
   branch2-visible
-  rbc-names-v1
-  rbc-revs-v1
+  rbc-names-v2
+  rbc-revs-v2
   tags2
   tags2-visible
 
--- a/tests/test-server-view.t	Tue Sep 24 00:16:23 2024 +0200
+++ b/tests/test-server-view.t	Tue Sep 24 03:16:35 2024 +0200
@@ -38,8 +38,8 @@
   branch2-base%89c45d2fa07e
   branch2-served
   hgtagsfnodes1
-  rbc-names-v1
-  rbc-revs-v1
+  rbc-names-v2
+  rbc-revs-v2
   tags2
   tags2-served%89c45d2fa07e
 
--- a/tests/test-share.t	Tue Sep 24 00:16:23 2024 +0200
+++ b/tests/test-share.t	Tue Sep 24 03:16:35 2024 +0200
@@ -52,8 +52,8 @@
   manifestfulltextcache (reporevlogstore !)
   $ ls -1 ../repo1/.hg/cache
   branch2-served
-  rbc-names-v1
-  rbc-revs-v1
+  rbc-names-v2
+  rbc-revs-v2
   tags2-visible
 
 Cloning a shared repo should pick up the full cache dir on the other hand.
@@ -64,8 +64,8 @@
   $ ls -1 ../repo2-clone/.hg/cache
   branch2-base
   branch2-served
-  rbc-names-v1
-  rbc-revs-v1
+  rbc-names-v2
+  rbc-revs-v2
   tags2
   tags2-served
   tags2-visible
--- a/tests/test-static-http.t	Tue Sep 24 00:16:23 2024 +0200
+++ b/tests/test-static-http.t	Tue Sep 24 03:16:35 2024 +0200
@@ -267,7 +267,7 @@
   /remote/.hg/cache/branch2-immutable
   /remote/.hg/cache/branch2-served
   /remote/.hg/cache/hgtagsfnodes1
-  /remote/.hg/cache/rbc-names-v1
+  /remote/.hg/cache/rbc-names-v2
   /remote/.hg/cache/tags2-served
   /remote/.hg/dirstate
   /remote/.hg/localtags
--- a/tests/test-stream-bundle-v2.t	Tue Sep 24 00:16:23 2024 +0200
+++ b/tests/test-stream-bundle-v2.t	Tue Sep 24 03:16:35 2024 +0200
@@ -130,8 +130,8 @@
   adding [s] 00changelog.d (275 bytes)
   adding [s] 00changelog.i (320 bytes)
   adding [c] branch2-served (94 bytes)
-  adding [c] rbc-names-v1 (7 bytes)
-  adding [c] rbc-revs-v1 (40 bytes)
+  adding [c] rbc-names-v2 (7 bytes)
+  adding [c] rbc-revs-v2 (40 bytes)
   transferred 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
   bundle2-input-part: total payload size 1857 (no-rust !)
   transferred 1.78 KB in * seconds (* */sec) (glob) (rust !)
@@ -193,8 +193,8 @@
   adding [s] 00changelog.d (275 bytes)
   adding [s] 00changelog.i (320 bytes)
   adding [c] branch2-served (94 bytes)
-  adding [c] rbc-names-v1 (7 bytes)
-  adding [c] rbc-revs-v1 (40 bytes)
+  adding [c] rbc-names-v2 (7 bytes)
+  adding [c] rbc-revs-v2 (40 bytes)
   transferred 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
   bundle2-input-part: total payload size 1857 (no-rust !)
   transferred 1.78 KB in * seconds (* */sec) (glob) (rust !)
@@ -258,8 +258,8 @@
   adding [s] 00changelog.d (275 bytes)
   adding [s] 00changelog.i (320 bytes)
   adding [c] branch2-served (94 bytes)
-  adding [c] rbc-names-v1 (7 bytes)
-  adding [c] rbc-revs-v1 (40 bytes)
+  adding [c] rbc-names-v2 (7 bytes)
+  adding [c] rbc-revs-v2 (40 bytes)
   transferred 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
   bundle2-input-part: total payload size 1869 (no-rust !)
   transferred 1.78 KB in * seconds (* */sec) (glob) (rust !)
@@ -320,8 +320,8 @@
   adding [s] 00changelog.d (275 bytes)
   adding [s] 00changelog.i (320 bytes)
   adding [c] branch2-served (94 bytes)
-  adding [c] rbc-names-v1 (7 bytes)
-  adding [c] rbc-revs-v1 (40 bytes)
+  adding [c] rbc-names-v2 (7 bytes)
+  adding [c] rbc-revs-v2 (40 bytes)
   transferred 1.65 KB in * seconds (* */sec) (glob) (no-rust !)
   bundle2-input-part: total payload size 1869 (no-rust !)
   transferred 1.78 KB in * seconds (* */sec) (glob) (rust !)
--- a/tests/test-strip.t	Tue Sep 24 00:16:23 2024 +0200
+++ b/tests/test-strip.t	Tue Sep 24 03:16:35 2024 +0200
@@ -913,7 +913,7 @@
   saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg
   updating the branch cache
   invalid branch cache (served): tip differs
-  resetting content of cache/rbc-revs-v1
+  resetting content of cache/rbc-revs-v2
   $ hg log -G
   o  changeset:   2:5c51d8d6557d
   |  tag:         tip
--- a/tests/test-tags.t	Tue Sep 24 00:16:23 2024 +0200
+++ b/tests/test-tags.t	Tue Sep 24 03:16:35 2024 +0200
@@ -793,8 +793,8 @@
   $ ls tagsclient/.hg/cache
   branch2-base
   hgtagsfnodes1
-  rbc-names-v1
-  rbc-revs-v1
+  rbc-names-v2
+  rbc-revs-v2
   tags2
   tags2-served
 
@@ -819,8 +819,8 @@
   $ ls tagsclient/.hg/cache
   branch2-base
   hgtagsfnodes1
-  rbc-names-v1
-  rbc-revs-v1
+  rbc-names-v2
+  rbc-revs-v2
   tags2
   tags2-served
   tags2-visible