Update to gix with the latest improvements for nicer merge-related APIs

Author: Byron

Cargo.lock

@@ -42,7 +42,7 @@ resolver = "2"
 [workspace.dependencies]
 bstr = "1.10.0"
 # Add the `tracing` or `tracing-detail` features to see more of gitoxide in the logs. Useful to see which programs it invokes.
-gix = { git = "https://github.com/Byron/gitoxide", rev = "3fb989be21c739bbfeac93953c1685e7c6cd2106", default-features = false, features = [
+gix = { git = "https://github.com/Byron/gitoxide", rev = "a8765330fc16997dee275866b18a128dec1c5d55", default-features = false, features = [
 ] }
 git2 = { version = "0.19.0", features = [
     "vendored-openssl",

Cargo.toml

@@ -9,7 +9,7 @@ publish = false
 tracing.workspace = true
 anyhow = "1.0.92"
 git2.workspace = true
-gix = { workspace = true, features = ["blob-diff", "revision", "blob-merge"] }
+gix = { workspace = true, features = ["blob-diff", "revision", "merge"] }
 tokio.workspace = true
 gitbutler-oplog.workspace = true
 gitbutler-repo.workspace = true

crates/gitbutler-branch-actions/Cargo.toml

@@ -17,7 +17,6 @@ use gitbutler_reference::{Refname, RemoteRefname};
 use gitbutler_repo::{GixRepositoryExt, LogUntil, RepositoryExt};
 use gitbutler_repo_actions::RepoActionsExt;
 use gitbutler_stack::{BranchOwnershipClaims, Stack, Target, VirtualBranchesHandle};
-use gix::prelude::Write;
 use serde::Serialize;
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
@@ -93,10 +92,7 @@ fn go_back_to_integration(ctx: &CommandContext, default_target: &Target) -> Resu
         if merge.has_unresolved_conflicts(conflict_kind) {
             bail!("Merge failed with conflicts");
         }
-        final_tree_id = merge
-            .tree
-            .write(|tree| gix_repo.write(tree))
-            .map_err(|err| anyhow!("failed to write tree: {err}"))?;
+        final_tree_id = merge.tree.write()?.detach();
     }
 
     let final_tree = repo.find_tree(gix_to_git2_oid(final_tree_id))?;

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

@@ -14,7 +14,6 @@ use gitbutler_repo::RepositoryExt;
 use gitbutler_repo::SignaturePurpose;
 use gitbutler_repo_actions::RepoActionsExt;
 use gitbutler_stack::{Stack, StackId};
-use gix::objs::Write;
 use tracing::instrument;
 
 use super::BranchManager;
@@ -128,10 +127,7 @@ impl BranchManager<'_> {
                             gix_repo.default_merge_labels(),
                             merge_options.clone(),
                         )?;
-                        let final_tree_id = merge
-                            .tree
-                            .write(|tree| gix_repo.write(tree))
-                            .map_err(|err| anyhow::anyhow!("Could not write merged tree: {err}"))?;
+                        let final_tree_id = merge.tree.write()?.detach();
                         Ok(final_tree_id)
                     },
                 )?;

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

@@ -1,5 +1,5 @@
 use crate::VirtualBranchesExt as _;
-use anyhow::{anyhow, bail, Result};
+use anyhow::{bail, Result};
 use gitbutler_cherry_pick::RepositoryExt;
 use gitbutler_command_context::CommandContext;
 use gitbutler_commit::commit_ext::CommitExt as _;
@@ -8,7 +8,6 @@ use gitbutler_project::access::WorktreeWritePermission;
 use gitbutler_repo::rebase::cherry_rebase_group;
 use gitbutler_repo::{GixRepositoryExt, RepositoryExt as _};
 use gitbutler_stack::Stack;
-use gix::prelude::Write;
 use tracing::instrument;
 
 /// Checks out the combined trees of all branches in the workspace.
@@ -61,10 +60,7 @@ pub fn checkout_branch_trees<'a>(
                 bail!("There appears to be conflicts between the virtual branches");
             };
 
-            final_tree_id = merge
-                .tree
-                .write(|tree| gix_repo.write(tree))
-                .map_err(|err| anyhow!("{err}"))?;
+            final_tree_id = merge.tree.write()?.detach();
         }
 
         let final_tree = repository.find_tree(gix_to_git2_oid(final_tree_id))?;

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

@@ -14,7 +14,6 @@ use gitbutler_project::access::WorktreeWritePermission;
 use gitbutler_repo::{GixRepositoryExt, SignaturePurpose};
 use gitbutler_repo::{LogUntil, RepositoryExt};
 use gitbutler_stack::{Stack, VirtualBranchesHandle};
