From 811506325d0791463403adf700af1e4b2d520d65 Mon Sep 17 00:00:00 2001 From: Christian Schilling Date: Thu, 26 Oct 2023 11:34:41 +0200 Subject: [PATCH] Bump CACHE_VERSION This should have been done in b54968a Change: cache-bump --- josh-core/src/cache.rs | 2 +- tests/proxy/amend_patchset.t | 2 +- tests/proxy/authentication.t | 2 +- tests/proxy/caching.t | 4 ++-- tests/proxy/clone_absent_head.t | 2 +- tests/proxy/clone_all.t | 2 +- tests/proxy/clone_blocked.t | 2 +- tests/proxy/clone_invalid_url.t | 2 +- tests/proxy/clone_locked_refs.t | 2 +- tests/proxy/clone_prefix.t | 2 +- tests/proxy/clone_sha.t | 2 +- tests/proxy/clone_subsubtree.t | 2 +- tests/proxy/clone_subtree.t | 2 +- tests/proxy/clone_subtree_no_master.t | 2 +- tests/proxy/clone_subtree_tags.t | 2 +- tests/proxy/clone_with_meta.t | 2 +- tests/proxy/empty_commit.t | 2 +- tests/proxy/get_version.t | 2 +- tests/proxy/import_export.t | 2 +- tests/proxy/join_with_merge.t | 2 +- tests/proxy/markers.t | 2 +- tests/proxy/no_proxy.t | 2 +- tests/proxy/no_proxy_lfs.t | 2 +- tests/proxy/push_graphql.t | 2 +- tests/proxy/push_new_branch.t | 2 +- tests/proxy/push_prefix.t | 2 +- tests/proxy/push_review.t | 2 +- tests/proxy/push_review_already_in.t | 2 +- tests/proxy/push_review_nop_behind.t | 2 +- tests/proxy/push_review_old.t | 2 +- tests/proxy/push_review_topic.t | 2 +- tests/proxy/push_stacked.t | 2 +- tests/proxy/push_stacked_split.t | 2 +- tests/proxy/push_stacked_sub.t | 2 +- tests/proxy/push_subdir_prefix.t | 2 +- tests/proxy/push_subtree.t | 2 +- tests/proxy/push_subtree_two_repos.t | 2 +- tests/proxy/unrelated_leak.t | 2 +- tests/proxy/workspace.t | 2 +- tests/proxy/workspace_create.t | 2 +- tests/proxy/workspace_discover.t | 2 +- tests/proxy/workspace_edit_commit.t | 2 +- tests/proxy/workspace_in_workspace.t | 2 +- tests/proxy/workspace_invalid_trailing_slash.t | 2 +- tests/proxy/workspace_modify.t | 2 +- tests/proxy/workspace_modify_chain.t | 2 +- tests/proxy/workspace_modify_chain_prefix_subtree.t | 2 +- tests/proxy/workspace_pre_history.t | 2 +- tests/proxy/workspace_publish.t | 2 +- tests/proxy/workspace_tags.t | 2 +- 50 files changed, 51 insertions(+), 51 deletions(-) diff --git a/josh-core/src/cache.rs b/josh-core/src/cache.rs index 0af7b9d0..a7b9a39d 100644 --- a/josh-core/src/cache.rs +++ b/josh-core/src/cache.rs @@ -1,7 +1,7 @@ use super::*; use std::collections::HashMap; -const CACHE_VERSION: u64 = 15; +const CACHE_VERSION: u64 = 16; lazy_static! { static ref DB: std::sync::Mutex> = std::sync::Mutex::new(None); diff --git a/tests/proxy/amend_patchset.t b/tests/proxy/amend_patchset.t index c07162d1..4060bd9b 100644 --- a/tests/proxy/amend_patchset.t +++ b/tests/proxy/amend_patchset.t @@ -124,7 +124,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/authentication.t b/tests/proxy/authentication.t index 3d90a012..6078ebc9 100644 --- a/tests/proxy/authentication.t +++ b/tests/proxy/authentication.t @@ -124,7 +124,7 @@ "real_repo.git" = ["::sub1/"] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/caching.t b/tests/proxy/caching.t index 939ae262..511f5274 100644 --- a/tests/proxy/caching.t +++ b/tests/proxy/caching.t @@ -51,7 +51,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf @@ -162,7 +162,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_absent_head.t b/tests/proxy/clone_absent_head.t index 32fe1203..34c08862 100644 --- a/tests/proxy/clone_absent_head.t +++ b/tests/proxy/clone_absent_head.t @@ -85,7 +85,7 @@ $ bash ${TESTDIR}/destroy_test_env.sh . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_all.t b/tests/proxy/clone_all.t index 4b351d70..e9466413 100644 --- a/tests/proxy/clone_all.t +++ b/tests/proxy/clone_all.t @@ -53,7 +53,7 @@ "real_repo.git" = ["::sub1/"] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_blocked.t b/tests/proxy/clone_blocked.t index b360b181..a089828a 100644 --- a/tests/proxy/clone_blocked.t +++ b/tests/proxy/clone_blocked.t @@ -9,7 +9,7 @@ $ bash ${TESTDIR}/destroy_test_env.sh . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_invalid_url.t b/tests/proxy/clone_invalid_url.t index 122cd593..ef86cbf6 100644 --- a/tests/proxy/clone_invalid_url.t +++ b/tests/proxy/clone_invalid_url.t @@ -32,7 +32,7 @@ $ bash ${TESTDIR}/destroy_test_env.sh . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_locked_refs.t b/tests/proxy/clone_locked_refs.t index e80dc75e..07614cb1 100644 --- a/tests/proxy/clone_locked_refs.t +++ b/tests/proxy/clone_locked_refs.t @@ -111,7 +111,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_prefix.t b/tests/proxy/clone_prefix.t index 5e74ae46..ae40e078 100644 --- a/tests/proxy/clone_prefix.t +++ b/tests/proxy/clone_prefix.t @@ -74,7 +74,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_sha.t b/tests/proxy/clone_sha.t index 76da82f1..9b70b78a 100644 --- a/tests/proxy/clone_sha.t +++ b/tests/proxy/clone_sha.t @@ -93,7 +93,7 @@ Check (2) and (3) but with a branch ref "real_repo.git" = ["::sub1/"] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_subsubtree.t b/tests/proxy/clone_subsubtree.t index 2fe6db2e..460a1e6a 100644 --- a/tests/proxy/clone_subsubtree.t +++ b/tests/proxy/clone_subsubtree.t @@ -87,7 +87,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_subtree.t b/tests/proxy/clone_subtree.t index 355daf9f..94dbec3c 100644 --- a/tests/proxy/clone_subtree.t +++ b/tests/proxy/clone_subtree.t @@ -85,7 +85,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_subtree_no_master.t b/tests/proxy/clone_subtree_no_master.t index a8282945..02cb27e9 100644 --- a/tests/proxy/clone_subtree_no_master.t +++ b/tests/proxy/clone_subtree_no_master.t @@ -78,7 +78,7 @@ "real_repo.git" = [":/sub1"] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_subtree_tags.t b/tests/proxy/clone_subtree_tags.t index ae3dfe2e..b24b8144 100644 --- a/tests/proxy/clone_subtree_tags.t +++ b/tests/proxy/clone_subtree_tags.t @@ -115,7 +115,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_with_meta.t b/tests/proxy/clone_with_meta.t index 5818307e..a1949176 100644 --- a/tests/proxy/clone_with_meta.t +++ b/tests/proxy/clone_with_meta.t @@ -129,7 +129,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/empty_commit.t b/tests/proxy/empty_commit.t index 67399d40..ac5dd7e7 100644 --- a/tests/proxy/empty_commit.t +++ b/tests/proxy/empty_commit.t @@ -83,7 +83,7 @@ should still be included. "real_repo.git" = ["::sub1/"] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/get_version.t b/tests/proxy/get_version.t index 3c844b48..abcbe706 100644 --- a/tests/proxy/get_version.t +++ b/tests/proxy/get_version.t @@ -7,7 +7,7 @@ $ bash ${TESTDIR}/destroy_test_env.sh . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/import_export.t b/tests/proxy/import_export.t index 0f96cd9e..9405e6cc 100644 --- a/tests/proxy/import_export.t +++ b/tests/proxy/import_export.t @@ -301,7 +301,7 @@ Flushed credential cache "repo2.git" = [":prefix=repo2"] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/join_with_merge.t b/tests/proxy/join_with_merge.t index e06bdcd3..29bca9c8 100644 --- a/tests/proxy/join_with_merge.t +++ b/tests/proxy/join_with_merge.t @@ -59,7 +59,7 @@ "real_repo.git" = [":prefix=sub1"] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/markers.t b/tests/proxy/markers.t index 463896ea..3e902500 100644 --- a/tests/proxy/markers.t +++ b/tests/proxy/markers.t @@ -340,7 +340,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/no_proxy.t b/tests/proxy/no_proxy.t index f3a4f46c..446199e2 100644 --- a/tests/proxy/no_proxy.t +++ b/tests/proxy/no_proxy.t @@ -35,7 +35,7 @@ $ bash ${TESTDIR}/destroy_test_env.sh . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/no_proxy_lfs.t b/tests/proxy/no_proxy_lfs.t index d1479d01..9dc77ab1 100644 --- a/tests/proxy/no_proxy_lfs.t +++ b/tests/proxy/no_proxy_lfs.t @@ -50,7 +50,7 @@ $ bash ${TESTDIR}/destroy_test_env.sh . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_graphql.t b/tests/proxy/push_graphql.t index 3de6c176..238d24cc 100644 --- a/tests/proxy/push_graphql.t +++ b/tests/proxy/push_graphql.t @@ -69,7 +69,7 @@ "real_repo.git" = ["::sub1/"] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_new_branch.t b/tests/proxy/push_new_branch.t index da577611..3cc94dab 100644 --- a/tests/proxy/push_new_branch.t +++ b/tests/proxy/push_new_branch.t @@ -97,7 +97,7 @@ Check the branch again ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_prefix.t b/tests/proxy/push_prefix.t index 1168ef95..22ff2fc9 100644 --- a/tests/proxy/push_prefix.t +++ b/tests/proxy/push_prefix.t @@ -56,7 +56,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_review.t b/tests/proxy/push_review.t index 4bd9a022..872f3d27 100644 --- a/tests/proxy/push_review.t +++ b/tests/proxy/push_review.t @@ -87,7 +87,7 @@ Make sure all temporary namespace got removed ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_review_already_in.t b/tests/proxy/push_review_already_in.t index 19ceed1c..4e8679c1 100644 --- a/tests/proxy/push_review_already_in.t +++ b/tests/proxy/push_review_already_in.t @@ -48,7 +48,7 @@ test for that. "real_repo.git" = [] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_review_nop_behind.t b/tests/proxy/push_review_nop_behind.t index 68b4f617..e4928896 100644 --- a/tests/proxy/push_review_nop_behind.t +++ b/tests/proxy/push_review_nop_behind.t @@ -55,7 +55,7 @@ This is a regression test for that problem. "real_repo.git" = [] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_review_old.t b/tests/proxy/push_review_old.t index 2cac10d8..062228d5 100644 --- a/tests/proxy/push_review_old.t +++ b/tests/proxy/push_review_old.t @@ -85,7 +85,7 @@ Flushed credential cache ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_review_topic.t b/tests/proxy/push_review_topic.t index 46594b15..ed98070a 100644 --- a/tests/proxy/push_review_topic.t +++ b/tests/proxy/push_review_topic.t @@ -42,7 +42,7 @@ Make sure all temporary namespace got removed ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_stacked.t b/tests/proxy/push_stacked.t index 335df3c9..c6f65634 100644 --- a/tests/proxy/push_stacked.t +++ b/tests/proxy/push_stacked.t @@ -151,7 +151,7 @@ Make sure all temporary namespace got removed ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_stacked_split.t b/tests/proxy/push_stacked_split.t index c14c3925..fa697d0b 100644 --- a/tests/proxy/push_stacked_split.t +++ b/tests/proxy/push_stacked_split.t @@ -76,7 +76,7 @@ Make sure all temporary namespace got removed "real_repo.git" = ["::sub1/"] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_stacked_sub.t b/tests/proxy/push_stacked_sub.t index fa4b160f..744dbeb5 100644 --- a/tests/proxy/push_stacked_sub.t +++ b/tests/proxy/push_stacked_sub.t @@ -132,7 +132,7 @@ Make sure all temporary namespace got removed ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_subdir_prefix.t b/tests/proxy/push_subdir_prefix.t index d05b3397..cfb9557e 100644 --- a/tests/proxy/push_subdir_prefix.t +++ b/tests/proxy/push_subdir_prefix.t @@ -48,7 +48,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_subtree.t b/tests/proxy/push_subtree.t index bddd0056..f249c68b 100644 --- a/tests/proxy/push_subtree.t +++ b/tests/proxy/push_subtree.t @@ -90,7 +90,7 @@ Make sure all temporary namespace got removed ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_subtree_two_repos.t b/tests/proxy/push_subtree_two_repos.t index 12c87ddb..24116172 100644 --- a/tests/proxy/push_subtree_two_repos.t +++ b/tests/proxy/push_subtree_two_repos.t @@ -118,7 +118,7 @@ Put a double slash in the URL to see that it also works ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/unrelated_leak.t b/tests/proxy/unrelated_leak.t index 7255ef2e..f8fe10dd 100644 --- a/tests/proxy/unrelated_leak.t +++ b/tests/proxy/unrelated_leak.t @@ -133,7 +133,7 @@ Flushed credential cache ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace.t b/tests/proxy/workspace.t index 758bd1a9..57af8070 100644 --- a/tests/proxy/workspace.t +++ b/tests/proxy/workspace.t @@ -225,7 +225,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_create.t b/tests/proxy/workspace_create.t index 9d9f14c1..c579cd67 100644 --- a/tests/proxy/workspace_create.t +++ b/tests/proxy/workspace_create.t @@ -442,7 +442,7 @@ Note that ws/d/ is now present in the ws ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_discover.t b/tests/proxy/workspace_discover.t index 6b7e1df3..6df6938e 100644 --- a/tests/proxy/workspace_discover.t +++ b/tests/proxy/workspace_discover.t @@ -102,7 +102,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_edit_commit.t b/tests/proxy/workspace_edit_commit.t index 7ad9ced8..24e709dd 100644 --- a/tests/proxy/workspace_edit_commit.t +++ b/tests/proxy/workspace_edit_commit.t @@ -181,7 +181,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_in_workspace.t b/tests/proxy/workspace_in_workspace.t index 36968952..6ffd7632 100644 --- a/tests/proxy/workspace_in_workspace.t +++ b/tests/proxy/workspace_in_workspace.t @@ -245,7 +245,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_invalid_trailing_slash.t b/tests/proxy/workspace_invalid_trailing_slash.t index 92c89ea0..88ce8471 100644 --- a/tests/proxy/workspace_invalid_trailing_slash.t +++ b/tests/proxy/workspace_invalid_trailing_slash.t @@ -184,7 +184,7 @@ Flushed credential cache ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_modify.t b/tests/proxy/workspace_modify.t index 10a07624..0e10c90f 100644 --- a/tests/proxy/workspace_modify.t +++ b/tests/proxy/workspace_modify.t @@ -441,7 +441,7 @@ Note that ws/d/ is now present in the ws ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_modify_chain.t b/tests/proxy/workspace_modify_chain.t index 0b76eeb2..cdb01a39 100644 --- a/tests/proxy/workspace_modify_chain.t +++ b/tests/proxy/workspace_modify_chain.t @@ -249,7 +249,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_modify_chain_prefix_subtree.t b/tests/proxy/workspace_modify_chain_prefix_subtree.t index d3fcb2e9..f18dbb83 100644 --- a/tests/proxy/workspace_modify_chain_prefix_subtree.t +++ b/tests/proxy/workspace_modify_chain_prefix_subtree.t @@ -304,7 +304,7 @@ Note that ws/d/ is now present in the ws ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_pre_history.t b/tests/proxy/workspace_pre_history.t index 6cd1dba0..60428e3b 100644 --- a/tests/proxy/workspace_pre_history.t +++ b/tests/proxy/workspace_pre_history.t @@ -88,7 +88,7 @@ file was created ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_publish.t b/tests/proxy/workspace_publish.t index c4091f86..c4431d5e 100644 --- a/tests/proxy/workspace_publish.t +++ b/tests/proxy/workspace_publish.t @@ -125,7 +125,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_tags.t b/tests/proxy/workspace_tags.t index f271f2c7..9045c60e 100644 --- a/tests/proxy/workspace_tags.t +++ b/tests/proxy/workspace_tags.t @@ -231,7 +231,7 @@ ] . |-- josh - | `-- 15 + | `-- 16 | `-- sled | |-- blobs | |-- conf