Bump CACHE_VERSION (#1307)

* Support "changes" branches with gerrit

Change: changes-gerrit

* Bump CACHE_VERSION to 18

Change: bump

Author: christian-schilling

josh-core/src/cache.rs

@@ -1,7 +1,7 @@
 use super::*;
 use std::collections::HashMap;
 
-const CACHE_VERSION: u64 = 17;
+const CACHE_VERSION: u64 = 18;
 
 lazy_static! {
     static ref DB: std::sync::Mutex<Option<sled::Db>> = std::sync::Mutex::new(None);

josh-core/src/lib.rs

@@ -49,15 +49,13 @@ pub mod shell;
 pub struct Change {
     pub author: String,
     pub id: Option<String>,
-    pub label: Option<String>,
     pub commit: git2::Oid,
 }
 
 impl Change {
     fn new(commit: git2::Oid) -> Self {
         Self {
             author: Default::default(),
-            label: Default::default(),
             id: Default::default(),
             commit,
         }
@@ -219,11 +217,13 @@ pub fn get_change_id(commit: &git2::Commit, sha: git2::Oid) -> Change {
     change.author = commit.author().email().unwrap_or("").to_string();
 
     for line in commit.message().unwrap_or("").split('\n') {
+        if line.starts_with("Change: ") {
+            change.id = Some(line.replacen("Change: ", "", 1));
+            // If there is a "Change-Id" as well, it will take precedence
+        }
         if line.starts_with("Change-Id: ") {
             change.id = Some(line.replacen("Change-Id: ", "", 1));
-        }
-        if line.starts_with("Change: ") {
-            change.label = Some(line.replacen("Change: ", "", 1));
+            break;
         }
     }
     change

josh-proxy/src/lib.rs

@@ -206,12 +206,19 @@ pub fn process_repo_update(repo_update: RepoUpdate) -> josh::JoshResult<String>
             None
         };
 
-        let mut changes = if push_mode == PushMode::Stack || push_mode == PushMode::Split {
-            Some(vec![])
+        let author = if let Some(p) = push_options.get("author") {
+            p.to_string()
         } else {
-            None
+            "".to_string()
         };
 
+        let mut changes =
+            if push_mode == PushMode::Stack || push_mode == PushMode::Split || author != "" {
+                Some(vec![])
+            } else {
+                None
+            };
+
         let filterobj = josh::filter::parse(&repo_update.filter_spec)?;
         let new_oid = git2::Oid::from_str(new)?;
         let backward_new_oid = {
@@ -265,12 +272,6 @@ pub fn process_repo_update(repo_update: RepoUpdate) -> josh::JoshResult<String>
             push_to
         };
 
-        let author = if let Some(p) = push_options.get("author") {
-            p.to_string()
-        } else {
-            "".to_string()
-        };
-
         let to_push = if let Some(changes) = changes {
             let mut v = vec![];
             v.append(&mut changes_to_refs(&baseref, &author, changes)?);
@@ -279,6 +280,10 @@ pub fn process_repo_update(repo_update: RepoUpdate) -> josh::JoshResult<String>
                 split_changes(transaction.repo(), &mut v, old)?;
             }
 
+            if push_mode == PushMode::Review {
+                v.push((ref_with_options, oid_to_push, "JOSH_PUSH".to_string()));
+            }
+
             v.push((
                 format!(
                     "refs/heads/@heads/{}/{}",
@@ -820,20 +825,20 @@ fn changes_to_refs(
     };
 
     for change in changes.iter() {
-        if let Some(label) = &change.label {
-            if label.contains('@') {
-                return Err(josh::josh_error("Change label must not contain '@'"));
+        if let Some(id) = &change.id {
+            if id.contains('@') {
+                return Err(josh::josh_error("Change id must not contain '@'"));
             }
-            if seen.contains(&label) {
+            if seen.contains(&id) {
                 return Err(josh::josh_error(&format!(
                     "rejecting to push {:?} with duplicate label",
                     change.commit
                 )));
             }
-            seen.push(label);
+            seen.push(id);
         } else {
             return Err(josh::josh_error(&format!(
-                "rejecting to push {:?} without label",
+                "rejecting to push {:?} without id",
                 change.commit
             )));
         }
@@ -847,11 +852,11 @@ fn changes_to_refs(
                     "refs/heads/@changes/{}/{}/{}",
                     baseref.replacen("refs/heads/", "", 1),
                     change.author,
-                    change.label.as_ref().unwrap_or(&"".to_string()),
+                    change.id.as_ref().unwrap_or(&"".to_string()),
                 ),
                 change.commit,
                 change
-                    .label
+                    .id
                     .as_ref()
                     .unwrap_or(&"JOSH_PUSH".to_string())
                     .to_string(),

tests/proxy/amend_patchset.t

@@ -124,7 +124,7 @@
   ]
   .
   |-- josh
-  |   `-- 17
+  |   `-- 18
   |       `-- sled
   |           |-- blobs
   |           |-- conf

tests/proxy/authentication.t

@@ -124,7 +124,7 @@
   "real_repo.git" = ["::sub1/"]
   .
   |-- josh
-  |   `-- 17
+  |   `-- 18
   |       `-- sled
   |           |-- blobs
   |           |-- conf

tests/proxy/caching.t

@@ -51,7 +51,7 @@
   ]
   .
   |-- josh
-  |   `-- 17
+  |   `-- 18
   |       `-- sled
   |           |-- blobs
   |           |-- conf
@@ -162,7 +162,7 @@
   ]
   .
   |-- josh
-  |   `-- 17
+  |   `-- 18
   |       `-- sled
   |           |-- blobs
   |           |-- conf

tests/proxy/clone_absent_head.t

@@ -85,7 +85,7 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   .
   |-- josh
-  |   `-- 17
+  |   `-- 18
   |       `-- sled
   |           |-- blobs
   |           |-- conf

tests/proxy/clone_all.t

@@ -53,7 +53,7 @@
   "real_repo.git" = ["::sub1/"]
   .
   |-- josh
-  |   `-- 17
+  |   `-- 18
   |       `-- sled
   |           |-- blobs
   |           |-- conf

tests/proxy/clone_blocked.t

@@ -9,7 +9,7 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   .
   |-- josh
-  |   `-- 17
+  |   `-- 18
   |       `-- sled
   |           |-- blobs
   |           |-- conf

tests/proxy/clone_invalid_url.t

@@ -32,7 +32,7 @@
   $ bash ${TESTDIR}/destroy_test_env.sh
   .
   |-- josh
-  |   `-- 17
+  |   `-- 18
   |       `-- sled
   |           |-- blobs
   |           |-- conf