rename Stack::head() to Stack::head_oid()

This makes it similar to `StackBranch::oid()`

Author: Byron

crates/but-workspace/src/commit_engine/mod.rs

@@ -435,7 +435,7 @@ pub fn create_commit_and_update_refs(
                         && !wsc.inner.parents.contains(&branch_tip) /* the branch tip we know isn't yet merged */
                         // but the tip is known to the workspace
                         && vb.branches.values().any(|s| {
-                        s.head(repo)
+                        s.head_oid(repo)
                             .is_ok_and(|head_id| head_id == branch_tip)
                     }) {
                         let mut stacks: Vec<_> = vb

crates/but-workspace/src/commit_engine/reference_frame.rs

@@ -47,12 +47,12 @@ impl ReferenceFrame {
                     .context("Didn't find stack - was it deleted just now?")?;
                 Ok(ReferenceFrame {
                     workspace_tip: Some(head_id.detach()),
-                    branch_tip: Some(stack.head(repo)?),
+                    branch_tip: Some(stack.head_oid(repo)?),
                 })
             }
             InferenceMode::CommitIdInStack(commit_id) => {
                 for stack in vb.branches.values() {
-                    let stack_tip = stack.head(repo)?;
+                    let stack_tip = stack.head_oid(repo)?;
                     if stack_tip
                         .attach(repo)
                         .ancestors()

crates/but-workspace/src/commit_engine/refs.rs

@@ -35,7 +35,7 @@ pub fn rewrite(
                     continue; // Dont rewrite refs for other stacks
                 }
             }
-            if stack.head(repo)? == old {
+            if stack.head_oid(repo)? == old {
                 // Perhaps skip this - the head will be updated later in this call
                 // stack.set_stack_head_without_persisting(repo, new.to_git2(), None)?;
                 // Does it make sense to set stack tree in v3? I think not

crates/but-workspace/src/lib.rs

@@ -140,7 +140,7 @@ impl StackEntry {
         Ok(StackEntry {
             id: stack.id,
             heads: stack_heads_info(stack, repo)?,
-            tip: stack.head(repo)?,
+            tip: stack.head_oid(repo)?,
         })
     }
 }

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

@@ -111,7 +111,7 @@ pub fn create_virtual_branch(
     Ok(StackEntry {
         id: stack.id,
         heads: stack_heads_info(&stack, &repo)?,
-        tip: stack.head(&repo)?,
+        tip: stack.head_oid(&repo)?,
     })
 }
 

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

@@ -82,7 +82,7 @@ fn go_back_to_integration(ctx: &CommandContext, default_target: &Target) -> Resu
     for branch in &virtual_branches {
         // merge this branches tree with our tree
         let branch_tree_id = git2_to_gix_object_id(
-            repo.find_commit(branch.head(&gix_repo)?.to_git2())
+            repo.find_commit(branch.head_oid(&gix_repo)?.to_git2())
                 .context("failed to find branch head")?
                 .tree_id(),
         );

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

@@ -298,7 +298,7 @@ fn branch_group_to_branch(
     // If there is a virtual branch let's get it's head. Alternatively, pick the first local branch and use it's head.
     // If there are no local branches, pick the first remote branch.
     let head_commit = if let Some(vbranch) = virtual_branch {
-        Some(vbranch.head(repo)?.attach(repo))
+        Some(vbranch.head_oid(repo)?.attach(repo))
     } else if let Some(mut branch) = local_branches.into_iter().next() {
         branch.peel_to_id_in_place_packed(packed).ok()
     } else if let Some(mut branch) = remote_branches.into_iter().next() {

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

@@ -289,11 +289,11 @@ impl BranchManager<'_> {
 
         let gix_repo = repo.to_gix()?;
         let merge_base = repo
-            .merge_base(default_target.sha, stack.head(&gix_repo)?.to_git2())
+            .merge_base(default_target.sha, stack.head_oid(&gix_repo)?.to_git2())
             .context(format!(
                 "failed to find merge base between {} and {}",
                 default_target.sha,
-                stack.head(&gix_repo)?
+                stack.head_oid(&gix_repo)?
             ))?;
 
         // Branch is out of date, merge or rebase it
@@ -331,7 +331,7 @@ impl BranchManager<'_> {
         // Do we need to rebase the branch on top of the default target?
 
         let has_change_id = repo
-            .find_commit(stack.head(&gix_repo)?.to_git2())?
+            .find_commit(stack.head_oid(&gix_repo)?.to_git2())?
             .change_id()
             .is_some();
         // If the branch has no change ID for the head commit, we want to rebase it even if the base is the same
@@ -351,7 +351,7 @@ impl BranchManager<'_> {
             } else {
                 gitbutler_merge_commits(
                     repo,
-                    repo.find_commit(stack.head(&gix_repo)?.to_git2())?,
+                    repo.find_commit(stack.head_oid(&gix_repo)?.to_git2())?,
                     repo.find_commit(default_target.sha)?,
                     &stack.name,
                     default_target.branch.branch(),
@@ -378,7 +378,8 @@ impl BranchManager<'_> {
 
         {
             if let Some(wip_commit_to_unapply) = &stack.not_in_workspace_wip_change_id {
-                let potential_wip_commit = repo.find_commit(stack.head(&gix_repo)?.to_git2())?;
+                let potential_wip_commit =
+                    repo.find_commit(stack.head_oid(&gix_repo)?.to_git2())?;
 
                 // Don't try to undo commit if its conflicted
                 if !potential_wip_commit.is_conflicted() {
@@ -387,7 +388,7 @@ impl BranchManager<'_> {
                             stack = crate::undo_commit::undo_commit(
                                 self.ctx,
                                 stack.id,
-                                stack.head(&gix_repo)?.to_git2(),
+                                stack.head_oid(&gix_repo)?.to_git2(),
                                 perm,
                             )?;
                         }

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

@@ -77,7 +77,9 @@ impl BranchManager<'_> {
             let workspace_base = gix_repo
                 .find_commit(workspace_base(self.ctx, perm.read_permission())?)?
                 .tree_id()?;
-            let stack_head = gix_repo.find_commit(stack.head(&gix_repo)?)?.tree_id()?;
+            let stack_head = gix_repo
+                .find_commit(stack.head_oid(&gix_repo)?)?
+                .tree_id()?;
 
             let mut merge = gix_repo.merge_trees(
                 stack_head,
@@ -95,7 +97,7 @@ impl BranchManager<'_> {
                 .context("failed to checkout tree")?;
         } else {
             let gix_repo = self.ctx.gix_repo()?;
-            let head = stack.head(&gix_repo)?;
+            let head = stack.head_oid(&gix_repo)?;
             let head = repo.find_commit(head.to_git2())?;
 
             // If there are uncommited changes, we should make a wip commit.
@@ -128,7 +130,7 @@ impl BranchManager<'_> {
                                 .collect::<Vec<(PathBuf, Vec<VirtualBranchHunk>)>>();
                             let tree_oid = gitbutler_diff::write::hunks_onto_oid(
                                 self.ctx,
-                                stack.head(&gix_repo)?.to_git2(),
+                                stack.head_oid(&gix_repo)?.to_git2(),
                                 files,
                             )?;
                             let mut merge = gix_repo.merge_trees(
@@ -184,7 +186,7 @@ impl BranchManager<'_> {
         // Build wip tree as either any uncommitted changes or an empty tree
         let vbranch_wip_tree = repo.find_tree(stack.tree(self.ctx)?)?;
         let vbranch_head_tree = repo
-            .find_commit(stack.head(&repo.to_gix()?)?.to_git2())?
+            .find_commit(stack.head_oid(&repo.to_gix()?)?.to_git2())?
             .tree()?;
 
         let tree = if vbranch_head_tree.id() != vbranch_wip_tree.id() {
@@ -201,7 +203,7 @@ impl BranchManager<'_> {
         // Commit wip commit
         let committer = gitbutler_repo::signature(SignaturePurpose::Committer)?;
         let author = gitbutler_repo::signature(SignaturePurpose::Author)?;
-        let parent = stack.head(&gix_repo)?;
+        let parent = stack.head_oid(&gix_repo)?;
         let parent = repo.find_commit(parent.to_git2())?;
 
         let commit_headers = CommitHeadersV2::new();

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

@@ -66,7 +66,7 @@ pub fn integrate_upstream_commits_for_series(
     let integrate_upstream_context = IntegrateUpstreamContext {
         repo,
         target_branch_head: default_target.sha,
-        branch_head: stack.head(&gix_repo)?.to_git2(),
+        branch_head: stack.head_oid(&gix_repo)?.to_git2(),
         branch_tree: stack.tree(ctx)?,
         branch_name: subject_branch.name(),
         branch_full_name: subject_branch.full_name()?,