From daf9b4cebca2aa18ec124a3c837f612c2c29d495 Mon Sep 17 00:00:00 2001 From: Christian Schilling Date: Thu, 8 Aug 2024 10:50:58 +0200 Subject: [PATCH] Introduce `:committer` filter (#1352) Previously `:author` would rewrite both the author and commiter fields. Now there are seperate filters for that. Change: committer-filter --- josh-core/src/cache.rs | 2 +- josh-core/src/filter/mod.rs | 15 +++ josh-core/src/filter/parse.rs | 1 + tests/filter/squash.t | 92 ++++++++++++++----- tests/filter/squash_empty_initial.t | 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_subtree.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_gerrit.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 +- .../proxy/workspace_invalid_trailing_slash.t | 2 +- tests/proxy/workspace_modify.t | 2 +- tests/proxy/workspace_modify_chain.t | 2 +- .../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 +- 56 files changed, 137 insertions(+), 79 deletions(-) diff --git a/josh-core/src/cache.rs b/josh-core/src/cache.rs index abd93d27..10b27c29 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 = 21; +const CACHE_VERSION: u64 = 22; lazy_static! { static ref DB: std::sync::Mutex> = std::sync::Mutex::new(None); diff --git a/josh-core/src/filter/mod.rs b/josh-core/src/filter/mod.rs index 9c818bd8..c733415a 100644 --- a/josh-core/src/filter/mod.rs +++ b/josh-core/src/filter/mod.rs @@ -137,6 +137,7 @@ enum Op { // converting to Filter Squash(Option>), Author(String, String), + Committer(String, String), // We use BTreeMap rather than HashMap to guarantee deterministic results when // converting to Filter @@ -492,6 +493,13 @@ fn spec2(op: &Op) -> String { Op::Author(author, email) => { format!(":author={};{}", parse::quote(author), parse::quote(email)) } + Op::Committer(author, email) => { + format!( + ":committer={};{}", + parse::quote(author), + parse::quote(email) + ) + } Op::Message(m) => { format!(":{}", parse::quote(m)) } @@ -926,6 +934,12 @@ fn apply_to_commit2( Op::Author(author, email) => RewriteData { tree: commit.tree()?, author: Some((author.clone(), email.clone())), + committer: None, + message: None, + }, + Op::Committer(author, email) => RewriteData { + tree: commit.tree()?, + author: None, committer: Some((author.clone(), email.clone())), message: None, }, @@ -989,6 +1003,7 @@ fn apply2<'a>( Op::Squash(None) => Ok(tree), Op::Message(_) => Ok(tree), Op::Author(_, _) => Ok(tree), + Op::Committer(_, _) => Ok(tree), Op::Squash(Some(_)) => Err(josh_error("not applicable to tree")), Op::Linear => Ok(tree), Op::Unsign => Ok(tree), diff --git a/josh-core/src/filter/parse.rs b/josh-core/src/filter/parse.rs index ac38b3bc..5aef94b8 100644 --- a/josh-core/src/filter/parse.rs +++ b/josh-core/src/filter/parse.rs @@ -8,6 +8,7 @@ fn make_op(args: &[&str]) -> JoshResult { ["empty"] => Ok(Op::Empty), ["prefix", arg] => Ok(Op::Prefix(Path::new(arg).to_owned())), ["author", author, email] => Ok(Op::Author(author.to_string(), email.to_string())), + ["committer", author, email] => Ok(Op::Committer(author.to_string(), email.to_string())), ["workspace", arg] => Ok(Op::Workspace(Path::new(arg).to_owned())), ["prefix"] => Err(josh_error(indoc!( r#" diff --git a/tests/filter/squash.t b/tests/filter/squash.t index abcf8db7..2760b0f8 100644 --- a/tests/filter/squash.t +++ b/tests/filter/squash.t @@ -47,7 +47,7 @@ This one tag is an annotated tag, to make sure those are handled as well ) $ git log --graph --decorate --pretty=oneline refs/heads/filtered - * d8aa5a9937f4f0bd645dbc0b591bae5cd6b6d91b (tag: filtered/tag_a, filtered) refs/tags/tag_a + * 977cc3ee14c0d6163ba63bd96f4aeedd43916ba7 (tag: filtered/tag_a, filtered) refs/tags/tag_a $ git tag tag_b 0b4cf6c @@ -70,41 +70,69 @@ This one tag is an annotated tag, to make sure those are handled as well [3] :squash( 0b4cf6c9efbbda1eada39fa9c1d21d2525b027bb:"refs/tags/tag_b" 1d69b7d2651f744be3416f2ad526aeccefb99310:"refs/tags/tag_a" - d8aa5a9937f4f0bd645dbc0b591bae5cd6b6d91b:"refs/tags/filtered/tag_a" + 977cc3ee14c0d6163ba63bd96f4aeedd43916ba7:"refs/tags/filtered/tag_a" ) [4] :author="New Author";"new@e.mail" $ git log --graph --decorate --pretty=oneline refs/heads/filtered - * 5b1a753860ca124024f6dfb4fd018fe7df8beae4 (tag: filtered/tag_a, filtered) refs/tags/tag_a + * be41caf35896090033cfd103e06aae721a3ce541 (tag: filtered/tag_a, filtered) refs/tags/tag_a |\ - * 96a731a4d64a8928e6af7abb2d425df3812b4197 (tag: filtered/tag_b) refs/tags/tag_b + * 64f712c4615dbf5e9e0a1c4cdf65b2da2138f4be (tag: filtered/tag_b) refs/tags/tag_b - $ git log --graph --pretty=%an:%ae refs/heads/master - * Josh:josh@example.com + $ git log --graph --pretty=%an:%ae-%cn:%ce refs/heads/master + * Josh:josh@example.com-Josh:josh@example.com |\ - | * Josh:josh@example.com - | * Josh:josh@example.com - * | Josh:josh@example.com + | * Josh:josh@example.com-Josh:josh@example.com + | * Josh:josh@example.com-Josh:josh@example.com + * | Josh:josh@example.com-Josh:josh@example.com |/ - * Josh:josh@example.com - $ git log --graph --pretty=%an:%ae refs/heads/filtered - * New Author:new@e.mail + * Josh:josh@example.com-Josh:josh@example.com + $ git log --graph --pretty=%an:%ae-%cn:%ce refs/heads/filtered + * New Author:new@e.mail-Josh:josh@example.com |\ - * New Author:new@e.mail + * New Author:new@e.mail-Josh:josh@example.com + + $ josh-filter -s --squash-pattern "refs/tags/*" :committer=\"New\ Author\"\;\"new@e.mail\" --update refs/heads/filtered + [1] :"refs/tags/filtered/filtered/tag_a" + [1] :"refs/tags/filtered/tag_a" + [1] :"refs/tags/filtered/tag_b" + [1] :"refs/tags/tag_a" + [1] :"refs/tags/tag_b" + [1] :squash( + 1d69b7d2651f744be3416f2ad526aeccefb99310:"refs/tags/tag_a" + ) + [3] :squash( + 0b4cf6c9efbbda1eada39fa9c1d21d2525b027bb:"refs/tags/tag_b" + 1d69b7d2651f744be3416f2ad526aeccefb99310:"refs/tags/tag_a" + 977cc3ee14c0d6163ba63bd96f4aeedd43916ba7:"refs/tags/filtered/tag_a" + ) + [4] :author="New Author";"new@e.mail" + [5] :committer="New Author";"new@e.mail" + [5] :squash( + 0b4cf6c9efbbda1eada39fa9c1d21d2525b027bb:"refs/tags/tag_b" + 1d69b7d2651f744be3416f2ad526aeccefb99310:"refs/tags/tag_a" + 64f712c4615dbf5e9e0a1c4cdf65b2da2138f4be:"refs/tags/filtered/tag_b" + a68763bdf2f45a44304067954855749e366a5533:"refs/tags/filtered/filtered/tag_a" + be41caf35896090033cfd103e06aae721a3ce541:"refs/tags/filtered/tag_a" + ) + $ git log --graph --pretty=%an:%ae-%cn:%ce refs/heads/filtered + * Josh:josh@example.com-New Author:new@e.mail + |\ + * Josh:josh@example.com-New Author:new@e.mail $ git tag tag_c 975d4c4 $ git show-ref | grep refs/heads > squashlist $ cat squashlist 86871b8775ad3baca86484337d1072aa1d386f7e refs/heads/branch2 - 5b1a753860ca124024f6dfb4fd018fe7df8beae4 refs/heads/filtered + 97c6007771c497c9530d61aa89af663daebb1625 refs/heads/filtered 1d69b7d2651f744be3416f2ad526aeccefb99310 refs/heads/master $ josh-filter -s --squash-file squashlist :author=\"John\ Doe\"\;\"new@e.mail\" --update refs/heads/filtered -p > filter.josh $ cat filter.josh :squash( 1d69b7d2651f744be3416f2ad526aeccefb99310:"refs/heads/master" - 5b1a753860ca124024f6dfb4fd018fe7df8beae4:"refs/heads/filtered" 86871b8775ad3baca86484337d1072aa1d386f7e:"refs/heads/branch2" + 97c6007771c497c9530d61aa89af663daebb1625:"refs/heads/filtered" ):author="John Doe";"new@e.mail" $ josh-filter -s --squash-pattern "refs/tags/*" :author=\"New\ Author\"\;\"new@e.mail\" --update refs/heads/filtered -p > filter.josh @@ -112,13 +140,17 @@ This one tag is an annotated tag, to make sure those are handled as well :squash( 0b4cf6c9efbbda1eada39fa9c1d21d2525b027bb:"refs/tags/tag_b" 1d69b7d2651f744be3416f2ad526aeccefb99310:"refs/tags/tag_a" - 5b1a753860ca124024f6dfb4fd018fe7df8beae4:"refs/tags/filtered/tag_a" - 68dc45079334d83e5b61d2ceeda035b96da4c838:"refs/tags/filtered/filtered/tag_a" - 96a731a4d64a8928e6af7abb2d425df3812b4197:"refs/tags/filtered/tag_b" + 1dd879133bc80f7d180bd98268412f8ee61226f2:"refs/tags/filtered/tag_b" 975d4c4975912729482cc864d321c5196a969271:"refs/tags/tag_c" + 97c6007771c497c9530d61aa89af663daebb1625:"refs/tags/filtered/tag_a" + a91f2e4061d13b9adcb6d8ca63e17c8bbc5bed55:"refs/tags/filtered/filtered/tag_a" + b7e3b7815c4d7c8738545526b20308b1240137c7:"refs/tags/filtered/filtered/filtered/tag_a" + c4215db39f3cd96f07fe4c1f701dad39d5f5dec3:"refs/tags/filtered/filtered/tag_b" ):author="New Author";"new@e.mail" $ josh-filter -s --file filter.josh --update refs/heads/filtered + [1] :"refs/tags/filtered/filtered/tag_a" [1] :"refs/tags/filtered/tag_a" + [1] :"refs/tags/filtered/tag_b" [1] :"refs/tags/tag_a" [1] :"refs/tags/tag_b" [1] :"refs/tags/tag_c" @@ -128,22 +160,32 @@ This one tag is an annotated tag, to make sure those are handled as well [3] :squash( 0b4cf6c9efbbda1eada39fa9c1d21d2525b027bb:"refs/tags/tag_b" 1d69b7d2651f744be3416f2ad526aeccefb99310:"refs/tags/tag_a" - 5b1a753860ca124024f6dfb4fd018fe7df8beae4:"refs/tags/filtered/tag_a" - 68dc45079334d83e5b61d2ceeda035b96da4c838:"refs/tags/filtered/filtered/tag_a" - 96a731a4d64a8928e6af7abb2d425df3812b4197:"refs/tags/filtered/tag_b" + 1dd879133bc80f7d180bd98268412f8ee61226f2:"refs/tags/filtered/tag_b" 975d4c4975912729482cc864d321c5196a969271:"refs/tags/tag_c" + 97c6007771c497c9530d61aa89af663daebb1625:"refs/tags/filtered/tag_a" + a91f2e4061d13b9adcb6d8ca63e17c8bbc5bed55:"refs/tags/filtered/filtered/tag_a" + b7e3b7815c4d7c8738545526b20308b1240137c7:"refs/tags/filtered/filtered/filtered/tag_a" + c4215db39f3cd96f07fe4c1f701dad39d5f5dec3:"refs/tags/filtered/filtered/tag_b" ) [3] :squash( 0b4cf6c9efbbda1eada39fa9c1d21d2525b027bb:"refs/tags/tag_b" 1d69b7d2651f744be3416f2ad526aeccefb99310:"refs/tags/tag_a" - d8aa5a9937f4f0bd645dbc0b591bae5cd6b6d91b:"refs/tags/filtered/tag_a" + 977cc3ee14c0d6163ba63bd96f4aeedd43916ba7:"refs/tags/filtered/tag_a" + ) + [5] :committer="New Author";"new@e.mail" + [5] :squash( + 0b4cf6c9efbbda1eada39fa9c1d21d2525b027bb:"refs/tags/tag_b" + 1d69b7d2651f744be3416f2ad526aeccefb99310:"refs/tags/tag_a" + 64f712c4615dbf5e9e0a1c4cdf65b2da2138f4be:"refs/tags/filtered/tag_b" + a68763bdf2f45a44304067954855749e366a5533:"refs/tags/filtered/filtered/tag_a" + be41caf35896090033cfd103e06aae721a3ce541:"refs/tags/filtered/tag_a" ) [6] :author="New Author";"new@e.mail" $ git log --graph --decorate --pretty=oneline refs/heads/filtered - * 9fe45cb2bead844630852ab338ecd8e073f8ba50 (filtered) refs/tags/tag_a + * 2826b9a173c7a7d5c83d9ae2614de89c77205d83 (filtered) refs/tags/tag_a |\ - | * d6b88d4c1cc566b7f4d9b51353ec6f3204a93b81 refs/tags/tag_c + | * 63f8653625759f860ee31cce2d4e207974da1c37 refs/tags/tag_c |/ - * 96a731a4d64a8928e6af7abb2d425df3812b4197 (tag: filtered/tag_b) refs/tags/tag_b + * 64f712c4615dbf5e9e0a1c4cdf65b2da2138f4be refs/tags/tag_b diff --git a/tests/filter/squash_empty_initial.t b/tests/filter/squash_empty_initial.t index 248cbf10..b597b7f0 100644 --- a/tests/filter/squash_empty_initial.t +++ b/tests/filter/squash_empty_initial.t @@ -52,4 +52,4 @@ ) $ git log --graph --decorate --pretty=oneline refs/heads/filtered - * d8aa5a9937f4f0bd645dbc0b591bae5cd6b6d91b (tag: filtered/tag_a, filtered) refs/tags/tag_a + * 977cc3ee14c0d6163ba63bd96f4aeedd43916ba7 (tag: filtered/tag_a, filtered) refs/tags/tag_a diff --git a/tests/proxy/amend_patchset.t b/tests/proxy/amend_patchset.t index f6fb0ebc..34f652f2 100644 --- a/tests/proxy/amend_patchset.t +++ b/tests/proxy/amend_patchset.t @@ -124,7 +124,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/authentication.t b/tests/proxy/authentication.t index 16cf999e..dc07a771 100644 --- a/tests/proxy/authentication.t +++ b/tests/proxy/authentication.t @@ -124,7 +124,7 @@ "real_repo.git" = ["::sub1/"] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/caching.t b/tests/proxy/caching.t index a6e7ab64..667cc0b8 100644 --- a/tests/proxy/caching.t +++ b/tests/proxy/caching.t @@ -51,7 +51,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf @@ -162,7 +162,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_absent_head.t b/tests/proxy/clone_absent_head.t index 767abf14..ae870dc4 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_all.t b/tests/proxy/clone_all.t index bdcaf2a7..1bdbaa61 100644 --- a/tests/proxy/clone_all.t +++ b/tests/proxy/clone_all.t @@ -53,7 +53,7 @@ "real_repo.git" = ["::sub1/"] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_blocked.t b/tests/proxy/clone_blocked.t index fc63763a..cdd673d6 100644 --- a/tests/proxy/clone_blocked.t +++ b/tests/proxy/clone_blocked.t @@ -9,7 +9,7 @@ $ bash ${TESTDIR}/destroy_test_env.sh . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_invalid_url.t b/tests/proxy/clone_invalid_url.t index 9cba1572..aed543f6 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_locked_refs.t b/tests/proxy/clone_locked_refs.t index 1a07558b..b2ebb2d1 100644 --- a/tests/proxy/clone_locked_refs.t +++ b/tests/proxy/clone_locked_refs.t @@ -111,7 +111,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_prefix.t b/tests/proxy/clone_prefix.t index db875c5c..6c1d73d0 100644 --- a/tests/proxy/clone_prefix.t +++ b/tests/proxy/clone_prefix.t @@ -74,7 +74,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_sha.t b/tests/proxy/clone_sha.t index c637c804..55a9cd50 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_subsubtree.t b/tests/proxy/clone_subsubtree.t index aac352df..7267167d 100644 --- a/tests/proxy/clone_subsubtree.t +++ b/tests/proxy/clone_subsubtree.t @@ -87,7 +87,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_subtree.t b/tests/proxy/clone_subtree.t index 88a33b8d..1a44d7e0 100644 --- a/tests/proxy/clone_subtree.t +++ b/tests/proxy/clone_subtree.t @@ -85,7 +85,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_subtree_no_master.t b/tests/proxy/clone_subtree_no_master.t index cd631560..4f2aecab 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_subtree_tags.t b/tests/proxy/clone_subtree_tags.t index 7236d66a..6b6ada56 100644 --- a/tests/proxy/clone_subtree_tags.t +++ b/tests/proxy/clone_subtree_tags.t @@ -115,7 +115,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/clone_with_meta.t b/tests/proxy/clone_with_meta.t index c1c9a30d..9840c140 100644 --- a/tests/proxy/clone_with_meta.t +++ b/tests/proxy/clone_with_meta.t @@ -129,7 +129,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/empty_commit.t b/tests/proxy/empty_commit.t index 6f80a2bc..7b69fbe8 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/get_version.t b/tests/proxy/get_version.t index 7c28d336..c7847b5e 100644 --- a/tests/proxy/get_version.t +++ b/tests/proxy/get_version.t @@ -7,7 +7,7 @@ $ bash ${TESTDIR}/destroy_test_env.sh . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/import_export.t b/tests/proxy/import_export.t index 734c0e7d..3282bedf 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/join_subtree.t b/tests/proxy/join_subtree.t index 86a9dca9..5c973f65 100644 --- a/tests/proxy/join_subtree.t +++ b/tests/proxy/join_subtree.t @@ -132,7 +132,7 @@ Make sure all temporary namespace got removed ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/join_with_merge.t b/tests/proxy/join_with_merge.t index 8427e6f3..91af27b0 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/markers.t b/tests/proxy/markers.t index f7dc351f..bdf0e8c7 100644 --- a/tests/proxy/markers.t +++ b/tests/proxy/markers.t @@ -340,7 +340,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/no_proxy.t b/tests/proxy/no_proxy.t index 4937ba87..881552ec 100644 --- a/tests/proxy/no_proxy.t +++ b/tests/proxy/no_proxy.t @@ -35,7 +35,7 @@ $ bash ${TESTDIR}/destroy_test_env.sh . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/no_proxy_lfs.t b/tests/proxy/no_proxy_lfs.t index 7b1364b7..23ea90fa 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_graphql.t b/tests/proxy/push_graphql.t index 79c10868..d51ac679 100644 --- a/tests/proxy/push_graphql.t +++ b/tests/proxy/push_graphql.t @@ -69,7 +69,7 @@ "real_repo.git" = ["::sub1/"] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_new_branch.t b/tests/proxy/push_new_branch.t index d81461b0..7b690737 100644 --- a/tests/proxy/push_new_branch.t +++ b/tests/proxy/push_new_branch.t @@ -114,7 +114,7 @@ Check the branch again ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_prefix.t b/tests/proxy/push_prefix.t index 46e00d54..511030bd 100644 --- a/tests/proxy/push_prefix.t +++ b/tests/proxy/push_prefix.t @@ -56,7 +56,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_review.t b/tests/proxy/push_review.t index 411a86df..9804d7c6 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_review_already_in.t b/tests/proxy/push_review_already_in.t index 7244963c..0938c9a8 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_review_nop_behind.t b/tests/proxy/push_review_nop_behind.t index 80030288..2bec8616 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_review_old.t b/tests/proxy/push_review_old.t index f0e48a23..288acf3d 100644 --- a/tests/proxy/push_review_old.t +++ b/tests/proxy/push_review_old.t @@ -85,7 +85,7 @@ Flushed credential cache ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_review_topic.t b/tests/proxy/push_review_topic.t index 064ddbb9..35c4b058 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_stacked.t b/tests/proxy/push_stacked.t index 3a7a792f..4e3a624e 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_stacked_gerrit.t b/tests/proxy/push_stacked_gerrit.t index 8b9a3b2c..d8433568 100644 --- a/tests/proxy/push_stacked_gerrit.t +++ b/tests/proxy/push_stacked_gerrit.t @@ -134,7 +134,7 @@ Make sure all temporary namespace got removed "real_repo.git" = ["::sub1/"] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_stacked_split.t b/tests/proxy/push_stacked_split.t index b7119d8a..2d1cba25 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_stacked_sub.t b/tests/proxy/push_stacked_sub.t index 7fb9b6e7..71e8df05 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_subdir_prefix.t b/tests/proxy/push_subdir_prefix.t index fad2dcc8..7ce961ee 100644 --- a/tests/proxy/push_subdir_prefix.t +++ b/tests/proxy/push_subdir_prefix.t @@ -48,7 +48,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_subtree.t b/tests/proxy/push_subtree.t index 4c6c4726..ecd90282 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/push_subtree_two_repos.t b/tests/proxy/push_subtree_two_repos.t index 8251a96a..74ee8dd9 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/unrelated_leak.t b/tests/proxy/unrelated_leak.t index 4b10bdfe..d35466c5 100644 --- a/tests/proxy/unrelated_leak.t +++ b/tests/proxy/unrelated_leak.t @@ -133,7 +133,7 @@ Flushed credential cache ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace.t b/tests/proxy/workspace.t index 62988d55..767ab777 100644 --- a/tests/proxy/workspace.t +++ b/tests/proxy/workspace.t @@ -225,7 +225,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_create.t b/tests/proxy/workspace_create.t index 77f77f09..9f9ad79f 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_discover.t b/tests/proxy/workspace_discover.t index 5980a3c4..edbe4abb 100644 --- a/tests/proxy/workspace_discover.t +++ b/tests/proxy/workspace_discover.t @@ -102,7 +102,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_edit_commit.t b/tests/proxy/workspace_edit_commit.t index 58a2620e..f9d95196 100644 --- a/tests/proxy/workspace_edit_commit.t +++ b/tests/proxy/workspace_edit_commit.t @@ -181,7 +181,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_in_workspace.t b/tests/proxy/workspace_in_workspace.t index 47e47b6c..363961ab 100644 --- a/tests/proxy/workspace_in_workspace.t +++ b/tests/proxy/workspace_in_workspace.t @@ -245,7 +245,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_invalid_trailing_slash.t b/tests/proxy/workspace_invalid_trailing_slash.t index 1982ba0a..f5bc592f 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_modify.t b/tests/proxy/workspace_modify.t index 71757985..46801415 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_modify_chain.t b/tests/proxy/workspace_modify_chain.t index 09963cb0..ef442942 100644 --- a/tests/proxy/workspace_modify_chain.t +++ b/tests/proxy/workspace_modify_chain.t @@ -249,7 +249,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_modify_chain_prefix_subtree.t b/tests/proxy/workspace_modify_chain_prefix_subtree.t index 6c1e1aa3..dc67b521 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 - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_pre_history.t b/tests/proxy/workspace_pre_history.t index 18fc7cb3..cbb59090 100644 --- a/tests/proxy/workspace_pre_history.t +++ b/tests/proxy/workspace_pre_history.t @@ -88,7 +88,7 @@ file was created ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_publish.t b/tests/proxy/workspace_publish.t index fa853d04..c4064a33 100644 --- a/tests/proxy/workspace_publish.t +++ b/tests/proxy/workspace_publish.t @@ -125,7 +125,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf diff --git a/tests/proxy/workspace_tags.t b/tests/proxy/workspace_tags.t index 4686edc9..2e66167f 100644 --- a/tests/proxy/workspace_tags.t +++ b/tests/proxy/workspace_tags.t @@ -231,7 +231,7 @@ ] . |-- josh - | `-- 21 + | `-- 22 | `-- sled | |-- blobs | |-- conf