Feat/interactive cherry pick

.gitignore

@@ -17,3 +17,4 @@ __pycache__/
 *.pyc
 criterion
 .codex
+.worktrees/

crates/gitcomet-core/src/lib.rs

@@ -13,4 +13,5 @@ pub mod mergetool_trace;
 pub mod path_utils;
 pub mod process;
 pub mod services;
+pub mod squash;
 pub mod text_utils;

crates/gitcomet-core/src/services.rs

@@ -141,6 +141,49 @@ pub enum RemoteUrlKind {
     Push,
 }
 
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum InteractiveRebaseAction {
+    Pick,
+    Reword,
+    Edit,
+    Squash,
+    Fixup,
+    Drop,
+}
+
+impl InteractiveRebaseAction {
+    pub fn to_todo_str(self) -> &'static str {
+        match self {
+            Self::Pick => "pick",
+            Self::Reword => "reword",
+            Self::Edit => "edit",
+            Self::Squash => "squash",
+            Self::Fixup => "fixup",
+            Self::Drop => "drop",
+        }
+    }
+
+    pub fn label(self) -> &'static str {
+        match self {
+            Self::Pick => "Pick",
+            Self::Reword => "Reword",
+            Self::Edit => "Edit",
+            Self::Squash => "Squash",
+            Self::Fixup => "Fixup",
+            Self::Drop => "Drop",
+        }
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct InteractiveRebaseEntry {
+    pub action: InteractiveRebaseAction,
+    pub commit_id: String,
+    pub summary: String,
+    /// New commit message, used only when action is Reword.
+    pub new_message: Option<String>,
+}
+
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct SubmoduleTrustTarget {
     pub submodule_path: PathBuf,
@@ -511,6 +554,11 @@ pub trait GitRepository: Send + Sync {
     }
     fn checkout_commit(&self, id: &CommitId) -> Result<()>;
     fn cherry_pick(&self, id: &CommitId) -> Result<()>;
+    fn cherry_pick_with_output(&self, _id: &CommitId, _commit: bool) -> Result<CommandOutput> {
+        Err(Error::new(ErrorKind::Unsupported(
+            "git cherry-pick is not implemented for this backend",
+        )))
+    }
     fn revert(&self, id: &CommitId) -> Result<()>;
 
     fn stash_create(&self, message: &str, include_untracked: bool) -> Result<()>;
@@ -556,6 +604,31 @@ pub trait GitRepository: Send + Sync {
             "git rebase --abort is not implemented for this backend",
         )))
     }
+    fn list_commits_for_interactive_rebase(
+        &self,
+        _base: &str,
+    ) -> Result<Vec<InteractiveRebaseEntry>> {
+        Err(Error::new(ErrorKind::Unsupported(
+            "listing commits for interactive rebase is not implemented for this backend",
+        )))
+    }
+    fn interactive_rebase_with_output(
+        &self,
+        _base: &str,
+        _entries: &[InteractiveRebaseEntry],
+    ) -> Result<CommandOutput> {
+        Err(Error::new(ErrorKind::Unsupported(
+            "git rebase -i is not implemented for this backend",
+        )))
+    }
+    fn interactive_cherry_pick_with_output(
+        &self,
+        _entries: &[InteractiveRebaseEntry],
+    ) -> Result<CommandOutput> {
+        Err(Error::new(ErrorKind::Unsupported(
+            "interactive cherry-pick is not implemented for this backend",
+        )))
+    }
     fn merge_abort_with_output(&self) -> Result<CommandOutput> {
         Err(Error::new(ErrorKind::Unsupported(
             "git merge --abort is not implemented for this backend",
@@ -768,6 +841,31 @@ pub trait GitRepository: Send + Sync {
         )))
     }
 
+    /// Builds the default combined message for squashing the linear commit
+    /// range `oldest..=head`: the oldest commit's full message first, younger
+    /// messages appended as paragraphs.
+    fn squash_message_preview(&self, _oldest: &CommitId, _head: &CommitId) -> Result<String> {
+        Err(Error::new(ErrorKind::Unsupported(
+            "squashing commits is not implemented for this backend",
+        )))
+    }
+
+    /// Squashes the linear first-parent range `oldest..=expected_head` (which
+    /// must end at the current HEAD) into a single commit carrying `message`,
+    /// preserving the oldest commit's author. Must not touch the worktree or
+    /// index, and must fail without changing refs when HEAD no longer equals
+    /// `expected_head`.
+    fn squash_commits_with_output(
+        &self,
+        _oldest: &CommitId,
+        _expected_head: &CommitId,
+        _message: &str,
+    ) -> Result<CommandOutput> {
+        Err(Error::new(ErrorKind::Unsupported(
+            "squashing commits is not implemented for this backend",
+        )))
+    }
+
     fn reset_with_output(&self, _target: &str, _mode: ResetMode) -> Result<CommandOutput> {
         Err(Error::new(ErrorKind::Unsupported(
             "git reset is not implemented for this backend",