Print result sha from josh-filter

Author: christian-schilling

josh-filter/src/bin/josh-filter.rs

@@ -443,7 +443,7 @@ fn run_filter(args: Vec<String>) -> josh_core::JoshResult<i32> {
                 println!("{}:{}: {}", r.0, l.0, l.1);
             }
         }
-        /* println!("\n Search took {:?}", duration); */
+        /* eprintln!("\n Search took {:?}", duration); */
     }
 
     if reverse {
@@ -463,9 +463,10 @@ fn run_filter(args: Vec<String>) -> josh_core::JoshResult<i32> {
         ) {
             Ok(rewritten) => {
                 repo.reference(&input_ref, rewritten, true, "unapply_filter")?;
+                println!("{}", rewritten);
             }
             Err(JoshError(msg)) => {
-                println!("{}", msg);
+                eprintln!("{}", msg);
                 return Ok(1);
             }
         }
@@ -476,12 +477,14 @@ fn run_filter(args: Vec<String>) -> josh_core::JoshResult<i32> {
         && updated_refs.len() == 1
         && updated_refs[0].1 == old_oid
     {
-        println!(
+        eprintln!(
             "Warning: reference {} wasn't updated",
             args.get_one::<String>("update").unwrap()
         );
     }
 
+    println!("{}", updated_refs[0].1);
+
     if let Some(gql_query) = args.get_one::<String>("graphql") {
         let context = josh_graphql::context(transaction.try_clone()?, transaction.try_clone()?);
         *context.allow_refs.lock()? = true;
@@ -526,7 +529,7 @@ fn main() {
     };
 
     std::process::exit(if let Err(e) = run_filter(args) {
-        println!(
+        eprintln!(
             "ERROR: {}",
             match e {
                 JoshError(s) => s,

tests/filter/ambiguous_merge.t

@@ -37,6 +37,7 @@
   * 4d74643 add sub2/file2
 
   $ josh-filter -s ::sub1/ branch1 --update refs/heads/hidden_branch1
+  81a8353fd06d2ff76184dc3e55de179590872799
   [2] :prefix=sub1
   [3] :/sub1
   [5] sequence_number
@@ -53,6 +54,7 @@
   Switched to branch 'master'
 
   $ josh-filter -s ::sub1/ master --update refs/heads/hidden_master
+  586737e31b886be151bc20c30f0a0305e3c6568d
   [3] :prefix=sub1
   [4] :/sub1
   [7] sequence_number
@@ -86,6 +88,8 @@
   * 7671c2a add sub1/file1
 
   $ josh-filter -s ::sub1/ --reverse master --update refs/heads/hidden_master
+  8cbae19889134bd4ec430c0b79c61ee8547e0d1c
+  586737e31b886be151bc20c30f0a0305e3c6568d
   [3] :prefix=sub1
   [4] :/sub1
   [7] sequence_number

tests/filter/cmdline.t

@@ -34,13 +34,15 @@
   $ git commit -m "initial" --allow-empty 1> /dev/null
 
   $ josh-filter -s c=:/sub1 --update refs/josh/filter/libs/master libs/master
+  21a904a6f350cb1f8ea4dc6fe9bd4e3b4cc4840b
   [2] :/sub1
   [2] :prefix=c
   [4] sequence_number
   $ git log --graph --pretty=%s josh/filter/libs/master
   * add file2
   * add file1
   $ josh-filter -s a/b=:/sub2 --update refs/josh/filter/libs/foo libs/foo
+  933f26e096e3452793bcbb82e8d927d7820340fb
   [1] :prefix=a
   [1] :prefix=b
   [2] :/sub1

tests/filter/commit_message_raw.t

@@ -11,6 +11,7 @@
   > ' -m "blabla" 1> /dev/null
 
   $ josh-filter -s c=:prefix=pre master --update refs/josh/filter/master
+  7b2759b3e39a73ae111b75014a49fa511d0be927
   [1] :prefix=c
   [1] :prefix=pre
   [2] sequence_number

tests/filter/compose_shadow_dir_same_name.t

@@ -52,6 +52,7 @@
 
 
   $ josh-filter ":[:/sub1,:/xx]"
+  11f4a718fc1c49fdda1b3ebce22efec68683edaf
   $ git diff ${EMPTY_TREE}..FILTERED_HEAD
   diff --git a/file1 b/file1
   new file mode 100644
@@ -69,6 +70,7 @@
   +contents1
 
   $ josh-filter ":[:/xx,:/sub1]"
+  11f4a718fc1c49fdda1b3ebce22efec68683edaf
   $ git diff ${EMPTY_TREE}..FILTERED_HEAD
   diff --git a/file1 b/file1
   new file mode 100644
@@ -86,6 +88,7 @@
   +contents1
 
   $ josh-filter -s ":[:/sub/xx::file3,:/sub1,:/xx,:/sub/xx]"
+  f9da6dcfc582a60447a9870b596eb9f28a7e03ec
   [3] :[
       :/sub/xx::file3
       :/sub1

tests/filter/concat.t

@@ -21,6 +21,7 @@
   $ git commit -m "add file3" 1> /dev/null
 
   $ josh-filter ":\"x\""
+  9d117d96dfdba145df43ebe37d9e526acac4b17c
 
   $ git log --graph --pretty=%s:%H HEAD
   * add file3:667a912db7482f3c8023082c9b4c7b267792633a
@@ -35,6 +36,7 @@
   $ josh-filter -p ":from(81b10fb4984d20142cd275b89c91c346e536876a:\"x\")"
   :"x":concat(81b10fb4984d20142cd275b89c91c346e536876a:"x")
   $ josh-filter ":from(81b10fb4984d20142cd275b89c91c346e536876a:\"x\")"
+  5ec25aa6f14a75374b1caab14bf9ee9818466d4f
 
   $ git log --graph --pretty=%s FILTERED_HEAD
   * x

tests/filter/deleted_dir.t

@@ -17,6 +17,7 @@ in that subtree repo should have an empty tree
   $ git commit -m "add file2" 1> /dev/null
 
   $ josh-filter -s c=:/sub1 master --update refs/josh/filter/master
+  21a904a6f350cb1f8ea4dc6fe9bd4e3b4cc4840b
   [2] :/sub1
   [2] :prefix=c
   [4] sequence_number
@@ -35,6 +36,7 @@ in that subtree repo should have an empty tree
   $ git commit -m "rm sub1" 1> /dev/null
 
   $ josh-filter -s c=:/sub1 master --update refs/josh/filter/master
+  1e8394fa1057f9c14155ea4f612320544ec3510d
   [3] :/sub1
   [3] :prefix=c
   [6] sequence_number

tests/filter/empty_head.t

@@ -19,13 +19,15 @@
   $ git commit -m "add file3" 1> /dev/null
 
   $ josh-filter -s :/sub1 master --update refs/josh/filter/master
+  d8388f5880393d255b371f1ed9b801d35620017e
   [2] :/sub1
   [3] sequence_number
   $ git log --graph --pretty=%s josh/filter/master
   * add file2
   * add file1
 
   $ josh-filter -s :/sub2 master --update refs/josh/filter/master
+  915f9d7068b11998493d4c9c373a32be4097daae
   [2] :/sub1
   [2] :/sub2
   [3] sequence_number
@@ -38,6 +40,7 @@
 
   $ josh-filter -s :/sub2 master --update refs/josh/filter/master
   Warning: reference refs/josh/filter/master wasn't updated
+  915f9d7068b11998493d4c9c373a32be4097daae
   [2] :/sub1
   [2] :/sub2
   [4] sequence_number

tests/filter/empty_orphan.t

@@ -20,6 +20,7 @@ Empty root commits from unrelated parts of the tree should not be included
   $ git commit -m "add file3" 1> /dev/null
 
   $ josh-filter -s c=:/sub1 master --update refs/josh/filter/master
+  540f1cbf31dcaef743774db17c00cd20b814db62
   [3] :/sub1
   [3] :prefix=c
   [6] sequence_number
@@ -82,6 +83,7 @@ Empty root commits from unrelated parts of the tree should not be included
 
 
   $ josh-filter -s c=:/sub1 master
+  540f1cbf31dcaef743774db17c00cd20b814db62
   [3] :prefix=c
   [5] :/sub1
   [10] sequence_number
@@ -97,6 +99,7 @@ Empty root commits from unrelated parts of the tree should not be included
   c/file3
 
   $ josh-filter -s c=:exclude[::sub1/] master
+  bb6f1f462c619bf0527e82f634cae2c61cfe3446
   [5] :/sub1
   [5] :exclude[::sub1/]
   [6] :prefix=c
@@ -112,6 +115,7 @@ Empty root commits from unrelated parts of the tree should not be included
   c/some_other_file
 
   $ josh-filter -s :prefix=x FILTERED_HEAD
+  0392736892dab8a99e29255e644af19dfbb7d937
   [3] :prefix=x
   [5] :/sub1
   [5] :exclude[::sub1/]

tests/filter/empty_reimport.t

@@ -38,6 +38,7 @@
 
 
   $ josh-filter -s c=:/pre master --update refs/josh/filter/master
+  6390b3f0709aa571f835041bdab24919f119505a
   [2] :prefix=c
   [4] :/pre
   [7] sequence_number
@@ -81,6 +82,7 @@
 
 
   $ josh-filter -s c=:/pre master --update refs/josh/filter/master
+  7a2b86910858e80f638b4aa1a025ed9a2f62ded4
   [5] :prefix=c
   [7] :/pre
   [14] sequence_number