Refactor set_stack_head so that it does not take command context

Author: krlvi

crates/gitbutler-branch-actions/src/branch_manager/branch_creation.rs

@@ -249,7 +249,12 @@ impl BranchManager<'_> {
         if let (Some(pr_number), Some(head)) = (pr_number, branch.heads().last()) {
             branch.set_pr_number(self.ctx, head, Some(pr_number))?;
         }
-        branch.set_stack_head(self.ctx, head_commit.id(), Some(head_commit_tree.id()))?;
+        branch.set_stack_head(
+            &vb_state,
+            &repo.to_gix()?,
+            head_commit.id(),
+            Some(head_commit_tree.id()),
+        )?;
         self.ctx.add_branch_reference(&branch)?;
 
         match self.apply_branch(branch.id, perm) {
@@ -361,7 +366,8 @@ impl BranchManager<'_> {
             };
 
             stack.set_stack_head(
-                self.ctx,
+                &vb_state,
+                &gix_repo,
                 new_head.id(),
                 Some(repo.find_real_tree(&new_head, Default::default())?.id()),
             )?;

crates/gitbutler-branch-actions/src/branch_upstream_integration.rs

@@ -85,7 +85,7 @@ pub fn integrate_upstream_commits_for_series(
         integrate_upstream_context.inner_integrate_upstream_commits_for_series(series_head.id())?;
 
     let mut branch = stack.clone();
-    branch.set_stack_head(ctx, head, tree)?;
+    branch.set_stack_head(&vb_state, &gix_repo, head, tree)?;
     let new_workspace = WorkspaceState::create(ctx, perm.read_permission())?;
     if ctx.app_settings().feature_flags.v3 {
         update_uncommited_changes(ctx, old_workspace, new_workspace, perm)?;

crates/gitbutler-branch-actions/src/integration.rs

@@ -383,7 +383,8 @@ fn verify_head_is_clean(ctx: &CommandContext, perm: &mut WorktreeWritePermission
         .context("failed to create virtual branch")?;
 
     // rebasing the extra commits onto the new branch
-    let mut head = new_branch.head(&ctx.repo().to_gix()?)?;
+    let gix_repo = ctx.repo().to_gix()?;
+    let mut head = new_branch.head(&gix_repo)?;
     for commit in extra_commits {
         let new_branch_head = ctx
             .repo()
@@ -411,7 +412,12 @@ fn verify_head_is_clean(ctx: &CommandContext, perm: &mut WorktreeWritePermission
             rebased_commit_oid
         ))?;
 
-        new_branch.set_stack_head(ctx, rebased_commit.id(), Some(rebased_commit.tree_id()))?;
+        new_branch.set_stack_head(
+            &vb_handle,
+            &gix_repo,
+            rebased_commit.id(),
+            Some(rebased_commit.tree_id()),
+        )?;
 
         head = rebased_commit.id();
     }

crates/gitbutler-branch-actions/src/move_commits.rs

@@ -9,7 +9,7 @@ use gitbutler_hunk_dependency::locks::HunkDependencyResult;
 use gitbutler_oxidize::{ObjectIdExt, OidExt, RepoExt};
 use gitbutler_project::access::WorktreeWritePermission;
 use gitbutler_stack::stack_context::CommandContextExt;
-use gitbutler_stack::StackId;
+use gitbutler_stack::{StackId, VirtualBranchesHandle};
 use gitbutler_workspace::branch_trees::{update_uncommited_changes, WorkspaceState};
 #[allow(deprecated)]
 use gitbutler_workspace::{checkout_branch_trees, compute_updated_branch_head};
@@ -72,7 +72,7 @@ pub(crate) fn move_commit(
         &workspace_dependencies,
     )?;
 
-    move_commit_to_destination_stack(ctx, repo, destination_stack, subject_commit_oid)?;
+    move_commit_to_destination_stack(&vb_state, ctx, repo, destination_stack, subject_commit_oid)?;
 
     let new_workspace = WorkspaceState::create(ctx, perm.read_permission())?;
     if ctx.app_settings().feature_flags.v3 {
@@ -164,12 +164,14 @@ fn take_commit_from_source_stack(
     };
 
     source_stack.set_heads_from_rebase_output(ctx, output.references)?;
-    source_stack.set_stack_head(ctx, new_head_oid, new_tree_oid)?;
+    let vb_state = ctx.project().virtual_branches();
+    source_stack.set_stack_head(&vb_state, &gix_repo, new_head_oid, new_tree_oid)?;
     Ok(())
 }
 
 /// Move the commit to the destination stack.
 fn move_commit_to_destination_stack(
+    vb_state: &VirtualBranchesHandle,
     ctx: &CommandContext,
     repo: &git2::Repository,
     mut destination_stack: gitbutler_stack::Stack,
@@ -204,6 +206,11 @@ fn move_commit_to_destination_stack(
         };
 
     destination_stack.set_heads_from_rebase_output(ctx, output.references)?;
-    destination_stack.set_stack_head(ctx, new_destination_head_oid, new_destination_tree_oid)?;
+    destination_stack.set_stack_head(
+        vb_state,
+        &gix_repo,
+        new_destination_head_oid,
+        new_destination_tree_oid,
+    )?;
     Ok(())
 }

crates/gitbutler-branch-actions/src/reorder.rs

@@ -81,7 +81,7 @@ pub fn reorder_stack(
     };
 
     // Ensure the stack head is set to the new oid after rebasing
-    stack.set_stack_head(ctx, new_head_oid, new_tree_oid)?;
+    stack.set_stack_head(&state, &gix_repo, new_head_oid, new_tree_oid)?;
 
     stack.set_heads_from_rebase_output(ctx, output.references.clone())?;
 

crates/gitbutler-branch-actions/src/squash.rs

@@ -210,7 +210,7 @@ fn do_squash_commits(
         (res.head, Some(res.tree))
     };
 
-    stack.set_stack_head(ctx, new_head_oid, new_tree_oid)?;
+    stack.set_stack_head(&vb_state, &gix_repo, new_head_oid, new_tree_oid)?;
 
     let new_workspace = WorkspaceState::create(ctx, perm.read_permission())?;
     if ctx.app_settings().feature_flags.v3 {

crates/gitbutler-branch-actions/src/undo_commit.rs

@@ -58,7 +58,7 @@ pub(crate) fn undo_commit(
     }
 
     let new_head = output.top_commit.to_git2();
-    stack.set_stack_head(ctx, new_head, None)?;
+    stack.set_stack_head(&vb_state, &repo, new_head, None)?;
 
     stack.set_heads_from_rebase_output(ctx, output.references)?;
 

crates/gitbutler-branch-actions/src/upstream_integration.rs

@@ -583,7 +583,7 @@ pub(crate) fn integrate_upstream(
             if let Some(output) = rebase_output {
                 stack.set_heads_from_rebase_output(command_context, output.references.clone())?;
             }
-            stack.set_stack_head(command_context, *head, *tree)?;
+            stack.set_stack_head(&virtual_branches_state, &gix_repo, *head, *tree)?;
 
             let delete_local_refs = resolutions
                 .iter()

crates/gitbutler-branch-actions/src/virtual.rs

@@ -696,7 +696,7 @@ pub(crate) fn reset_branch(
     // what hunks were released by this reset, and assign them to this branch.
     let old_head = get_workspace_head(ctx)?;
 
-    stack.set_stack_head(ctx, target_commit_id, None)?;
+    stack.set_stack_head(&vb_state, &gix_repo, target_commit_id, None)?;
 
     let updated_head = get_workspace_head(ctx)?;
     let repo = ctx.repo();
@@ -829,7 +829,7 @@ pub fn commit(
     };
 
     let vb_state = ctx.project().virtual_branches();
-    branch.set_stack_head(ctx, commit_oid, Some(tree_oid))?;
+    branch.set_stack_head(&vb_state, &gix_repo, commit_oid, Some(tree_oid))?;
 
     crate::integration::update_workspace_commit(&vb_state, ctx)
         .context("failed to update gitbutler workspace")?;
@@ -1320,7 +1320,7 @@ pub(crate) fn move_commit_file(
 
     // if there are no upstream commits (the "to" commit was the branch head), then we're done
     if upstream_commits.is_empty() {
-        target_stack.set_stack_head(ctx, commit_oid, None)?;
+        target_stack.set_stack_head(&vb_state, &gix_repo, commit_oid, None)?;
         crate::integration::update_workspace_commit(&vb_state, ctx)?;
         return Ok(commit_oid);
     }
@@ -1331,7 +1331,7 @@ pub(crate) fn move_commit_file(
 
     // if that rebase worked, update the branch head and the gitbutler workspace
     if let Some(new_head) = new_head {
-        target_stack.set_stack_head(ctx, new_head, None)?;
+        target_stack.set_stack_head(&vb_state, &gix_repo, new_head, None)?;
         crate::integration::update_workspace_commit(&vb_state, ctx)?;
         Ok(commit_oid)
     } else {
@@ -1401,7 +1401,7 @@ pub(crate) fn insert_blank_commit(
     let output = rebase.rebase()?;
     stack.set_heads_from_rebase_output(ctx, output.references)?;
 
-    stack.set_stack_head(ctx, output.top_commit.to_git2(), None)?;
+    stack.set_stack_head(&vb_state, &repo, output.top_commit.to_git2(), None)?;
 
     crate::integration::update_workspace_commit(&vb_state, ctx)
         .context("failed to update gitbutler workspace")?;
@@ -1470,7 +1470,7 @@ pub(crate) fn update_commit_message(
     let output = rebase.rebase()?;
 
     let new_head = output.top_commit.to_git2();
-    stack.set_stack_head(ctx, new_head, None)?;
+    stack.set_stack_head(&vb_state, &gix_repo, new_head, None)?;
     stack.set_heads_from_rebase_output(ctx, output.references)?;
 
     crate::integration::update_workspace_commit(&vb_state, ctx)

crates/gitbutler-branch-actions/tests/extra/mod.rs

@@ -851,7 +851,7 @@ fn merge_vbranch_upstream_clean_rebase() -> Result<()> {
         "update target",
     )?;
 
-    branch.set_stack_head(ctx, last_push, None)?;
+    branch.set_stack_head(&vb_state, &ctx.gix_repository()?, last_push, None)?;
 
     // create the branch
     let list_result = internal::list_virtual_branches(ctx, guard.write_permission())?;
@@ -974,7 +974,7 @@ fn merge_vbranch_upstream_conflict() -> Result<()> {
     )?;
 
     branch.upstream = Some(remote_branch.clone());
-    branch.set_stack_head(ctx, last_push, None)?;
+    branch.set_stack_head(&vb_state, &ctx.gix_repository()?, last_push, None)?;
 
     //update repo ref refs/remotes/origin/master to up_target oid
     ctx.repo().reference(