3 files changed, 66 insertions, 7 deletions

diff --git a/src/git.rs b/src/git.rs
index 5b78b34..6e6091d 100644
--- a/src/git.rs
+++ b/src/git.rs
@@ -54,7 +54,11 @@ pub trait RepoActions {
     ) -> Result<(Vec<Sha1Hash>, Vec<Sha1Hash>)>;
     // including (un)staged changes and (un)tracked files
     fn has_outstanding_changes(&self) -> Result<bool>;
-    fn make_patch_from_commit(&self, commit: &Sha1Hash) -> Result<String>;
+    fn make_patch_from_commit(
+        &self,
+        commit: &Sha1Hash,
+        series_count: &Option<(u64, u64)>,
+    ) -> Result<String>;
     fn extract_commit_pgp_signature(&self, commit: &Sha1Hash) -> Result<String>;
     fn checkout(&self, ref_name: &str) -> Result<Sha1Hash>;
     fn create_branch_at_commit(&self, branch_name: &str, commit: &str) -> Result<()>;
@@ -212,7 +216,11 @@ impl RepoActions for Repo {
         Ok(git_sig_to_tag_vec(&sig))
     }
 
-    fn make_patch_from_commit(&self, commit: &Sha1Hash) -> Result<String> {
+    fn make_patch_from_commit(
+        &self,
+        commit: &Sha1Hash,
+        series_count: &Option<(u64, u64)>,
+    ) -> Result<String> {
         let c = self
             .git_repo
             .find_commit(Oid::from_bytes(commit.as_byte_array()).context(format!(
@@ -220,7 +228,11 @@ impl RepoActions for Repo {
                 &commit
             ))?)
             .context(format!("failed to find commit {}", &commit))?;
-        let patch = git2::Email::from_commit(&c, &mut git2::EmailCreateOptions::default())
+        let mut options = git2::EmailCreateOptions::default();
+        if let Some((n, total)) = series_count {
+            options.subject_prefix(format!("PATCH {n}/{total}"));
+        }
+        let patch = git2::Email::from_commit(&c, &mut options)
             .context(format!("failed to create patch from commit {}", &commit))?;
 
         Ok(std::str::from_utf8(patch.as_slice())
@@ -859,7 +871,43 @@ mod tests {
                 libgit2 1.7.1\n\
                 \n\
                 ",
-                git_repo.make_patch_from_commit(&oid_to_sha1(&oid))?,
+                git_repo.make_patch_from_commit(&oid_to_sha1(&oid), &None)?,
+            );
+            Ok(())
+        }
+
+        #[test]
+        fn series_count() -> Result<()> {
+            let test_repo = GitTestRepo::default();
+            let oid = test_repo.populate()?;
+
+            let git_repo = Repo::from_path(&test_repo.dir)?;
+
+            assert_eq!(
+                "\
+                From 431b84edc0d2fa118d63faa3c2db9c73d630a5ae Mon Sep 17 00:00:00 2001\n\
+                From: Joe Bloggs <joe.bloggs@pm.me>\n\
+                Date: Thu, 1 Jan 1970 00:00:00 +0000\n\
+                Subject: [PATCH 3/5] add t2.md\n\
+                \n\
+                ---\n \
+                t2.md | 1 +\n \
+                1 file changed, 1 insertion(+)\n \
+                create mode 100644 t2.md\n\
+                \n\
+                diff --git a/t2.md b/t2.md\n\
+                new file mode 100644\n\
+                index 0000000..a66525d\n\
+                --- /dev/null\n\
+                +++ b/t2.md\n\
+                @@ -0,0 +1 @@\n\
+                +some content1\n\\ \
+                No newline at end of file\n\
+                --\n\
+                libgit2 1.7.1\n\
+                \n\
+                ",
+                git_repo.make_patch_from_commit(&oid_to_sha1(&oid), &Some((3, 5)))?,
             );
             Ok(())
         }
@@ -1217,6 +1265,7 @@ mod tests {
                 &TEST_KEY_1_KEYS,
                 &RepoRef::try_from(generate_repo_ref_event()).unwrap(),
                 None,
+                None,
             )
         }
         fn test_patch_applies_to_repository(patch_event: nostr::Event) -> Result<()> {
diff --git a/src/sub_commands/prs/create.rs b/src/sub_commands/prs/create.rs
index 0f7cbda..82824a1 100644
--- a/src/sub_commands/prs/create.rs
+++ b/src/sub_commands/prs/create.rs
@@ -80,7 +80,9 @@ pub async fn launch(
 
     let title = match &args.title {
         Some(t) => t.clone(),
-        None => Interactor::default().input(PromptInputParms::default().with_prompt("title"))?,
+        None => Interactor::default()
+            .input(PromptInputParms::default().with_prompt("title"))?
+            .clone(),
     };
 
     let description = match &args.description {
@@ -350,7 +352,7 @@ pub fn generate_pr_and_patch_events(
     let pr_event_id = pr_event.id;
 
     let mut events = vec![pr_event];
-    for commit in commits {
+    for (i, commit) in commits.iter().enumerate() {
         events.push(
             generate_patch_event(
                 git_repo,
@@ -360,6 +362,11 @@ pub fn generate_pr_and_patch_events(
                 keys,
                 repo_ref,
                 events.last().map(nostr::Event::id),
+                if events.is_empty() {
+                    None
+                } else {
+                    Some(((i + 1).try_into()?, commits.len().try_into()?))
+                },
             )
             .context("failed to generate patch event")?,
         );
@@ -367,6 +374,7 @@ pub fn generate_pr_and_patch_events(
     Ok(events)
 }
 
+#[allow(clippy::too_many_arguments)]
 pub fn generate_patch_event(
     git_repo: &Repo,
     root_commit: &Sha1Hash,
@@ -375,6 +383,7 @@ pub fn generate_patch_event(
     keys: &nostr::Keys,
     repo_ref: &RepoRef,
     parent_patch_event_id: Option<nostr::EventId>,
+    series_count: Option<(u64, u64)>,
 ) -> Result<nostr::Event> {
     let commit_parent = git_repo
         .get_commit_parent(commit)
@@ -383,7 +392,7 @@ pub fn generate_patch_event(
     EventBuilder::new(
         nostr::event::Kind::Custom(PATCH_KIND),
         git_repo
-            .make_patch_from_commit(commit)
+            .make_patch_from_commit(commit,&series_count)
             .context(format!("cannot make patch for commit {commit}"))?,
         [
             vec![
diff --git a/src/sub_commands/push.rs b/src/sub_commands/push.rs
index fac746f..de2a92f 100644
--- a/src/sub_commands/push.rs
+++ b/src/sub_commands/push.rs
@@ -110,6 +110,7 @@ pub async fn launch(cli_args: &Cli) -> Result<()> {
                 &keys,
                 &repo_ref,
                 patch_events.last().map(nostr::Event::id),
+                None,
             )
             .context("cannot make patch event from commit")?,
         );