Actually use the top stacked branch for stack head

Author: krlvi

Cargo.lock

@@ -43,7 +43,7 @@ pub fn locks(current_dir: &Path) -> anyhow::Result<()> {
     let worktree_changes = but_core::diff::worktree_changes(&repo)?;
     let input_stacks = but_hunk_dependency::workspace_stacks_to_input_stacks(
         &repo,
-        &but_workspace::stacks(&project.gb_dir())?,
+        &but_workspace::stacks(&project.gb_dir(), &repo)?,
         but_workspace::common_merge_base_with_target_branch(&project.gb_dir())?,
     )?;
     let ranges = but_hunk_dependency::WorkspaceRanges::try_from_stacks(input_stacks)?;

crates/but-cli/src/command/diff.rs

@@ -116,7 +116,9 @@ pub mod stacks {
 
     pub fn list(current_dir: &Path) -> anyhow::Result<()> {
         let project = project_from_path(current_dir)?;
-        debug_print(but_workspace::stacks(&project.gb_dir()))
+        let ctx = CommandContext::open(&project, AppSettings::default())?;
+        let repo = ctx.gix_repository()?;
+        debug_print(but_workspace::stacks(&project.gb_dir(), &repo))
     }
 
     pub fn branches(id: &str, current_dir: &Path) -> anyhow::Result<()> {

crates/but-cli/src/command/mod.rs

@@ -14,7 +14,7 @@ pub fn hunk_dependencies_for_workspace_changes_by_worktree_dir(
 ) -> anyhow::Result<HunkDependencies> {
     let repo = gix::open(worktree_dir).map_err(anyhow::Error::from)?;
     let worktree_changes = but_core::diff::worktree_changes(&repo)?;
-    let stacks = but_workspace::stacks(gitbutler_dir)?;
+    let stacks = but_workspace::stacks(gitbutler_dir, &repo)?;
     let common_merge_base = gitbutler_stack::VirtualBranchesHandle::new(gitbutler_dir)
         .get_default_target()?
         .sha;

crates/but-hunk-dependency/src/ui.rs

@@ -241,7 +241,7 @@ mod util {
 
     fn test_ctx_at(script_name: &str, name: &str) -> anyhow::Result<TestContext> {
         let ctx = gitbutler_testsupport::read_only::fixture(script_name, name)?;
-        let stacks = but_workspace::stacks(&ctx.project().gb_dir())?;
+        let stacks = but_workspace::stacks(&ctx.project().gb_dir(), &ctx.gix_repository()?)?;
 
         Ok(TestContext {
             repo: gix::open_opts(&ctx.project().path, gix::open::Options::isolated())?,

crates/but-hunk-dependency/tests/hunk_dependency/ui.rs

@@ -901,7 +901,7 @@ mod util {
 
     fn test_ctx_at(script_name: &str, name: &str) -> anyhow::Result<TestContext> {
         let ctx = gitbutler_testsupport::read_only::fixture(script_name, name)?;
-        let stacks = but_workspace::stacks(&ctx.project().gb_dir())?;
+        let stacks = but_workspace::stacks(&ctx.project().gb_dir(), &ctx.gix_repository()?)?;
         let handle = VirtualBranchesHandle::new(ctx.project().gb_dir());
 
         Ok(TestContext {

crates/but-hunk-dependency/tests/hunk_dependency/workspace_dependencies.rs

@@ -56,12 +56,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()?.to_gix()),
+                    branch_tip: Some(stack.head(repo)?.to_gix()),
                 })
             }
             InferenceMode::CommitIdInStack(commit_id) => {
                 for stack in vb.branches.values() {
-                    let stack_tip = stack.head()?.to_gix();
+                    let stack_tip = stack.head(repo)?.to_gix();
                     if stack_tip
                         .attach(repo)
                         .ancestors()

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

@@ -34,7 +34,7 @@ pub fn rewrite(
                     continue; // Dont rewrite refs for other stacks
                 }
             }
-            if stack.head()? == old_git2 {
+            if stack.head(repo)? == old_git2 {
                 stack.set_head(new.to_git2());
                 stack.tree = new
                     .attach(repo)

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

@@ -127,7 +127,7 @@ impl StackEntry {
 /// If the GitButler state file in the provided path is missing or invalid, an error is returned.
 ///
 /// - `gb_dir`: The path to the GitButler state for the project. Normally this is `.git/gitbutler` in the project's repository.
-pub fn stacks(gb_dir: &Path) -> Result<Vec<StackEntry>> {
+pub fn stacks(gb_dir: &Path, repo: &gix::Repository) -> Result<Vec<StackEntry>> {
     let state = state_handle(gb_dir);
 
     state
@@ -138,7 +138,7 @@ pub fn stacks(gb_dir: &Path) -> Result<Vec<StackEntry>> {
             Ok(StackEntry {
                 id: stack.id,
                 branch_names: stack.heads().into_iter().map(Into::into).collect(),
-                tip: stack.head().map(|h| h.to_gix())?,
+                tip: stack.head(repo).map(|h| h.to_gix())?,
             })
         })
         .collect()

crates/but-workspace/src/lib.rs

@@ -1103,7 +1103,7 @@ mod utils {
         for stack in vbranches.branches.values() {
             repo.reference(
                 format!("refs/heads/{}", stack.name),
-                stack.head()?.to_gix(),
+                stack.head(repo)?.to_gix(),
                 PreviousValue::Any,
                 "create stack head for visualization",
             )?;