Extend auto discovered subdir filters to include prefix (#1072)

christian-schilling · web-flow · commit b53940cdb143 · 2022-12-16T16:13:42.000Z
This is a very common usage in workspace, so precompute it.

Change: precompute-prefix
diff --git a/src/housekeeping.rs b/src/housekeeping.rs
@@ -208,7 +208,7 @@ pub fn find_all_workspaces_and_subdirectories(
         if root.is_empty() {
             return 0;
         }
-        let v = format!(":/{}", root.trim_matches('/'));
+        let v = format!("::{}/", root.trim_matches('/'));
         if v.chars().filter(|x| *x == '/').count() < 3 {
             hs.insert(v);
         }
diff --git a/tests/proxy/amend_patchset.t b/tests/proxy/amend_patchset.t
@@ -118,7 +118,10 @@
   1 directory, 4 files
 
   $ bash ${TESTDIR}/destroy_test_env.sh
-  "real_repo.git" = [':/sub3']
+  "real_repo.git" = [
+      ':/sub3',
+      '::sub3/',
+  ]
   .
   |-- josh
   |   `-- 14
diff --git a/tests/proxy/authentication.t b/tests/proxy/authentication.t
@@ -121,7 +121,7 @@
   * add file1
 
   $ bash ${TESTDIR}/destroy_test_env.sh
-  "real_repo.git" = [':/sub1']
+  "real_repo.git" = ['::sub1/']
   .
   |-- josh
   |   `-- 14
diff --git a/tests/proxy/caching.t b/tests/proxy/caching.t
@@ -45,7 +45,10 @@
   fetch_cached_ok true
 
   $ bash ${TESTDIR}/destroy_test_env.sh
-  "real_repo.git" = [':/sub1']
+  "real_repo.git" = [
+      ':/sub1',
+      '::sub1/',
+  ]
   .
   |-- josh
   |   `-- 14
@@ -153,7 +156,10 @@
   $ grep -o "fetch_cached_ok true" ${TESTTMP}/josh-proxy.out | uniq
 
   $ bash ${TESTDIR}/destroy_test_env.sh
-  "real_repo.git" = [':/sub1']
+  "real_repo.git" = [
+      ':/sub1',
+      '::sub1/',
+  ]
   .
   |-- josh
   |   `-- 14
diff --git a/tests/proxy/clone_all.t b/tests/proxy/clone_all.t
@@ -50,7 +50,7 @@
 
 
   $ bash ${TESTDIR}/destroy_test_env.sh
-  "real_repo.git" = [':/sub1']
+  "real_repo.git" = ['::sub1/']
   .
   |-- josh
   |   `-- 14
diff --git a/tests/proxy/clone_locked_refs.t b/tests/proxy/clone_locked_refs.t
@@ -99,14 +99,14 @@
 
   $ bash ${TESTDIR}/destroy_test_env.sh
   "meta_repo.git" = [
-      ':/locked.git',
-      ':/path',
-      ':/path/to',
+      '::locked.git/',
+      '::path/',
+      '::path/to/',
   ]
   "real_repo.git" = [
-      ':/sub1',
-      ':/sub2',
-      ':/sub3',
+      '::sub1/',
+      '::sub2/',
+      '::sub3/',
       ':prefix=my_prefix',
   ]
   .
diff --git a/tests/proxy/clone_prefix.t b/tests/proxy/clone_prefix.t
@@ -68,8 +68,8 @@
 
   $ bash ${TESTDIR}/destroy_test_env.sh
   "real_repo.git" = [
-      ':/sub1',
-      ':/sub2',
+      '::sub1/',
+      '::sub2/',
       ':prefix=pre',
   ]
   .
diff --git a/tests/proxy/clone_sha.t b/tests/proxy/clone_sha.t
@@ -75,7 +75,7 @@
 
 
   $ bash ${TESTDIR}/destroy_test_env.sh
-  "real_repo.git" = [':/sub1']
+  "real_repo.git" = ['::sub1/']
   .
   |-- josh
   |   `-- 14
diff --git a/tests/proxy/clone_subsubtree.t b/tests/proxy/clone_subsubtree.t
@@ -81,7 +81,9 @@
   "real_repo.git" = [
       ':/sub1',
       ':/sub1/subsub',
-      ':/sub2',
+      '::sub1/',
+      '::sub1/subsub/',
+      '::sub2/',
   ]
   .
   |-- josh
diff --git a/tests/proxy/clone_subtree.t b/tests/proxy/clone_subtree.t
@@ -80,7 +80,8 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   "real_repo.git" = [
       ':/sub1',
-      ':/sub2',
+      '::sub1/',
+      '::sub2/',
   ]
   .
   |-- josh
diff --git a/tests/proxy/clone_subtree_tags.t b/tests/proxy/clone_subtree_tags.t
@@ -110,7 +110,8 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   "real_repo.git" = [
       ':/sub1',
-      ':/sub2',
+      '::sub1/',
+      '::sub2/',
   ]
   .
   |-- josh
diff --git a/tests/proxy/clone_with_meta.t b/tests/proxy/clone_with_meta.t
@@ -117,13 +117,13 @@
 
   $ bash ${TESTDIR}/destroy_test_env.sh
   "meta_repo.git" = [
-      ':/path',
-      ':/path/to',
-      ':/with_prefix.git',
+      '::path/',
+      '::path/to/',
+      '::with_prefix.git/',
   ]
   "real_repo.git" = [
-      ':/sub1',
-      ':/sub2',
+      '::sub1/',
+      '::sub2/',
       ':prefix=my_prefix',
       ':prefix=my_prefix:/my_prefix:/sub1',
   ]
diff --git a/tests/proxy/empty_commit.t b/tests/proxy/empty_commit.t
@@ -80,7 +80,7 @@ should still be included.
   contents1
 
   $ bash ${TESTDIR}/destroy_test_env.sh
-  "real_repo.git" = [':/sub1']
+  "real_repo.git" = ['::sub1/']
   .
   |-- josh
   |   `-- 14
diff --git a/tests/proxy/import_export.t b/tests/proxy/import_export.t
@@ -294,7 +294,8 @@ Flushed credential cache
   $ bash ${TESTDIR}/destroy_test_env.sh
   "real_repo.git" = [
       ':/repo1',
-      ':/repo2',
+      '::repo1/',
+      '::repo2/',
   ]
   "repo1.git" = [':prefix=repo1']
   "repo2.git" = [':prefix=repo2']
diff --git a/tests/proxy/markers.t b/tests/proxy/markers.t
@@ -322,9 +322,9 @@
 
   $ bash ${TESTDIR}/destroy_test_env.sh
   "real_repo.git" = [
-      ':/a',
-      ':/a/b',
-      ':/sub1',
+      '::a/',
+      '::a/b/',
+      '::sub1/',
   ]
   .
   |-- josh
diff --git a/tests/proxy/push_new_branch.t b/tests/proxy/push_new_branch.t
@@ -91,7 +91,10 @@ Check the branch again
   $ [ "${SHA1}" = "$(git log --max-count=1 --skip=1 --format='%H' origin/new-branch)" ] || echo "SHA1 differs after push!"
 
   $ bash ${TESTDIR}/destroy_test_env.sh
-  "real_repo.git" = [':/sub']
+  "real_repo.git" = [
+      ':/sub',
+      '::sub/',
+  ]
   .
   |-- josh
   |   `-- 14
diff --git a/tests/proxy/push_prefix.t b/tests/proxy/push_prefix.t
@@ -51,7 +51,7 @@
 
   $ bash ${TESTDIR}/destroy_test_env.sh
   "real_repo.git" = [
-      ':/sub1',
+      '::sub1/',
       ':prefix=pre',
   ]
   .
diff --git a/tests/proxy/push_review.t b/tests/proxy/push_review.t
@@ -81,7 +81,10 @@ Make sure all temporary namespace got removed
   [1]
 
   $ bash ${TESTDIR}/destroy_test_env.sh
-  "real_repo.git" = [':/sub1']
+  "real_repo.git" = [
+      ':/sub1',
+      '::sub1/',
+  ]
   .
   |-- josh
   |   `-- 14
diff --git a/tests/proxy/push_review_old.t b/tests/proxy/push_review_old.t
@@ -79,7 +79,10 @@ Flushed credential cache
   1 directory, 3 files
 
   $ bash ${TESTDIR}/destroy_test_env.sh
-  "real_repo.git" = [':/sub1']
+  "real_repo.git" = [
+      ':/sub1',
+      '::sub1/',
+  ]
   .
   |-- josh
   |   `-- 14
diff --git a/tests/proxy/push_review_topic.t b/tests/proxy/push_review_topic.t
@@ -36,7 +36,10 @@ Make sure all temporary namespace got removed
   [1]
 
   $ bash ${TESTDIR}/destroy_test_env.sh
-  "real_repo.git" = [':/sub1']
+  "real_repo.git" = [
+      ':/sub1',
+      '::sub1/',
+  ]
   .
   |-- josh
   |   `-- 14
diff --git a/tests/proxy/push_stacked.t b/tests/proxy/push_stacked.t
@@ -147,6 +147,7 @@ Make sure all temporary namespace got removed
       ':/sub1',
       '::file2',
       '::file7',
+      '::sub1/',
   ]
   .
   |-- josh
diff --git a/tests/proxy/push_stacked_split.t b/tests/proxy/push_stacked_split.t
@@ -73,7 +73,7 @@ Make sure all temporary namespace got removed
   [1]
 
   $ bash ${TESTDIR}/destroy_test_env.sh
-  "real_repo.git" = [':/sub1']
+  "real_repo.git" = ['::sub1/']
   .
   |-- josh
   |   `-- 14
diff --git a/tests/proxy/push_stacked_sub.t b/tests/proxy/push_stacked_sub.t
@@ -126,7 +126,10 @@ Make sure all temporary namespace got removed
   [1]
 
   $ bash ${TESTDIR}/destroy_test_env.sh
-  "real_repo.git" = [':/sub1']
+  "real_repo.git" = [
+      ':/sub1',
+      '::sub1/',
+  ]
   .
   |-- josh
   |   `-- 14
diff --git a/tests/proxy/push_subdir_prefix.t b/tests/proxy/push_subdir_prefix.t
@@ -43,8 +43,8 @@
 
   $ bash ${TESTDIR}/destroy_test_env.sh
   "real_repo.git" = [
-      ':/sub1',
       ':/sub1:prefix=pre',
+      '::sub1/',
   ]
   .
   |-- josh
diff --git a/tests/proxy/push_subtree.t b/tests/proxy/push_subtree.t
@@ -84,7 +84,10 @@ Make sure all temporary namespace got removed
   [1]
 
   $ bash ${TESTDIR}/destroy_test_env.sh
-  "real_repo.git" = [':/sub1']
+  "real_repo.git" = [
+      ':/sub1',
+      '::sub1/',
+  ]
   .
   |-- josh
   |   `-- 14
diff --git a/tests/proxy/push_subtree_two_repos.t b/tests/proxy/push_subtree_two_repos.t
@@ -108,8 +108,14 @@ Put a double slash in the URL to see that it also works
   contents2_repo2
 
   $ bash ${TESTDIR}/destroy_test_env.sh
-  "real/repo2.git" = [':/sub1']
-  "real_repo.git" = [':/sub1']
+  "real/repo2.git" = [
+      ':/sub1',
+      '::sub1/',
+  ]
+  "real_repo.git" = [
+      ':/sub1',
+      '::sub1/',
+  ]
   .
   |-- josh
   |   `-- 14
diff --git a/tests/proxy/unrelated_leak.t b/tests/proxy/unrelated_leak.t
@@ -128,7 +128,8 @@ Flushed credential cache
   $ . ${TESTDIR}/destroy_test_env.sh
   "real_repo.git" = [
       ':/sub1',
-      ':/sub2',
+      '::sub1/',
+      '::sub2/',
   ]
   .
   |-- josh
diff --git a/tests/proxy/workspace.t b/tests/proxy/workspace.t
@@ -216,11 +216,11 @@
 
   $ bash ${TESTDIR}/destroy_test_env.sh
   "real_repo.git" = [
-      ':/sub1',
-      ':/sub1/subsub',
-      ':/sub2',
-      ':/sub3',
-      ':/ws',
+      '::sub1/',
+      '::sub1/subsub/',
+      '::sub2/',
+      '::sub3/',
+      '::ws/',
       ':workspace=ws',
   ]
   .
diff --git a/tests/proxy/workspace_create.t b/tests/proxy/workspace_create.t
@@ -432,12 +432,12 @@ Note that ws/d/ is now present in the ws
 
   $ bash ${TESTDIR}/destroy_test_env.sh
   "real_repo.git" = [
-      ':/sub1',
-      ':/sub1/subsub',
-      ':/sub2',
-      ':/sub3',
-      ':/ws',
-      ':/ws/d',
+      '::sub1/',
+      '::sub1/subsub/',
+      '::sub2/',
+      '::sub3/',
+      '::ws/',
+      '::ws/d/',
       ':workspace=ws',
   ]
   .
diff --git a/tests/proxy/workspace_discover.t b/tests/proxy/workspace_discover.t
@@ -79,24 +79,24 @@
 
   $ curl -s http://localhost:8002/filters
   "real/repo2.git" = [
-      ':/sub1',
-      ':/sub1/subsub',
-      ':/sub2',
-      ':/sub3',
-      ':/ws',
-      ':/ws2',
+      '::sub1/',
+      '::sub1/subsub/',
+      '::sub2/',
+      '::sub3/',
+      '::ws/',
+      '::ws2/',
       ':workspace=ws',
       ':workspace=ws2',
   ]
 
   $ bash ${TESTDIR}/destroy_test_env.sh
   "real/repo2.git" = [
-      ':/sub1',
-      ':/sub1/subsub',
-      ':/sub2',
-      ':/sub3',
-      ':/ws',
-      ':/ws2',
+      '::sub1/',
+      '::sub1/subsub/',
+      '::sub2/',
+      '::sub3/',
+      '::ws/',
+      '::ws2/',
       ':workspace=ws',
       ':workspace=ws2',
   ]
diff --git a/tests/proxy/workspace_edit_commit.t b/tests/proxy/workspace_edit_commit.t
diff --git a/tests/proxy/workspace_in_workspace.t b/tests/proxy/workspace_in_workspace.t
diff --git a/tests/proxy/workspace_invalid_trailing_slash.t b/tests/proxy/workspace_invalid_trailing_slash.t
diff --git a/tests/proxy/workspace_modify.t b/tests/proxy/workspace_modify.t
diff --git a/tests/proxy/workspace_modify_chain.t b/tests/proxy/workspace_modify_chain.t
diff --git a/tests/proxy/workspace_modify_chain_prefix_subtree.t b/tests/proxy/workspace_modify_chain_prefix_subtree.t
diff --git a/tests/proxy/workspace_pre_history.t b/tests/proxy/workspace_pre_history.t
diff --git a/tests/proxy/workspace_publish.t b/tests/proxy/workspace_publish.t
diff --git a/tests/proxy/workspace_tags.t b/tests/proxy/workspace_tags.t

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ pub fn find_all_workspaces_and_subdirectories(`
`208`	`208`	`if root.is_empty() {`
`209`	`209`	`return 0;`
`210`	`210`	`}`
`211`		`- let v = format!(":/{}", root.trim_matches('/'));`
	`211`	`+ let v = format!("::{}/", root.trim_matches('/'));`
`212`	`212`	`if v.chars().filter(\|x\| *x == '/').count() < 3 {`
`213`	`213`	`hs.insert(v);`
`214`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@`
`121`	`121`	`* add file1`
`122`	`122`
`123`	`123`	`$ bash ${TESTDIR}/destroy_test_env.sh`
`124`		`- "real_repo.git" = [':/sub1']`
	`124`	`+ "real_repo.git" = ['::sub1/']`
`125`	`125`	`.`
`126`	`126`	`\|-- josh`
`127`	`127`	\| `-- 14
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`
`51`	`51`
`52`	`52`	`$ bash ${TESTDIR}/destroy_test_env.sh`
`53`		`- "real_repo.git" = [':/sub1']`
	`53`	`+ "real_repo.git" = ['::sub1/']`
`54`	`54`	`.`
`55`	`55`	`\|-- josh`
`56`	`56`	\| `-- 14
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,8 @@`
`68`	`68`
`69`	`69`	`$ bash ${TESTDIR}/destroy_test_env.sh`
`70`	`70`	`"real_repo.git" = [`
`71`		`- ':/sub1',`
`72`		`- ':/sub2',`
	`71`	`+ '::sub1/',`
	`72`	`+ '::sub2/',`
`73`	`73`	`':prefix=pre',`
`74`	`74`	`]`
`75`	`75`	`.`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@`
`75`	`75`
`76`	`76`
`77`	`77`	`$ bash ${TESTDIR}/destroy_test_env.sh`
`78`		`- "real_repo.git" = [':/sub1']`
	`78`	`+ "real_repo.git" = ['::sub1/']`
`79`	`79`	`.`
`80`	`80`	`\|-- josh`
`81`	`81`	\| `-- 14
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,9 @@`
`81`	`81`	`"real_repo.git" = [`
`82`	`82`	`':/sub1',`
`83`	`83`	`':/sub1/subsub',`
`84`		`- ':/sub2',`
	`84`	`+ '::sub1/',`
	`85`	`+ '::sub1/subsub/',`
	`86`	`+ '::sub2/',`
`85`	`87`	`]`
`86`	`88`	`.`
`87`	`89`	`\|-- josh`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,8 @@`
`80`	`80`	`$ bash ${TESTDIR}/destroy_test_env.sh`
`81`	`81`	`"real_repo.git" = [`
`82`	`82`	`':/sub1',`
`83`		`- ':/sub2',`
	`83`	`+ '::sub1/',`
	`84`	`+ '::sub2/',`
`84`	`85`	`]`
`85`	`86`	`.`
`86`	`87`	`\|-- josh`