Merge pull request #9235 from gitbutlerapp/kv-branch-29

Implement the squash case of the but rub command

Author: krlvi

crates/but/src/rub/mod.rs

@@ -7,6 +7,7 @@ use gitbutler_command_context::CommandContext;
 use gitbutler_project::Project;
 mod amend;
 mod assign;
+mod squash;
 mod undo;
 
 use crate::id::CliId;
@@ -46,8 +47,8 @@ pub(crate) fn handle(
             bail!(makes_no_sense_error(&source, &target))
         }
         (CliId::Commit { oid }, CliId::Unassigned) => undo::commit(ctx, oid),
-        (CliId::Commit { .. }, CliId::Commit { .. }) => {
-            bail!(not_implemented("Squash commits", &source, &target))
+        (CliId::Commit { oid: source }, CliId::Commit { oid: destination }) => {
+            squash::commits(ctx, source, destination)
         }
         (CliId::Commit { .. }, CliId::Branch { .. }) => {
             bail!(not_implemented("Move commit to branch", &source, &target))

crates/but/src/rub/squash.rs

@@ -0,0 +1,25 @@
+use gitbutler_command_context::CommandContext;
+use gitbutler_oxidize::ObjectIdExt;
+use gix::ObjectId;
+
+use super::undo::stack_id_by_commit_id;
+
+pub(crate) fn commits(
+    ctx: &mut CommandContext,
+    source: &ObjectId,
+    destination: &ObjectId,
+) -> anyhow::Result<()> {
+    let source_stack = stack_id_by_commit_id(ctx, source)?;
+    let destination_stack = stack_id_by_commit_id(ctx, destination)?;
+    if source_stack != destination_stack {
+        anyhow::bail!("Cannot squash commits from different stacks");
+    }
+
+    gitbutler_branch_actions::squash_commits(
+        ctx,
+        source_stack,
+        vec![source.to_git2()],
+        destination.to_git2(),
+    )?;
+    Ok(())
+}

crates/but/src/rub/undo.rs

@@ -9,7 +9,10 @@ pub(crate) fn commit(ctx: &mut CommandContext, oid: &ObjectId) -> anyhow::Result
     Ok(())
 }
 
-fn stack_id_by_commit_id(ctx: &CommandContext, oid: &ObjectId) -> anyhow::Result<StackId> {
+pub(crate) fn stack_id_by_commit_id(
+    ctx: &CommandContext,
+    oid: &ObjectId,
+) -> anyhow::Result<StackId> {
     let stacks = crate::log::stacks(ctx)?
         .iter()
         .map(|s| crate::log::stack_details(ctx, s.id).map(|d| (s.id, d)))