From 5e5508a2ee3a0e380bdd2f4c1897826d439811f1 Mon Sep 17 00:00:00 2001
From: Sebastian Kuzminsky <seb@highlab.com>
Date: Tue, 15 Jul 2025 16:27:48 -0600
Subject: [PATCH] Issue: make a helper function to commit an Issue

This improves code reuse and streamlines the code a bit.
---
 src/issue.rs | 73 ++++++++++++++++++++++------------------------------
 1 file changed, 31 insertions(+), 42 deletions(-)

diff --git a/src/issue.rs b/src/issue.rs
index 0de413c..23bb59d 100644
--- a/src/issue.rs
+++ b/src/issue.rs
@@ -243,8 +243,7 @@ impl Issue {
             None => issue.edit_description_file()?,
         };
 
-        crate::git::add(&issue_dir)?;
-        crate::git::commit(&issue_dir, &format!("create new issue {}", issue_id))?;
+        issue.commit(&format!("create new issue {}", issue_id))?;
 
         Ok(issue)
     }
@@ -253,21 +252,15 @@ impl Issue {
     pub fn edit_description(&mut self) -> Result<(), IssueError> {
         self.edit_description_file()?;
         let description_filename = self.description_filename();
-        crate::git::add(&description_filename)?;
-        if crate::git::worktree_is_dirty(&self.dir.to_string_lossy())? {
-            crate::git::commit(
-                &description_filename.parent().unwrap(),
-                &format!(
-                    "edit description of issue {}",
-                    description_filename
-                        .parent()
-                        .unwrap()
-                        .file_name()
-                        .unwrap()
-                        .to_string_lossy()
-                ),
-            )?;
-        }
+        self.commit(&format!(
+            "edit description of issue {}",
+            description_filename
+                .parent()
+                .unwrap()
+                .file_name()
+                .unwrap()
+                .to_string_lossy(),
+        ))?;
         Ok(())
     }
 
@@ -286,18 +279,12 @@ impl Issue {
         state_filename.push("state");
         let mut state_file = std::fs::File::create(&state_filename)?;
         write!(state_file, "{}", new_state)?;
-        crate::git::add(&state_filename)?;
-        if crate::git::worktree_is_dirty(&self.dir.to_string_lossy())? {
-            crate::git::commit(
-                &self.dir,
-                &format!(
-                    "change state of issue {}, {} -> {}",
-                    self.dir.file_name().unwrap().to_string_lossy(),
-                    old_state,
-                    new_state,
-                ),
-            )?;
-        }
+        self.commit(&format!(
+            "change state of issue {}, {} -> {}",
+            self.dir.file_name().unwrap().to_string_lossy(),
+            old_state,
+            new_state,
+        ))?;
         Ok(())
     }
 
@@ -319,18 +306,12 @@ impl Issue {
         assignee_filename.push("assignee");
         let mut assignee_file = std::fs::File::create(&assignee_filename)?;
         write!(assignee_file, "{}", new_assignee)?;
-        crate::git::add(&assignee_filename)?;
-        if crate::git::worktree_is_dirty(&self.dir.to_string_lossy())? {
-            crate::git::commit(
-                &self.dir,
-                &format!(
-                    "change assignee of issue {}, {} -> {}",
-                    self.dir.file_name().unwrap().to_string_lossy(),
-                    old_assignee,
-                    new_assignee,
-                ),
-            )?;
-        }
+        self.commit(&format!(
+            "change assignee of issue {}, {} -> {}",
+            self.dir.file_name().unwrap().to_string_lossy(),
+            old_assignee,
+            new_assignee,
+        ))?;
         Ok(())
     }
 
@@ -444,7 +425,15 @@ impl Issue {
         for tag in &self.tags {
             writeln!(tags_file, "{}", tag)?;
         }
-        crate::git::add(&tags_filename)?;
+        self.commit(commit_message)?;
+        Ok(())
+    }
+
+    fn commit(&self, commit_message: &str) -> Result<(), IssueError> {
+        crate::git::add(&self.dir)?;
+        if !crate::git::worktree_is_dirty(&self.dir.to_string_lossy())? {
+            return Ok(());
+        }
         crate::git::commit(&self.dir, commit_message)?;
         Ok(())
     }