Support cross workspace amend

Change: ws-amend
josh-project · Jul 31, 2024 · bbd14b6 · bbd14b6
1 parent 2dde605
commit bbd14b6
Show file tree

Hide file tree

Showing 59 changed files with 344 additions and 69 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,7 +37,7 @@ tempfile = "3.10.1"
 
 [workspace.dependencies.git2]
 default-features = false
-version = "0.19"
+version = "0.18.3"
 
 [workspace.dependencies.juniper]
 version = "0.15.11"

diff --git a/docs/src/reference/cli.md b/docs/src/reference/cli.md
@@ -9,7 +9,7 @@ history, taking a filter specification as argument.
 
 It can be installed with the following Cargo command, assuming Rust is installed:
 ```shell
-cargo install josh-filter --git https://github.com/josh-project/josh.git
+cargo install josh --git https://github.com/josh-project/josh.git
 ```
 
 git-sync

diff --git 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 = 20;
+const CACHE_VERSION: u64 = 19;
 
 lazy_static! {
     static ref DB: std::sync::Mutex<Option<sled::Db>> = std::sync::Mutex::new(None);

diff --git a/josh-core/src/history.rs b/josh-core/src/history.rs
@@ -441,7 +441,22 @@ pub fn unapply_filter(
         let tree = module_commit.tree()?;
         let commit_message = module_commit.summary().unwrap_or("NO COMMIT MESSAGE");
 
-        let new_trees: JoshResult<Vec<_>> = {
+        let mut nt = None;
+        if let Some(change_ids) = change_ids {
+            for c in change_ids.iter() {
+                let cid = get_change_id(&module_commit, ret);
+
+                if c.id == cid.id {
+                    let x = transaction.repo().find_commit(c.commit)?;
+                    nt = Some(filter::unapply(transaction, filter, tree.clone(), x.tree()?)?.id());
+                    break;
+                }
+            }
+        }
+
+        let new_trees: JoshResult<Vec<_>> = if let Some(nt) = nt {
+            Ok(vec![nt])
+        } else {
             let span = tracing::span!(
                 tracing::Level::TRACE,
                 "unapply filter",

diff --git a/josh-core/src/lib.rs b/josh-core/src/lib.rs
@@ -38,7 +38,7 @@ pub struct Change {
 }
 
 impl Change {
-    fn new(commit: git2::Oid) -> Self {
+    pub fn new(commit: git2::Oid) -> Self {
         Self {
             author: Default::default(),
             id: Default::default(),

diff --git a/josh-proxy/src/bin/josh-proxy.rs b/josh-proxy/src/bin/josh-proxy.rs
@@ -1185,9 +1185,7 @@ async fn call_service(
         while path.contains("//") {
             path = path.replace("//", "/");
         }
-        percent_encoding::percent_decode_str(&path)
-            .decode_utf8_lossy()
-            .to_string()
+        path
     };
 
     if let Some(resource_path) = path.strip_prefix("/~/ui") {

diff --git a/josh-proxy/src/lib.rs b/josh-proxy/src/lib.rs
@@ -259,6 +259,14 @@ pub fn process_repo_update(repo_update: RepoUpdate) -> josh::JoshResult<String>
                 None
             };
 
+        if changes.is_some() && push_mode == PushMode::Review {
+            changes = Some(refs_to_changes(
+                &transaction_mirror,
+                &baseref.replacen("refs/heads/", "", 1),
+                &author,
+            ));
+        }
+
         let filter = josh::filter::parse(&repo_update.filter_spec)?;
         let new_oid = git2::Oid::from_str(new)?;
         let backward_new_oid = {
@@ -868,6 +876,38 @@ impl Drop for TmpGitNamespace {
     }
 }
 
+fn refs_to_changes(
+    transaction: &josh::cache::Transaction,
+    baseref: &str,
+    change_author: &str,
+) -> Vec<josh::Change> {
+    let mut changes = vec![];
+    let glob = transaction.refname(&format!(
+        "refs/heads/@changes/{}/{}/*",
+        baseref, change_author
+    ));
+
+    for r in transaction.repo().references_glob(&glob).unwrap() {
+        let r = r.unwrap();
+        let mut change = josh::Change::new(r.target().unwrap());
+        change.author = change_author.to_string();
+
+        let id = r.name().unwrap().replacen(
+            &transaction.refname(&format!(
+                "refs/heads/@changes/{}/{}/",
+                baseref, change_author
+            )),
+            "",
+            1,
+        );
+        change.id = Some(id);
+
+        changes.push(change);
+    }
+
+    return changes;
+}
+
 fn changes_to_refs(
     baseref: &str,
     change_author: &str,
@@ -887,12 +927,12 @@ fn changes_to_refs(
             if id.contains('@') {
                 return Err(josh::josh_error("Change id must not contain '@'"));
             }
-            if seen.contains(&id) {
-                return Err(josh::josh_error(&format!(
-                    "rejecting to push {:?} with duplicate label",
-                    change.commit
-                )));
-            }
+            //if seen.contains(&id) {
+            //    return Err(josh::josh_error(&format!(
+            //        "rejecting to push {:?} with duplicate label",
+            //        change.commit
+            //    )));
+            //}
             seen.push(id);
         } else {
             return Err(josh::josh_error(&format!(

diff --git a/tests/proxy/amend_patchset.t b/tests/proxy/amend_patchset.t
@@ -124,7 +124,7 @@
   ]
   .
   |-- josh
-  |   `-- 20
+  |   `-- 19
   |       `-- sled
   |           |-- blobs
   |           |-- conf

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

diff --git a/tests/proxy/caching.t b/tests/proxy/caching.t
@@ -51,7 +51,7 @@
   ]
   .
   |-- josh
-  |   `-- 20
+  |   `-- 19
   |       `-- sled
   |           |-- blobs
   |           |-- conf
@@ -162,7 +162,7 @@
   ]
   .
   |-- josh
-  |   `-- 20
+  |   `-- 19
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git 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
-  |   `-- 20
+  |   `-- 19
   |       `-- 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
-  |   `-- 20
+  |   `-- 19
   |       `-- 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
-  |   `-- 20
+  |   `-- 19
   |       `-- 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
-  |   `-- 20
+  |   `-- 19
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/clone_locked_refs.t b/tests/proxy/clone_locked_refs.t
@@ -111,7 +111,7 @@
   ]
   .
   |-- josh
-  |   `-- 20
+  |   `-- 19
   |       `-- sled
   |           |-- blobs
   |           |-- conf

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

diff --git 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
-  |   `-- 20
+  |   `-- 19
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/clone_subsubtree.t b/tests/proxy/clone_subsubtree.t
@@ -87,7 +87,7 @@
   ]
   .
   |-- josh
-  |   `-- 20
+  |   `-- 19
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/clone_subtree.t b/tests/proxy/clone_subtree.t
@@ -85,7 +85,7 @@
   ]
   .
   |-- josh
-  |   `-- 20
+  |   `-- 19
   |       `-- 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
-  |   `-- 20
+  |   `-- 19
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/clone_subtree_tags.t b/tests/proxy/clone_subtree_tags.t
@@ -115,7 +115,7 @@
   ]
   .
   |-- josh
-  |   `-- 20
+  |   `-- 19
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/clone_with_meta.t b/tests/proxy/clone_with_meta.t
@@ -129,7 +129,7 @@
   ]
   .
   |-- josh
-  |   `-- 20
+  |   `-- 19
   |       `-- 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
-  |   `-- 20
+  |   `-- 19
   |       `-- 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
-  |   `-- 20
+  |   `-- 19
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/import_export.t b/tests/proxy/import_export.t
@@ -301,7 +301,7 @@ Flushed credential cache
   "repo2.git" = [":prefix=repo2"]
   .
   |-- josh
-  |   `-- 20
+  |   `-- 19
   |       `-- 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
-  |   `-- 20
+  |   `-- 19
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git a/tests/proxy/markers.t b/tests/proxy/markers.t
@@ -340,7 +340,7 @@
   ]
   .
   |-- josh
-  |   `-- 20
+  |   `-- 19
   |       `-- 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
-  |   `-- 20
+  |   `-- 19
   |       `-- sled
   |           |-- blobs
   |           |-- conf

diff --git 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
-  |   `-- 20
+  |   `-- 19
   |       `-- sled
   |           |-- blobs
   |           |-- conf