feat(record): allow multiple --message args

this works, right?

Author: claytonrcarter

Cargo.lock

@@ -300,7 +300,7 @@ pub struct RecordArgs {
     /// The commit message to use. If not provided, will be prompted to provide a commit message
     /// interactively.
     #[clap(value_parser, short = 'm', long = "message")]
-    pub message: Option<String>,
+    pub messages: Vec<String>,
 
     /// Select changes to include interactively, rather than using the
     /// current staged/unstaged changes.

git-branchless-opts/src/lib.rs

@@ -22,3 +22,4 @@ tracing = { workspace = true }
 
 [dev-dependencies]
 insta = { workspace = true }
+regex = { workspace = true }

git-branchless-record/Cargo.toml

@@ -52,7 +52,7 @@ pub fn command_main(ctx: CommandContext, args: RecordArgs) -> EyreExitOr<()> {
         git_run_info,
     } = ctx;
     let RecordArgs {
-        message,
+        messages,
         interactive,
         create,
         detach,
@@ -61,7 +61,7 @@ pub fn command_main(ctx: CommandContext, args: RecordArgs) -> EyreExitOr<()> {
     record(
         &effects,
         &git_run_info,
-        message,
+        messages,
         interactive,
         create,
         detach,
@@ -73,7 +73,7 @@ pub fn command_main(ctx: CommandContext, args: RecordArgs) -> EyreExitOr<()> {
 fn record(
     effects: &Effects,
     git_run_info: &GitRunInfo,
-    message: Option<String>,
+    messages: Vec<String>,
     interactive: bool,
     branch_name: Option<String>,
     detach: bool,
@@ -150,15 +150,15 @@ fn record(
                 &repo,
                 &snapshot,
                 event_tx_id,
-                message.as_deref(),
+                messages,
             )?);
         }
     } else {
         let args = {
             let mut args = vec!["commit"];
-            if let Some(message) = &message {
-                args.extend(["--message", message]);
-            }
+            messages
+                .iter()
+                .for_each(|message| args.extend(["--message", message]));
             if working_copy_changes_type == WorkingCopyChangesType::Unstaged {
                 args.push("--all");
             }
@@ -227,7 +227,7 @@ fn record_interactive(
     repo: &Repo,
     snapshot: &WorkingCopySnapshot,
     event_tx_id: EventTransactionId,
-    message: Option<&str>,
+    messages: Vec<String>,
 ) -> EyreExitOr<()> {
     let old_tree = snapshot.commit_stage0.get_tree()?;
     let new_tree = snapshot.commit_unstaged.get_tree()?;
@@ -246,7 +246,7 @@ fn record_interactive(
         is_read_only: false,
         commits: vec![
             Commit {
-                message: Some(message.map(|s| s.to_owned()).unwrap_or_default()),
+                message: Some(messages.iter().join("\n\n")),
             },
             Commit { message: None },
         ],

git-branchless-record/src/lib.rs

@@ -1,5 +1,6 @@
 use lib::testing::pty::{run_in_pty, PtyAction, DOWN_ARROW};
 use lib::testing::{make_git, GitInitOptions, GitRunOptions};
+use regex::Regex;
 
 #[test]
 fn test_record_unstaged_changes() -> eyre::Result<()> {
@@ -13,22 +14,31 @@ fn test_record_unstaged_changes() -> eyre::Result<()> {
     git.commit_file("test1", 1)?;
     git.write_file_txt("test1", "contents1\n")?;
     {
-        let (stdout, _stderr) = git.branchless("record", &["-m", "foo"])?;
+        let (stdout, _stderr) = git.branchless("record", &["-m", "foo", "-m", "bar"])?;
         insta::assert_snapshot!(stdout, @r###"
-        [master 914812a] foo
+        [master 872eae1] foo
          1 file changed, 1 insertion(+), 1 deletion(-)
         "###);
     }
 
     {
         let (stdout, _stderr) = git.run(&["show"])?;
-        insta::assert_snapshot!(stdout, @r###"
-        commit 914812ae3220add483f11d851dc59f0b5dbdeaa0
+        // For the empty lines between paragraphs, git show prints 4 spaces
+        // instead of just an empty line. (ie "    \n" instead of "\n") It's
+        // hard to work with this in an inline snapshot, as editors often trim
+        // trailing whitespace, so here we just modify the output (by replacing
+        // any such lines) to make it easier to assert against with insta
+        let whitespace_only_line_regex = Regex::new(r"(?m)^ {4}$").unwrap();
+        let trimmed_stdout = whitespace_only_line_regex.replace_all(&stdout, "");
+        insta::assert_snapshot!(trimmed_stdout, @r###"
+        commit 872eae10daf1e94d0c346540f6d655027c60e7ae
         Author: Testy McTestface <test@example.com>
         Date:   Thu Oct 29 12:34:56 2020 +0000
 
             foo
 
+            bar
+
         diff --git a/test1.txt b/test1.txt
         index 7432a8f..a024003 100644
         --- a/test1.txt