feat(record): pass --(no-)gpg-sign flag to git commit

arxanas · Jun 14, 2023 · 4eb2d7d · 4eb2d7d
1 parent 7e55067
commit 4eb2d7d
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 16 deletions.
diff --git a/git-branchless-opts/src/lib.rs b/git-branchless-opts/src/lib.rs
@@ -340,6 +340,10 @@ pub struct RecordArgs {
     /// if any.
     #[clap(action, short = 'I', long = "insert")]
     pub insert: bool,
+
+    /// Options for signing commits.
+    #[clap(flatten)]
+    pub sign_options: SignOptions,
 }
 
 /// Display a nice graph of the commits you've recently worked on.

diff --git a/git-branchless-record/src/lib.rs b/git-branchless-record/src/lib.rs
@@ -15,7 +15,7 @@ use std::fmt::Write;
 use std::time::SystemTime;
 
 use git_branchless_invoke::CommandContext;
-use git_branchless_opts::RecordArgs;
+use git_branchless_opts::{RecordArgs, SignOptions};
 use itertools::Itertools;
 use lib::core::check_out::{check_out_commit, CheckOutCommitOptions};
 use lib::core::config::get_restack_preserve_timestamps;
@@ -53,6 +53,7 @@ pub fn command_main(ctx: CommandContext, args: RecordArgs) -> EyreExitOr<()> {
         create,
         detach,
         insert,
+        sign_options,
     } = args;
     record(
         &effects,
@@ -62,6 +63,7 @@ pub fn command_main(ctx: CommandContext, args: RecordArgs) -> EyreExitOr<()> {
         create,
         detach,
         insert,
+        &sign_options,
     )
 }
 
@@ -74,6 +76,7 @@ fn record(
     branch_name: Option<String>,
     detach: bool,
     insert: bool,
+    sign_options: &SignOptions,
 ) -> EyreExitOr<()> {
     let now = SystemTime::now();
     let repo = Repo::from_dir(&git_run_info.working_directory)?;
@@ -147,19 +150,29 @@ fn record(
                 &snapshot,
                 event_tx_id,
                 message.as_deref(),
+                sign_options,
             )?);
         }
     } else {
-        let args = {
-            let mut args = vec!["commit"];
-            if let Some(message) = &message {
-                args.extend(["--message", message]);
-            }
-            if working_copy_changes_type == WorkingCopyChangesType::Unstaged {
-                args.push("--all");
+        let mut args = vec!["commit"];
+        if let Some(message) = &message {
+            args.extend(["--message", message]);
+        }
+        if working_copy_changes_type == WorkingCopyChangesType::Unstaged {
+            args.push("--all");
+        }
+        let mut gpg_flag;
+        if let Some(keyid) = &sign_options.gpg_sign {
+            gpg_flag = String::from("--gpg-sign");
+            if !keyid.is_empty() {
+                gpg_flag.push('=');
+                gpg_flag.push_str(keyid);
             }
-            args
-        };
+            args.push(&gpg_flag);
+        } else if sign_options.no_gpg_sign {
+            args.push("--no-gpg-sign");
+        }
+
         try_exit_code!(git_run_info.run_direct_no_wrapping(Some(event_tx_id), &args)?);
     }
 
@@ -224,6 +237,7 @@ fn record_interactive(
     snapshot: &WorkingCopySnapshot,
     event_tx_id: EventTransactionId,
     message: Option<&str>,
+    sign_options: &SignOptions,
 ) -> EyreExitOr<()> {
     let old_tree = snapshot.commit_stage0.get_tree()?;
     let new_tree = snapshot.commit_unstaged.get_tree()?;
@@ -332,13 +346,22 @@ fn record_interactive(
         &update_index_script,
     )?;
 
-    let args = {
-        let mut args = vec!["commit"];
-        if let Some(message) = message {
-            args.extend(["--message", message]);
+    let mut args = vec!["commit"];
+    if let Some(message) = message {
+        args.extend(["--message", message]);
+    }
+    let mut gpg_flag;
+    if let Some(keyid) = &sign_options.gpg_sign {
+        gpg_flag = String::from("--gpg-sign");
+        if !keyid.is_empty() {
+            gpg_flag.push('=');
+            gpg_flag.push_str(keyid);
         }
-        args
-    };
+        args.push(&gpg_flag);
+    } else if sign_options.no_gpg_sign {
+        args.push("--no-gpg-sign");
+    }
+
     git_run_info.run_direct_no_wrapping(Some(event_tx_id), &args)
 }