Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branch3: use an explicitely experimental name for files
authorRaphaël Gomès <rgomes@octobus.net>
Mon, 24 Jun 2024 10:52:46 +0200
changeset 51646 f02ec1ecb3bf
parent 51645 ff523675cd69
child 51647 56eb076a08aa
branch3: use an explicitely experimental name for files Since this format is still experimental, we don't want to have to side-step the `branch3` name in case people do start using it before it's stable.
mercurial/branchmap.py file | annotate | diff | comparison | revisions
tests/test-branches-obsolete.t file | annotate | diff | comparison | revisions
tests/test-branches.t file | annotate | diff | comparison | revisions 
--- a/mercurial/branchmap.py	Mon Jun 24 03:16:52 2024 +0200
+++ b/mercurial/branchmap.py	Mon Jun 24 10:52:46 2024 +0200
@@ -867,7 +867,7 @@
     ignored.
     """
 
-    _base_filename = b"branch3"
+    _base_filename = b"branch3-exp"
     _default_key_hashes = (None, None)
 
     def __init__(self, *args, pure_topo_branch=None, **kwargs):
--- a/tests/test-branches-obsolete.t	Mon Jun 24 03:16:52 2024 +0200
+++ b/tests/test-branches-obsolete.t	Mon Jun 24 10:52:46 2024 +0200
@@ -22,7 +22,7 @@
   > [experimental]
   > branch-cache-v3=yes
   > EOF
-  $ CACHE_PREFIX=branch3
+  $ CACHE_PREFIX=branch3-exp
 #else
   $ cat <<EOF >> $HGRCPATH
   > [experimental]
@@ -122,7 +122,7 @@
   3d808bbc94408ea19da905596d4079357a1f28be o default
 #else
   $ show_cache
-  ##### .hg/cache/branch3-served
+  ##### .hg/cache/branch3-exp-served
   tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8 topo-mode=pure
   default
 #endif
@@ -169,7 +169,7 @@
   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 #else
   $ show_cache
-  ##### .hg/cache/branch3-served
+  ##### .hg/cache/branch3-exp-served
   filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7 topo-mode=pure
   default
 #endif
@@ -221,10 +221,10 @@
   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 #else
   $ show_cache
-  ##### .hg/cache/branch3
+  ##### .hg/cache/branch3-exp
   obsolete-hash=b6d2b1f5b70f09c25c835edcae69be35f681605c tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
   7c29ff2453bf38c75ee8982935739103c38a9284 o default
-  ##### .hg/cache/branch3-served
+  ##### .hg/cache/branch3-exp-served
   filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 obsolete-hash=ac5282439f301518f362f37547fcd52bcc670373 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 #endif
@@ -244,7 +244,7 @@
   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 #else
   $ show_cache
-  ##### .hg/cache/branch3-served
+  ##### .hg/cache/branch3-exp-served
   filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 obsolete-hash=ac5282439f301518f362f37547fcd52bcc670373 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 #endif
@@ -263,7 +263,7 @@
   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 #else
   $ show_cache
-  ##### .hg/cache/branch3-served
+  ##### .hg/cache/branch3-exp-served
   filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7 topo-mode=pure
   default
 #endif
@@ -311,10 +311,10 @@
   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 #else
   $ show_cache
-  ##### .hg/cache/branch3
+  ##### .hg/cache/branch3-exp
   obsolete-hash=b6d2b1f5b70f09c25c835edcae69be35f681605c tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
   7c29ff2453bf38c75ee8982935739103c38a9284 o default
-  ##### .hg/cache/branch3-served
+  ##### .hg/cache/branch3-exp-served
   filtered-hash=f1456c0d675980582dda9b8edc7f13f503ce544f obsolete-hash=3e74f5349008671629e39d13d7e00d9ba94c74f7 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7
   550bb31f072912453ccbb503de1d554616911e88 o default
 #endif
@@ -334,7 +334,7 @@
   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 #else
   $ show_cache
-  ##### .hg/cache/branch3-served
+  ##### .hg/cache/branch3-exp-served
   filtered-hash=f1456c0d675980582dda9b8edc7f13f503ce544f obsolete-hash=3e74f5349008671629e39d13d7e00d9ba94c74f7 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7
   550bb31f072912453ccbb503de1d554616911e88 o default
 #endif
@@ -353,7 +353,7 @@
   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 #else
   $ show_cache
-  ##### .hg/cache/branch3-served
+  ##### .hg/cache/branch3-exp-served
   filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7 topo-mode=pure
   default
 #endif
@@ -408,7 +408,7 @@
   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 #else
   $ show_cache
-  ##### .hg/cache/branch3-served
+  ##### .hg/cache/branch3-exp-served
   obsolete-hash=ac5282439f301518f362f37547fcd52bcc670373 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 #endif
@@ -428,7 +428,7 @@
   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 #else
   $ show_cache
-  ##### .hg/cache/branch3-served
+  ##### .hg/cache/branch3-exp-served
   obsolete-hash=ac5282439f301518f362f37547fcd52bcc670373 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 #endif
@@ -447,7 +447,7 @@
   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 #else
   $ show_cache
-  ##### .hg/cache/branch3-served
+  ##### .hg/cache/branch3-exp-served
   tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7 topo-mode=pure
   default
 #endif
@@ -491,7 +491,7 @@
   3d808bbc94408ea19da905596d4079357a1f28be o default
 #else
   $ show_cache
-  ##### .hg/cache/branch3-served
+  ##### .hg/cache/branch3-exp-served
   tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8 topo-mode=pure
   default
 #endif
@@ -515,7 +515,7 @@
   3d808bbc94408ea19da905596d4079357a1f28be o default
 #else
   $ show_cache
-  ##### .hg/cache/branch3-served
+  ##### .hg/cache/branch3-exp-served
   filtered-hash=f1456c0d675980582dda9b8edc7f13f503ce544f obsolete-hash=3e74f5349008671629e39d13d7e00d9ba94c74f7 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
   550bb31f072912453ccbb503de1d554616911e88 o default
 #endif
@@ -535,7 +535,7 @@
   3d808bbc94408ea19da905596d4079357a1f28be o default
 #else
   $ show_cache
-  ##### .hg/cache/branch3-served
+  ##### .hg/cache/branch3-exp-served
   filtered-hash=f1456c0d675980582dda9b8edc7f13f503ce544f obsolete-hash=3e74f5349008671629e39d13d7e00d9ba94c74f7 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
   550bb31f072912453ccbb503de1d554616911e88 o default
 #endif
@@ -554,7 +554,7 @@
   3d808bbc94408ea19da905596d4079357a1f28be o default
 #else
   $ show_cache
-  ##### .hg/cache/branch3-served
+  ##### .hg/cache/branch3-exp-served
   filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8 topo-mode=pure
   default
 #endif
--- a/tests/test-branches.t	Mon Jun 24 03:16:52 2024 +0200
+++ b/tests/test-branches.t	Mon Jun 24 10:52:46 2024 +0200
@@ -1311,7 +1311,7 @@
   updating to branch A
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 #if v3
-  $ cat branchmap-update-01/.hg/cache/branch3-base
+  $ cat branchmap-update-01/.hg/cache/branch3-exp-base
   tip-node=99ba08759bc7f6fdbe5304e83d0387f35c082479 tip-rev=1 topo-mode=pure
   A
 #else
@@ -1327,7 +1327,7 @@
   new changesets a3b807b3ff0b:71ca9a6d524e (2 drafts)
   (run 'hg update' to get a working copy)
 #if v3
-  $ cat branchmap-update-01/.hg/cache/branch3-served
+  $ cat branchmap-update-01/.hg/cache/branch3-exp-served
   tip-node=71ca9a6d524ed3c2a215119b2086ac3b8c4c8286 tip-rev=3 topo-mode=pure
   A
 #else
@@ -1357,7 +1357,7 @@
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 #if v3
-  $ cat branchmap-update-02/.hg/cache/branch3-base
+  $ cat branchmap-update-02/.hg/cache/branch3-exp-base
   tip-node=99ba08759bc7f6fdbe5304e83d0387f35c082479 tip-rev=1 topo-mode=pure
   A
 #else
@@ -1374,7 +1374,7 @@
   abort: pretxnclose hook failed
   [40]
 #if v3
-  $ cat branchmap-update-02/.hg/cache/branch3-base
+  $ cat branchmap-update-02/.hg/cache/branch3-exp-base
   tip-node=99ba08759bc7f6fdbe5304e83d0387f35c082479 tip-rev=1 topo-mode=pure
   A
 #else
Mercurial