Merge pull request #11113 from Byron/fix

Reconcile stacks for the `gitbutler/workspace`, not for the HEAD workspace.

Author: Byron

crates/but-api/src/commands/stack.rs

@@ -81,7 +81,8 @@ pub fn create_reference(
         .transpose()?;
 
     let mut guard = ctx.project().exclusive_worktree_access();
-    let (repo, mut meta, graph) = ctx.graph_and_meta_mut_and_repo(guard.write_permission())?;
+    let (repo, mut meta, graph) =
+        ctx.graph_and_meta_mut_and_repo_from_head(guard.write_permission())?;
     let graph = but_workspace::branch::create_reference(
         new_ref.clone(),
         anchor,
@@ -112,7 +113,8 @@ pub fn create_branch(
     if ctx.app_settings().feature_flags.ws3 {
         use but_workspace::branch::create_reference::Position::Above;
         let mut guard = project.exclusive_worktree_access();
-        let (repo, mut meta, graph) = ctx.graph_and_meta_mut_and_repo(guard.write_permission())?;
+        let (repo, mut meta, graph) =
+            ctx.graph_and_meta_mut_and_repo_from_head(guard.write_permission())?;
         let ws = graph.to_workspace()?;
         let stack = ws.try_find_stack_by_id(stack_id)?;
         let new_ref = Category::LocalBranch
@@ -176,7 +178,8 @@ pub fn remove_branch(
     let ctx = CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
     let mut guard = project.exclusive_worktree_access();
     if ctx.app_settings().feature_flags.ws3 {
-        let (repo, mut meta, graph) = ctx.graph_and_meta_mut_and_repo(guard.write_permission())?;
+        let (repo, mut meta, graph) =
+            ctx.graph_and_meta_mut_and_repo_from_head(guard.write_permission())?;
         let ws = graph.to_workspace()?;
         let ref_name = Category::LocalBranch
             .to_full_name(branch_name.as_str())

crates/but-api/src/commands/virtual_branches.rs

@@ -45,7 +45,8 @@ pub fn create_virtual_branch(
     let ws3_enabled = ctx.app_settings().feature_flags.ws3;
     let stack_entry = if ws3_enabled {
         let mut guard = project.exclusive_worktree_access();
-        let (repo, mut meta, graph) = ctx.graph_and_meta_mut_and_repo(guard.write_permission())?;
+        let (repo, mut meta, graph) =
+            ctx.graph_and_meta_mut_and_repo_from_head(guard.write_permission())?;
         let ws = graph.to_workspace()?;
         let new_ref = Category::LocalBranch
             .to_full_name(

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

@@ -155,7 +155,7 @@ impl BranchManager<'_> {
         // Assume that this is always about 'apply' and hijack the entire method.
         // That way we'd learn what's missing.
         if self.ctx.app_settings().feature_flags.apply3 {
-            let (repo, mut meta, graph) = self.ctx.graph_and_meta_mut_and_repo(perm)?;
+            let (repo, mut meta, graph) = self.ctx.graph_and_meta_mut_and_repo_from_head(perm)?;
             let ws = graph.to_workspace()?;
             let target = target.to_string();
             let branch_to_apply = target.as_str().try_into()?;

crates/gitbutler-command-context/src/lib.rs

@@ -142,7 +142,7 @@ impl CommandContext {
     /// for until the end of the operation for the protection to be effective.
     ///
     /// Use [`Self::graph_and_meta()`] if control over the repository configuration is needed.
-    pub fn graph_and_meta_mut_and_repo(
+    pub fn graph_and_meta_mut_and_repo_from_head(
         &self,
         _write: &mut WorktreeWritePermission,
     ) -> Result<(
@@ -156,6 +156,35 @@ impl CommandContext {
         Ok((repo, VirtualBranchesTomlMetadataMut(meta), graph))
     }
 
+    /// Open the repository with standard options and create a new Graph traversal from the given `ref_name`,
+    /// along with a new metadata instance, and the graph itself.
+    ///
+    /// The write-permission is required to obtain a mutable metadata instance. Note that it must be held
+    /// for until the end of the operation for the protection to be effective.
+    ///
+    /// Use [`Self::graph_and_meta()`] if control over the repository configuration is needed.
+    pub fn graph_and_meta_mut_and_repo_from_reference(
+        &self,
+        ref_name: &gix::refs::FullNameRef,
+        _write: &mut WorktreeWritePermission,
+    ) -> Result<(
+        gix::Repository,
+        VirtualBranchesTomlMetadataMut,
+        but_graph::Graph,
+    )> {
+        let repo = self.gix_repo()?;
+        let meta = self.meta_inner()?;
+        let mut reference = repo.find_reference(ref_name)?;
+        let commit_id = reference.peel_to_commit()?.id();
+        let graph = but_graph::Graph::from_commit_traversal(
+            commit_id,
+            reference.name().to_owned(),
+            &meta,
+            meta.graph_options(),
+        )?;
+        Ok((repo, VirtualBranchesTomlMetadataMut(meta), graph))
+    }
+
     /// Return a newly opened `gitoxide` repository, with all configuration available
     /// to correctly figure out author and committer names (i.e. with most global configuration loaded),
     /// *and* which will perform diffs quickly thanks to an adequate object cache.

crates/gitbutler-tauri/src/projects.rs

@@ -105,7 +105,14 @@ pub fn set_project_active(
 fn reconcile_in_workspace_state_of_vb_toml(ctx: &mut CommandContext) -> Option<()> {
     let mut guard = ctx.project().exclusive_worktree_access();
     let perm = guard.write_permission();
-    let (_repo, mut meta, graph) = ctx.graph_and_meta_mut_and_repo(perm).ok()?;
+    let (_repo, mut meta, graph) = ctx
+        .graph_and_meta_mut_and_repo_from_reference(
+            "refs/heads/gitbutler/workspace"
+                .try_into()
+                .expect("statically known to be valid"),
+            perm,
+        )
+        .ok()?;
     let ws = graph.to_workspace().ok()?;
 
     let mut seen = BTreeSet::new();