cherry-pick: drop git2 real-tree adapter

Co-authored-by: Sebastian Thiel <sebastian.thiel@icloud.com>

Author: codex

Cargo.lock

@@ -10,11 +10,8 @@ rust-version.workspace = true
 doctest = false
 
 [dependencies]
-but-oxidize.workspace = true
-
 gitbutler-commit.workspace = true
 
-git2.workspace = true
 gix.workspace = true
 anyhow.workspace = true
 

crates/gitbutler-cherry-pick/Cargo.toml

@@ -1,7 +1,6 @@
 use std::ops::Deref;
 
 use anyhow::{Context as _, Result};
-use but_oxidize::{ObjectIdExt as _, OidExt, RepoExt};
 use gitbutler_commit::commit_ext::CommitExt;
 
 #[derive(Default)]
@@ -33,19 +32,6 @@ impl Deref for ConflictedTreeKey {
     }
 }
 
-pub trait RepositoryExt {
-    /// Find the real tree of a commit, which is the tree of the commit if it's not in a conflicted state
-    /// or the tree according to `side` if it is conflicted.
-    ///
-    /// Unless you want to find a particular side, you likely want to pass Default::default()
-    /// as the [`side`](ConflictedTreeKey) which will give the automatically resolved resolution
-    fn find_real_tree(
-        &self,
-        commit: &git2::Commit,
-        side: ConflictedTreeKey,
-    ) -> Result<git2::Tree<'_>>;
-}
-
 pub trait GixRepositoryExt {
     /// Find the real tree of a commit, which is the tree of the commit if it's not in a conflicted state
     /// or the tree according to `side` if it is conflicted.
@@ -59,19 +45,6 @@ pub trait GixRepositoryExt {
     ) -> Result<gix::Id<'repo>>;
 }
 
