Add moving files between commits

Author: Caleb-T-Owens

crates/but/src/rub/commits.rs

@@ -0,0 +1,47 @@
+use anyhow::{Context, Result};
+use bstr::ByteSlice;
+use but_core::diff::tree_changes;
+use but_workspace::DiffSpec;
+use gitbutler_branch_actions::update_workspace_commit;
+use gitbutler_command_context::CommandContext;
+use gitbutler_stack::VirtualBranchesHandle;
+
+use crate::rub::undo::stack_id_by_commit_id;
+
+pub fn commited_file_to_another_commit(
+    ctx: &mut CommandContext,
+    path: &str,
+    source_id: gix::ObjectId,
+    target_id: gix::ObjectId,
+) -> Result<()> {
+    let source_stack = stack_id_by_commit_id(ctx, &source_id)?;
+    let target_stack = stack_id_by_commit_id(ctx, &target_id)?;
+
+    let repo = ctx.gix_repo()?;
+    let source_commit = repo.find_commit(source_id)?;
+    let source_commit_parent_id = source_commit.parent_ids().next().context("First parent")?;
+
+    let (tree_changes, _) = tree_changes(&repo, Some(source_commit_parent_id.detach()), source_id)?;
+    let relevant_changes = tree_changes
+        .into_iter()
+        .filter(|tc| tc.path.to_str_lossy() == path)
+        .map(Into::into)
+        .collect::<Vec<DiffSpec>>();
+
+    but_workspace::move_changes_between_commits(
+        ctx,
+        source_stack,
+        source_id,
+        target_stack,
+        target_id,
+        relevant_changes,
+        ctx.app_settings().context_lines,
+    )?;
+
+    let vb_state = VirtualBranchesHandle::new(ctx.project().gb_dir());
+    update_workspace_commit(&vb_state, &ctx)?;
+
+    println!("Moved files between commits!");
+
+    Ok(())
+}

crates/but/src/rub/mod.rs

@@ -8,10 +8,11 @@ use gitbutler_project::Project;
 use gitbutler_oplog::{OplogExt, entry::{OperationKind, SnapshotDetails}};
 mod amend;
 mod assign;
+mod commits;
 mod move_commit;
 mod squash;
-mod undo;
 mod uncommit;
+mod undo;
 
 use crate::id::CliId;
 
@@ -58,12 +59,20 @@ pub(crate) fn handle(
                 uncommit::file_from_commit(ctx, path, commit_oid)?;
             }
             (CliId::CommittedFile { .. }, CliId::Branch { .. }) => {
-                // Extract file from commit to branch - for now, not implemented  
-                bail!("Extracting files from commits is not yet supported. Use git commands to extract file changes.")
+                // Extract file from commit to branch - for now, not implemented
+                bail!(
+                    "Extracting files from commits is not yet supported. Use git commands to extract file changes."
+                )
             }
-            (CliId::CommittedFile { .. }, CliId::Commit { .. }) => {
-                // Move file from one commit to another - for now, not implemented
-                bail!("Moving files between commits is not yet supported. Use git commands to modify commits.")
+            (
+                CliId::CommittedFile {
+                    path,
+                    commit_oid: source_id,
+                },
+                CliId::Commit { oid: target_id },
+            ) => {
+                create_snapshot(ctx, &project, OperationKind::FileChanges);
+                commits::commited_file_to_another_commit(ctx, path, *source_id, *target_id)?;
             }
             (CliId::Unassigned, CliId::UncommittedFile { .. }) => {
                 bail!(makes_no_sense_error(&source, &target))
@@ -74,11 +83,11 @@ pub(crate) fn handle(
             (CliId::Unassigned, CliId::Commit { oid }) => {
                 create_snapshot(ctx, &project, OperationKind::AmendCommit);
                 amend::assignments_to_commit(ctx, None, oid)?;
-            },
+            }
             (CliId::Unassigned, CliId::Branch { name: to }) => {
                 create_snapshot(ctx, &project, OperationKind::MoveHunk);
                 assign::assign_all(ctx, None, Some(to))?;
-            },
+            }
             (CliId::Unassigned, CliId::CommittedFile { .. }) => {
                 bail!(makes_no_sense_error(&source, &target))
             }
@@ -91,15 +100,15 @@ pub(crate) fn handle(
             (CliId::Commit { oid }, CliId::Unassigned) => {
                 create_snapshot(ctx, &project, OperationKind::UndoCommit);
                 undo::commit(ctx, oid)?;
-            },
+            }
             (CliId::Commit { oid: source_oid }, CliId::Commit { oid: destination }) => {
                 create_snapshot(ctx, &project, OperationKind::SquashCommit);
                 squash::commits(ctx, source_oid, destination)?;
             }
             (CliId::Commit { oid }, CliId::Branch { name }) => {
                 create_snapshot(ctx, &project, OperationKind::MoveCommit);
                 move_commit::to_branch(ctx, oid, name)?;
-            },
+            }
             (CliId::Branch { .. }, CliId::UncommittedFile { .. }) => {
                 bail!(makes_no_sense_error(&source, &target))
             }
@@ -140,17 +149,20 @@ fn ids(ctx: &mut CommandContext, source: &str, target: &str) -> anyhow::Result<(
     if target_result.len() != 1 {
         if target_result.is_empty() {
             return Err(anyhow::anyhow!(
-                "Target '{}' not found. If you just performed a Git operation (squash, rebase, etc.), try running 'but status' to refresh the current state.", 
+                "Target '{}' not found. If you just performed a Git operation (squash, rebase, etc.), try running 'but status' to refresh the current state.",
                 target
             ));
         } else {
-            let matches: Vec<String> = target_result.iter().map(|id| {
-                match id {
-                    CliId::Commit { oid } => format!("{} (commit {})", id.to_string(), &oid.to_string()[..7]),
+            let matches: Vec<String> = target_result
+                .iter()
+                .map(|id| match id {
+                    CliId::Commit { oid } => {
+                        format!("{} (commit {})", id.to_string(), &oid.to_string()[..7])
+                    }
                     CliId::Branch { name } => format!("{} (branch '{}')", id.to_string(), name),
-                    _ => format!("{} ({})", id.to_string(), id.kind())
-                }
-            }).collect();
+                    _ => format!("{} ({})", id.to_string(), id.kind()),
+                })
+                .collect();
             return Err(anyhow::anyhow!(
                 "Target '{}' is ambiguous. Matches: {}. Try using more characters, a longer SHA, or the full branch name to disambiguate.",
                 target,