feat(move): Add --fixup to squash moved commits into the destination

This only implements in-memory rebases/fixups. On-disk rebases can come later.

Author: claytonrcarter

git-branchless-move/src/lib.rs

@@ -73,6 +73,7 @@ pub fn r#move(
     exacts: Vec<Revset>,
     resolve_revset_options: &ResolveRevsetOptions,
     move_options: &MoveOptions,
+    fixup: bool,
     insert: bool,
 ) -> EyreExitOr<()> {
     let sources_provided = !sources.is_empty();
@@ -278,7 +279,7 @@ pub fn r#move(
             let commits_to_move = commits_to_move.union(&union_all(
                 &exact_components.values().cloned().collect::<Vec<_>>(),
             ));
-            let commits_to_move = if insert {
+            let commits_to_move = if insert || fixup {
                 commits_to_move.union(&dag.query_children(CommitSet::from(dest_oid))?)
             } else {
                 commits_to_move
@@ -297,7 +298,15 @@ pub fn r#move(
 
         let source_roots = dag.query_roots(source_oids.clone())?;
         for source_root in dag.commit_set_to_vec(&source_roots)? {
-            builder.move_subtree(source_root, vec![dest_oid])?;
+            if fixup {
+                let commits = dag.query_descendants(CommitSet::from(source_root))?;
+                let commits = dag.commit_set_to_vec(&commits)?;
+                for commit in commits.iter() {
+                    builder.fixup_commit(*commit, dest_oid)?;
+                }
+            } else {
+                builder.move_subtree(source_root, vec![dest_oid])?;
+            }
         }
 
         let component_roots: CommitSet = exact_components.keys().cloned().collect();
@@ -394,7 +403,14 @@ pub fn r#move(
                 }
             }
 
-            builder.move_subtree(component_root, vec![component_dest_oid])?;
+            if fixup {
+                let commits = dag.commit_set_to_vec(component)?;
+                for commit in commits.iter() {
+                    builder.fixup_commit(*commit, dest_oid)?;
+                }
+            } else {
+                builder.move_subtree(component_root, vec![component_dest_oid])?;
+            }
         }
 
         if insert {

git-branchless-opts/src/lib.rs

@@ -513,6 +513,10 @@ pub enum Command {
         #[clap(flatten)]
         move_options: MoveOptions,
 
+        /// Combine the moved commits and squash them into the destination commit.
+        #[clap(action, short = 'F', long = "fixup", conflicts_with = "insert")]
+        fixup: bool,
+
         /// Insert the subtree between the destination and it's children, if any.
         /// Only supported if the moved subtree has a single head.
         #[clap(action, short = 'I', long = "insert")]

git-branchless/src/commands/mod.rs

@@ -93,6 +93,7 @@ fn command_main(ctx: CommandContext, opts: Opts) -> EyreExitOr<()> {
             exact,
             resolve_revset_options,
             move_options,
+            fixup,
             insert,
         } => git_branchless_move::r#move(
             &effects,
@@ -103,6 +104,7 @@ fn command_main(ctx: CommandContext, opts: Opts) -> EyreExitOr<()> {
             exact,
             &resolve_revset_options,
             &move_options,
+            fixup,
             insert,
         )?,