-use gix::objs::Write;
 use tracing::instrument;
 
 use crate::{branch_manager::BranchManagerExt, conflicts, VirtualBranchesExt};
@@ -69,10 +68,7 @@ pub(crate) fn get_workspace_head(ctx: &CommandContext) -> Result<git2::Oid> {
             )?;
 
             if !merge.has_unresolved_conflicts(conflict_kind) {
-                workspace_tree_id = merge
-                    .tree
-                    .write(|tree| gix_repo.write(tree))
-                    .map_err(|err| anyhow!("{err}"))?;
+                workspace_tree_id = merge.tree.write()?.detach();
             } else {
                 // This branch should have already been unapplied during the "update" command but for some reason that failed
                 tracing::warn!("Merge conflict between base and {:?}", branch.name);

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

@@ -13,7 +13,6 @@ use gitbutler_repo::{
 };
 use gitbutler_repo_actions::RepoActionsExt as _;
 use gitbutler_stack::{Stack, StackId, Target, VirtualBranchesHandle};
-use gix::prelude::Write;
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, PartialEq, Debug)]
@@ -229,15 +228,13 @@ pub fn upstream_integration_statuses(
             {
                 if tree_merge.has_unresolved_conflicts(conflict_kind) {
                     bail!(
-                        "Merge result unexpectedly has conflicts between base, ours, theirs: {old_target_tree_id}, {new_target_tree_id}, {tree_id}"
+                        "Merge result unexpectedly has conflicts between base, \
+                         ours, theirs: {old_target_tree_id}, {new_target_tree_id}, {tree_id}"
                     )
                 }
                 // We're safe to write the tree as we've ensured it's
                 // unconflicted in the previous test.
-                let tree_merge_index_tree_id = tree_merge
-                    .tree
-                    .write(|tree| gix_repo.write(tree))
-                    .map_err(|err| anyhow!("{err}"))?;
+                let tree_merge_index_tree_id = tree_merge.tree.write()?.detach();
 
                 // Identical trees will have the same Oid so we can compare the two
                 if tree_merge_index_tree_id == new_target_tree_id {

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

@@ -33,7 +33,6 @@ use gitbutler_stack::{
     VirtualBranchesHandle,
 };
 use gitbutler_time::time::now_since_unix_epoch_ms;
-use gix::objs::Write;
 use serde::Serialize;
 use std::collections::HashSet;
 use std::{collections::HashMap, path::PathBuf, vec};
@@ -203,10 +202,7 @@ pub fn unapply_ownership(
             if merge.has_unresolved_conflicts(conflict_kind) {
                 bail!("Tree has conflicts after merge")
             }
-            merge
-                .tree
-                .write(|tree| gix_repo.write(tree))
-                .map_err(|err| anyhow!("Could not write merged tree: {err}"))
+            Ok(merge.tree.write()?.detach())
         },
     )?;
 
@@ -1063,10 +1059,7 @@ impl IsCommitIntegrated<'_, '_, '_> {
             return Ok(false);
         }
 
-        let merge_tree_id = merge_output
-            .tree
-            .write(|tree| self.gix_repo.write(tree))
-            .map_err(|err| anyhow!("failed to write tree: {err}"))?;
+        let merge_tree_id = merge_output.tree.write()?.detach();
 
         // if the merge_tree is the same as the new_target_tree and there are no files (uncommitted changes)
         // then the vbranch is fully merged

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

@@ -25,7 +25,7 @@ use gitbutler_repo::{GixRepositoryExt, RepositoryExt};
 use gitbutler_stack::{Stack, VirtualBranchesHandle, VirtualBranchesState};
 use gix::bstr::ByteSlice;
 use gix::object::tree::diff::Change;
-use gix::prelude::{ObjectIdExt, Write};
+use gix::prelude::ObjectIdExt;
 use tracing::instrument;
 
 const SNAPSHOT_FILE_LIMIT_BYTES: u64 = 32 * 1024 * 1024;
@@ -860,10 +860,7 @@ fn tree_from_applied_vbranches(
         if merge.has_unresolved_conflicts(conflict_kind) {
             tracing::warn!("Failed to merge tree {branch_id} - this branch is probably applied at a time when it should not be");
         } else {
-            let id = merge
-                .tree
-                .write(|tree| repo.write(tree))
-                .map_err(|err| anyhow!("{err}"))?;
+            let id = merge.tree.write()?.detach();
             workdir_tree_id = id;
             current_ours_id = id;
         }