-impl RepositoryExt for git2::Repository {
-    fn find_real_tree(
-        &self,
-        commit: &git2::Commit,
-        side: ConflictedTreeKey,
-    ) -> Result<git2::Tree<'_>> {
-        let gix_repo = self.to_isolated_gix_repo()?;
-        let gix_commit = gix_repo.find_commit(commit.id().to_gix())?;
-        let tree_id = gix_repo.find_real_tree(&gix_commit, side)?.to_git2();
-        Ok(self.find_tree(tree_id)?)
-    }
-}
-
 impl GixRepositoryExt for gix::Repository {
     fn find_real_tree<'repo>(
         &'repo self,

crates/gitbutler-cherry-pick/src/lib.rs

@@ -10,10 +10,10 @@ use but_ctx::{
     Context,
     access::{RepoExclusive, RepoShared},
 };
-use but_oxidize::{ObjectIdExt as _, OidExt, gix_to_git2_index};
+use but_oxidize::{ObjectIdExt as _, gix_to_git2_index};
 use but_rebase::graph_rebase::{Editor, Pick, Step};
 use git2::build::CheckoutBuilder;
-use gitbutler_cherry_pick::{ConflictedTreeKey, GixRepositoryExt as _, RepositoryExt as _};
+use gitbutler_cherry_pick::{ConflictedTreeKey, GixRepositoryExt as _};
 use gitbutler_commit::commit_ext::CommitExt;
 use gitbutler_operating_modes::{
     EDIT_BRANCH_REF, EditModeMetadata, INTEGRATION_BRANCH_REF, OperatingMode, WORKSPACE_BRANCH_REF,
@@ -364,16 +364,20 @@ pub(crate) fn starting_index_state(
         bail!("Starting index state can only be fetched while in edit mode")
     };
 
-    #[expect(deprecated, reason = "conflicted tree lookup boundary")]
-    let git2_repo = &*ctx.git2_repo.get()?;
     let repo = &*ctx.repo.get()?;
-
-    let commit = git2_repo.find_commit(metadata.commit_oid.to_git2())?;
-    let gix_commit = repo.find_commit(commit.id().to_gix())?;
+    let gix_commit = repo.find_commit(metadata.commit_oid)?;
     let commit_parent_tree = if gix_commit.is_conflicted() {
-        git2_repo.find_real_tree(&commit, ConflictedTreeKey::Base)?
+        repo.find_real_tree(&gix_commit, ConflictedTreeKey::Base)?
+            .detach()
     } else {
-        commit.parent(0)?.tree()?
+        gix_commit
+            .parent_ids()
+            .next()
+            .context("edited commit had no parent")?
+            .object()?
+            .try_into_commit()?
+            .tree_id()?
+            .detach()
     };
 
     let index = get_commit_index(ctx, metadata.commit_oid)?;
@@ -407,11 +411,9 @@ pub(crate) fn starting_index_state(
 
     let tree_changes = but_core::diff::tree_changes(
         &repo,
-        Some(commit_parent_tree.id().to_gix()),
-        git2_repo
-            .find_real_tree(&commit, ConflictedTreeKey::Theirs)?
-            .id()
-            .to_gix(),
+        Some(commit_parent_tree),
+        repo.find_real_tree(&gix_commit, ConflictedTreeKey::Theirs)?
+            .detach(),
     )?;
 
     let outcome = tree_changes

crates/gitbutler-edit-mode/src/lib.rs

@@ -6,7 +6,7 @@ use but_core::{
     commit::{ConflictEntries, Headers},
 };
 use but_oxidize::{ObjectIdExt as _, OidExt as _};
-use gitbutler_cherry_pick::{ConflictedTreeKey, RepositoryExt as _};
+use gitbutler_cherry_pick::{ConflictedTreeKey, GixRepositoryExt as _};
 
 use crate::RepositoryExt as _;
 
@@ -87,25 +87,26 @@ pub fn merge_commits(
     incoming_commit: gix::ObjectId,
     resulting_name: &str,
 ) -> Result<gix::ObjectId> {
-    let repo = git2::Repository::open(gix_repository.path())?;
-    let target_commit = repo.find_commit(target_commit.to_git2())?;
-    let incoming_commit = repo.find_commit(incoming_commit.to_git2())?;
-    let merge_base = repo.merge_base(target_commit.id(), incoming_commit.id())?;
-    let merge_base = repo.find_commit(merge_base)?;
+    let target_commit = gix_repository.find_commit(target_commit)?;
+    let incoming_commit = gix_repository.find_commit(incoming_commit)?;
+    let merge_base = gix_repository.merge_base(target_commit.id, incoming_commit.id)?;
+    let merge_base = gix_repository.find_commit(merge_base.detach())?;
 
-    let base_tree = repo.find_real_tree(&merge_base, Default::default())?;
+    let base_tree = gix_repository.find_real_tree(&merge_base, Default::default())?;
     // We want to use the auto-resolution when computing the merge, but for
     // reconstructing it later, we want the "theirsiest" and "oursiest" trees
-    let target_tree = repo.find_real_tree(&target_commit, ConflictedTreeKey::Theirs)?;
-    let incoming_tree = repo.find_real_tree(&incoming_commit, ConflictedTreeKey::Ours)?;
+    let target_tree = gix_repository.find_real_tree(&target_commit, ConflictedTreeKey::Theirs)?;
+    let incoming_tree = gix_repository.find_real_tree(&incoming_commit, ConflictedTreeKey::Ours)?;
 
-    let target_merge_tree = repo.find_real_tree(&target_commit, Default::default())?;
-    let incoming_merge_tree = repo.find_real_tree(&incoming_commit, Default::default())?;
-    let gix_repo = but_core::open_repo_for_merging(repo.path())?;
+    let target_merge_tree = gix_repository.find_real_tree(&target_commit, Default::default())?;
+    let incoming_merge_tree =
+        gix_repository.find_real_tree(&incoming_commit, Default::default())?;
+    let repo = git2::Repository::open(gix_repository.path())?;
+    let gix_repo = gix_repository.clone().for_tree_diffing()?;
     let mut merge_result = gix_repo.merge_trees(
-        base_tree.id().to_gix(),
-        incoming_merge_tree.id().to_gix(),
-        target_merge_tree.id().to_gix(),
+        base_tree.detach(),
+        incoming_merge_tree.detach(),
+        target_merge_tree.detach(),
         gix_repo.default_merge_labels(),
         gix_repo.merge_options_force_ours()?,
     )?;
@@ -126,9 +127,21 @@ pub fn merge_commits(
         let mut tree_writer = repo.treebuilder(Some(&auto_resolution_tree))?;
 
         // save the state of the conflict, so we can recreate it later
-        tree_writer.insert(&*ConflictedTreeKey::Ours, incoming_tree.id(), 0o040000)?;
-        tree_writer.insert(&*ConflictedTreeKey::Theirs, target_tree.id(), 0o040000)?;
-        tree_writer.insert(&*ConflictedTreeKey::Base, base_tree.id(), 0o040000)?;
+        tree_writer.insert(
+            &*ConflictedTreeKey::Ours,
+            incoming_tree.detach().to_git2(),
+            0o040000,
+        )?;
+        tree_writer.insert(
+            &*ConflictedTreeKey::Theirs,
+            target_tree.detach().to_git2(),
+            0o040000,
+        )?;
+        tree_writer.insert(
+            &*ConflictedTreeKey::Base,
+            base_tree.detach().to_git2(),
+            0o040000,
+        )?;
         tree_writer.insert(
             &*ConflictedTreeKey::AutoResolution,
             merged_tree_id.to_git2(),
@@ -154,6 +167,8 @@ pub fn merge_commits(
     };
 
     let (author, committer) = repo.signatures()?;
+    let target_commit = repo.find_commit(target_commit.id.to_git2())?;
+    let incoming_commit = repo.find_commit(incoming_commit.id.to_git2())?;
     let commit_oid = crate::RepositoryExt::commit_with_signature(
         &repo,
         None,