Add overwriting of author to squash filter

Change: squash-author

Author: christian-schilling

src/bin/josh-filter.rs

@@ -39,10 +39,20 @@ fn make_app() -> clap::Command {
             clap::Arg::new("squash")
                 .help("Produce a history that contains only commits pointed to by references matching the given pattern")
                 .long("squash")
-                .takes_value(true),
+        )
+        .arg(
+            clap::Arg::new("author")
+                .help("Author to use for commits with rewritten message")
+                .long("author")
+        )
+        .arg(
+            clap::Arg::new("email")
+                .help("Author email to use for commits with rewritten message")
+                .long("email")
         )
         .arg(
             clap::Arg::new("single")
+                .action(clap::ArgAction::SetTrue)
                 .help("Produce a history that contains only one single commit")
                 .long("single"),
         )
@@ -143,8 +153,8 @@ fn run_filter(args: Vec<String>) -> josh::JoshResult<i32> {
 
     let mut filterobj = josh::filter::parse(&specstr)?;
 
-    if args.is_present("print-filter") {
-        let filterobj = if args.is_present("reverse") {
+    if args.get_flag("print-filter") {
+        let filterobj = if args.get_flag("reverse") {
             josh::filter::invert(filterobj)?
         } else {
             filterobj
@@ -163,7 +173,7 @@ fn run_filter(args: Vec<String>) -> josh::JoshResult<i32> {
     let transaction = josh::cache::Transaction::new(repo, None);
     let repo = transaction.repo();
 
-    let input_ref = args.value_of("input").unwrap();
+    let input_ref = args.get_one::<String>("input").unwrap();
 
     let mut refs = vec![];
     let mut ids = vec![];
@@ -172,11 +182,11 @@ fn run_filter(args: Vec<String>) -> josh::JoshResult<i32> {
     let input_ref = reference.name().unwrap().to_string();
     refs.push((input_ref.clone(), reference.target().unwrap()));
 
-    if args.is_present("single") {
+    if args.get_flag("single") {
         filterobj = josh::filter::chain(josh::filter::squash(None), filterobj);
     }
 
-    if let Some(pattern) = args.value_of("squash") {
+    if let Some(pattern) = args.get_one::<String>("squash") {
         let pattern = pattern.to_string();
         for reference in repo.references_glob(&pattern).unwrap() {
             let reference = reference?;
@@ -185,7 +195,14 @@ fn run_filter(args: Vec<String>) -> josh::JoshResult<i32> {
                 refs.push((reference.name().unwrap().to_string(), target));
             }
         }
-        filterobj = josh::filter::chain(josh::filter::squash(Some(&ids)), filterobj);
+        filterobj = josh::filter::chain(
+            josh::filter::squash(Some((
+                args.get_one::<String>("author").unwrap(),
+                args.get_one::<String>("email").unwrap(),
+                &ids,
+            ))),
+            filterobj,
+        );
     };
 
     let odb = repo.odb()?;
@@ -214,7 +231,7 @@ fn run_filter(args: Vec<String>) -> josh::JoshResult<i32> {
         }
     });
 
-    if args.is_present("discover") {
+    if args.get_flag("discover") {
         let r = repo.revparse_single(&input_ref)?;
         let hs = josh::housekeeping::find_all_workspaces_and_subdirectories(&r.peel_to_tree()?)?;
         for i in hs {
@@ -238,7 +255,7 @@ fn run_filter(args: Vec<String>) -> josh::JoshResult<i32> {
 
     let reverse = args.get_flag("reverse");
 
-    let check_permissions = args.is_present("check-permission");
+    let check_permissions = args.get_flag("check-permission");
     let mut permissions_filter = josh::filter::empty();
     if check_permissions {
         let whitelist;
@@ -361,17 +378,17 @@ fn run_filter(args: Vec<String>) -> josh::JoshResult<i32> {
     }
 
     if !reverse
-        && args.value_of("update") != Some("FILTERED_HEAD")
+        && args.get_one::<String>("update") != Some(&"FILTERED_HEAD".to_string())
         && updated_refs.len() == 1
         && updated_refs[0].1 == old_oid
     {
         println!(
             "Warning: reference {} wasn't updated",
-            args.value_of("update").unwrap()
+            args.get_one::<String>("update").unwrap()
         );
     }
 
-    if let Some(gql_query) = args.value_of("graphql") {
+    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;
         let (res, _errors) = juniper::execute_sync(

src/filter/mod.rs

@@ -61,10 +61,12 @@ pub fn empty() -> Filter {
     to_filter(Op::Empty)
 }
 
-pub fn squash(ids: Option<&[(git2::Oid, String)]>) -> Filter {
-    if let Some(ids) = ids {
+pub fn squash(ids: Option<(&str, &str, &[(git2::Oid, String)])>) -> Filter {
+    if let Some((author, email, ids)) = ids {
         to_filter(Op::Squash(Some(
-            ids.iter().map(|(x, y)| (*x, y.clone())).collect(),
+            ids.iter()
+                .map(|(x, y)| (*x, (y.clone(), author.to_string(), email.to_string())))
+                .collect(),
         )))
     } else {
         to_filter(Op::Squash(None))
@@ -95,7 +97,7 @@ enum Op {
     Empty,
     Fold,
     Paths,
-    Squash(Option<std::collections::HashMap<git2::Oid, String>>),
+    Squash(Option<std::collections::HashMap<git2::Oid, (String, String, String)>>),
     Linear,
 
     RegexReplace(regex::Regex, String),
@@ -250,7 +252,7 @@ fn spec2(op: &Op) -> String {
         Op::Squash(Some(hs)) => {
             let mut v = hs
                 .iter()
-                .map(|(x, y)| format!("{}:{}", x, y))
+                .map(|(x, y)| format!("{}:{}:{}:{}", x, y.0, y.1, y.2))
                 .collect::<Vec<String>>();
             v.sort();
             let s = v.join(",");

src/history.rs

@@ -181,21 +181,29 @@ pub fn rewrite_commit(
     base: &git2::Commit,
     parents: &[&git2::Commit],
     tree: &git2::Tree,
-    message: Option<String>,
+    message: Option<(String, String, String)>,
 ) -> JoshResult<git2::Oid> {
     if message == None && base.tree()?.id() == tree.id() && all_equal(base.parents(), parents) {
         // Looks like an optimization, but in fact serves to not change the commit in case
         // it was signed.
         return Ok(base.id());
     }
 
-    let b = repo.commit_create_buffer(
-        &base.author(),
-        &base.committer(),
-        &message.unwrap_or(base.message_raw().unwrap_or("no message").to_string()),
-        tree,
-        parents,
-    )?;
+    let b = if let Some((message, author, email)) = message {
+        let a = base.author();
+        let new_a = git2::Signature::new(&author, &email, &a.when())?;
+        let c = base.committer();
+        let new_c = git2::Signature::new(&author, &email, &c.when())?;
+        repo.commit_create_buffer(&new_a, &new_c, &message, tree, parents)?
+    } else {
+        repo.commit_create_buffer(
+            &base.author(),
+            &base.committer(),
+            &base.message_raw().unwrap_or("no message"),
+            tree,
+            parents,
+        )?
+    };
 
     if let Ok((sig, _)) = repo.extract_signature(&base.id(), None) {
         // Re-create the object with the original signature (which of course does not match any
@@ -551,7 +559,7 @@ pub fn create_filtered_commit<'a>(
     filtered_tree: git2::Tree<'a>,
     transaction: &cache::Transaction,
     filter: filter::Filter,
-    message: Option<String>,
+    message: Option<(String, String, String)>,
 ) -> JoshResult<git2::Oid> {
     let (r, is_new) = create_filtered_commit2(
         transaction.repo(),
@@ -573,7 +581,7 @@ fn create_filtered_commit2<'a>(
     original_commit: &'a git2::Commit,
     filtered_parent_ids: Vec<git2::Oid>,
     filtered_tree: git2::Tree<'a>,
-    message: Option<String>,
+    message: Option<(String, String, String)>,
 ) -> JoshResult<(git2::Oid, bool)> {
     let filtered_parent_commits: Result<Vec<_>, _> = filtered_parent_ids
         .iter()

tests/filter/squash.t

@@ -28,7 +28,7 @@
 
   $ git merge -q branch2 --no-ff
 
-  $ josh-filter -s --squash "refs/tags/*" --update refs/heads/filtered
+  $ josh-filter -s --squash "refs/tags/*" --author "New Author" --email "new@e.mail" --update refs/heads/filtered
   Warning: reference refs/heads/filtered wasn't updated
   [1] :SQUASH=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
 
@@ -38,14 +38,15 @@
   'git <command> [<revision>...] -- [<file>...]'
   [128]
   $ git tag tag_a 1d69b7d
-  $ josh-filter -s --squash "refs/tags/*" --update refs/heads/filtered
+  $ josh-filter -s --squash "refs/tags/*" --author "New Author" --email "new@e.mail" --update refs/heads/filtered
   [1] :SQUASH=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-  [2] :SQUASH=10d465cdf297e8062eed54204414414faa63671e
+  [2] :SQUASH=e8e83b9c5d2f779f0cea83a6cad68b710a399c96
 
   $ git log --graph --decorate --pretty=oneline refs/heads/filtered
-  * 97a9ff7bd4dad25b9dacdfdaeb861e74e7b4aef8 (tag: filtered/tag_a, filtered) refs/tags/tag_a
+  * d8aa5a9937f4f0bd645dbc0b591bae5cd6b6d91b (tag: filtered/tag_a, filtered) refs/tags/tag_a
   $ git tag tag_b 0b4cf6c
 
+
   $ git log --graph --decorate --pretty=oneline
   *   1d69b7d2651f744be3416f2ad526aeccefb99310 (HEAD -> master, tag: tag_a) Merge branch 'branch2'
   |\  
@@ -55,28 +56,41 @@
   |/  
   * 0b4cf6c9efbbda1eada39fa9c1d21d2525b027bb (tag: tag_b) add file1
 
-  $ josh-filter -s --squash "refs/tags/*" --update refs/heads/filtered
+  $ josh-filter -s --squash "refs/tags/*" --author "New Author" --email "new@e.mail" --update refs/heads/filtered
   [1] :SQUASH=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-  [2] :SQUASH=10d465cdf297e8062eed54204414414faa63671e
-  [3] :SQUASH=1683a7fc84387b56a1a5de8e9fcf720166951949
+  [2] :SQUASH=e8e83b9c5d2f779f0cea83a6cad68b710a399c96
+  [3] :SQUASH=3953063f3dc58661e9db16f9014aab1e8ec50bf8
 
   $ git log --graph --decorate --pretty=oneline refs/heads/filtered
-  * fa3bd3f0d90d5894c6ac402ef5f764b75335ec01 (tag: filtered/tag_a, filtered) refs/tags/tag_a
+  * 5b1a753860ca124024f6dfb4fd018fe7df8beae4 (tag: filtered/tag_a, filtered) refs/tags/tag_a
+  |\
+  * 96a731a4d64a8928e6af7abb2d425df3812b4197 (tag: filtered/tag_b) refs/tags/tag_b
+
+  $ git log --graph --pretty=%an:%ae refs/heads/master
+  *   Josh:josh@example.com
+  |\  
+  | * Josh:josh@example.com
+  | * Josh:josh@example.com
+  * | Josh:josh@example.com
+  |/  
+  * Josh:josh@example.com
+  $ git log --graph --pretty=%an:%ae refs/heads/filtered
+  * New Author:new@e.mail
   |\
-  * 077b2cad7b3fbc393b6320b90c9c0be1255ac309 (tag: filtered/tag_b) refs/tags/tag_b
+  * New Author:new@e.mail
 
   $ git tag tag_c 975d4c4
 
-  $ josh-filter -s --squash "refs/tags/*" --update refs/heads/filtered
+  $ josh-filter -s --squash "refs/tags/*" --author "New Author" --email "new@e.mail" --update refs/heads/filtered
   [1] :SQUASH=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-  [2] :SQUASH=10d465cdf297e8062eed54204414414faa63671e
-  [3] :SQUASH=1683a7fc84387b56a1a5de8e9fcf720166951949
-  [6] :SQUASH=06a82cb9d2d3abb0ac59f8c782fd7edecc8e8d28
+  [2] :SQUASH=e8e83b9c5d2f779f0cea83a6cad68b710a399c96
+  [3] :SQUASH=3953063f3dc58661e9db16f9014aab1e8ec50bf8
+  [6] :SQUASH=6a132477d438779dbaeb0d68b9aab55786e28dd9
 
   $ git log --graph --decorate --pretty=oneline refs/heads/filtered
-  *   dc1dc0211db7a1aea1234af950b4946afa5a6f14 (tag: filtered/tag_a, filtered) refs/tags/tag_a
+  *   9fe45cb2bead844630852ab338ecd8e073f8ba50 (tag: filtered/tag_a, filtered) refs/tags/tag_a
   |\  
-  | * 500760f4e4f3d4ba6e73af7ce0a98d91a25a503a (tag: filtered/tag_c) refs/tags/tag_c
+  | * d6b88d4c1cc566b7f4d9b51353ec6f3204a93b81 (tag: filtered/tag_c) refs/tags/tag_c
   |/  
-  * 077b2cad7b3fbc393b6320b90c9c0be1255ac309 (tag: filtered/tag_b) refs/tags/tag_b
+  * 96a731a4d64a8928e6af7abb2d425df3812b4197 (tag: filtered/tag_b) refs/tags/tag_b