Prevent re-mapping of workspace file

For workspace reversal to work, the mapped location of the workspace.josh file must always be the root of the workspace. Previously it was possible to change this by adding a mapping to the file itself, breaking push. Change-Id: no-workspace-remap
josh-project · Aug 25, 2022 · a287bc6 · a287bc6
1 parent e907cfd
commit a287bc6
Show file tree

Hide file tree

Showing 47 changed files with 197 additions and 95 deletions.
diff --git a/src/cache.rs b/src/cache.rs
@@ -1,7 +1,7 @@
 use super::*;
 use std::collections::HashMap;
 
-const CACHE_VERSION: u64 = 11;
+const CACHE_VERSION: u64 = 12;
 
 lazy_static! {
     static ref DB: std::sync::Mutex<Option<sled::Db>> = std::sync::Mutex::new(None);

diff --git a/src/filter/mod.rs b/src/filter/mod.rs
@@ -583,10 +583,12 @@ fn apply2<'a>(
         Op::Invert => tree::invert_paths(transaction, "", tree),
 
         Op::Workspace(path) => {
+            let wsj_file = to_filter(Op::File(Path::new("workspace.josh").to_owned()));
             let base = to_filter(Op::Subdir(path.to_owned()));
+            let wsj_file = chain(base, wsj_file);
             apply(
                 transaction,
-                compose(get_workspace(repo, &tree, path), base),
+                compose(wsj_file, compose(get_workspace(repo, &tree, path), base)),
                 tree,
             )
         }
@@ -661,8 +663,10 @@ fn unapply_workspace<'a>(
             let original_workspace = get_workspace(transaction.repo(), &parent_tree, path);
 
             let root = to_filter(Op::Subdir(path.to_owned()));
-            let filter = compose(workspace, root);
-            let original_filter = compose(original_workspace, root);
+            let wsj_file = to_filter(Op::File(Path::new("workspace.josh").to_owned()));
+            let wsj_file = chain(root, wsj_file);
+            let filter = compose(wsj_file, compose(workspace, root));
+            let original_filter = compose(wsj_file, compose(original_workspace, root));
             let matching = apply(
                 transaction,
                 chain(original_filter, invert(original_filter)?),

diff --git a/tests/filter/workspace_unique.t b/tests/filter/workspace_unique.t
@@ -16,10 +16,14 @@
   $ git commit -m "add file2" 1> /dev/null
 
   $ mkdir ws
+
+Note that we are trying to relocate the workspace.josh file, which is not possible
+so the workspace.josh will still appear in the root of the workspace
   $ cat > ws/workspace.josh <<EOF
   > :/sub1::file1
   > ::sub2/subsub/
   > a = :/sub1
+  > b = ::ws/workspace.josh
   > EOF
   $ git add ws
   $ git commit -m "add ws" 1> /dev/null
@@ -28,6 +32,7 @@
   [1] :/sub1
   [1] :/subsub
   [1] ::file1
+  [1] ::ws/workspace.josh
   [1] :[
       ::file1
       :prefix=a
@@ -42,6 +47,7 @@
           :prefix=a
       ]
       ::sub2/subsub/
+      b = ::ws/workspace.josh
   ]
   [2] :workspace=ws
 

diff --git a/tests/proxy/amend_patchset.t b/tests/proxy/amend_patchset.t
@@ -121,7 +121,7 @@
   "real_repo.git" = [':/sub3']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/authentication.t b/tests/proxy/authentication.t
@@ -124,7 +124,7 @@
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/caching.t b/tests/proxy/caching.t
@@ -48,7 +48,7 @@
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf
@@ -156,7 +156,7 @@
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/clone_absent_head.t b/tests/proxy/clone_absent_head.t
@@ -87,7 +87,7 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/clone_all.t b/tests/proxy/clone_all.t
@@ -53,7 +53,7 @@
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/clone_blocked.t b/tests/proxy/clone_blocked.t
@@ -9,7 +9,7 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git 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
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/clone_prefix.t b/tests/proxy/clone_prefix.t
@@ -74,7 +74,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/clone_sha.t b/tests/proxy/clone_sha.t
@@ -72,7 +72,7 @@
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/clone_subsubtree.t b/tests/proxy/clone_subsubtree.t
@@ -85,7 +85,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/clone_subtree.t b/tests/proxy/clone_subtree.t
@@ -84,7 +84,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git 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
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/clone_subtree_tags.t b/tests/proxy/clone_subtree_tags.t
@@ -114,7 +114,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git 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
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/get_version.t b/tests/proxy/get_version.t
@@ -7,7 +7,7 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/import_export.t b/tests/proxy/import_export.t
@@ -300,7 +300,7 @@ Flushed credential cache
   "repo2.git" = [':prefix=repo2']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/join_with_merge.t b/tests/proxy/join_with_merge.t
@@ -59,7 +59,7 @@
   "real_repo.git" = [':prefix=sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/markers.t b/tests/proxy/markers.t
@@ -328,7 +328,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/no_proxy.t b/tests/proxy/no_proxy.t
@@ -35,7 +35,7 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/push_new_branch.t b/tests/proxy/push_new_branch.t
@@ -94,7 +94,7 @@ Check the branch again
   "real_repo.git" = [':/sub']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/push_prefix.t b/tests/proxy/push_prefix.t
@@ -56,7 +56,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/push_review.t b/tests/proxy/push_review.t
@@ -84,7 +84,7 @@ Make sure all temporary namespace got removed
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git 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
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git 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
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/push_review_old.t b/tests/proxy/push_review_old.t
@@ -82,7 +82,7 @@ Flushed credential cache
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/push_review_topic.t b/tests/proxy/push_review_topic.t
@@ -39,7 +39,7 @@ Make sure all temporary namespace got removed
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/push_stacked.t b/tests/proxy/push_stacked.t
@@ -145,7 +145,7 @@ Make sure all temporary namespace got removed
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/push_stacked_sub.t b/tests/proxy/push_stacked_sub.t
@@ -129,7 +129,7 @@ Make sure all temporary namespace got removed
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/push_subdir_prefix.t b/tests/proxy/push_subdir_prefix.t
@@ -48,7 +48,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/push_subtree.t b/tests/proxy/push_subtree.t
@@ -87,7 +87,7 @@ Make sure all temporary namespace got removed
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/push_subtree_two_repos.t b/tests/proxy/push_subtree_two_repos.t
@@ -112,7 +112,7 @@ Put a double slash in the URL to see that it also works
   "real_repo.git" = [':/sub1']
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/unrelated_leak.t b/tests/proxy/unrelated_leak.t
@@ -132,7 +132,7 @@ Flushed credential cache
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/workspace.t b/tests/proxy/workspace.t
@@ -225,7 +225,7 @@
   ]
   .
   |-- josh
-  |   `-- 11
+  |   `-- 12
   |       `-- sled
   |           |-- blobs
   |           |-- conf