Merge pull request #5722 from Byron/finalize-merge-integration

finalize gix-merge integration

Author: Byron

Cargo.lock

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

Cargo.toml

@@ -11,10 +11,10 @@ use anyhow::{anyhow, bail, Context, Result};
 use gitbutler_branch::GITBUTLER_WORKSPACE_REFERENCE;
 use gitbutler_command_context::CommandContext;
 use gitbutler_error::error::Marker;
-use gitbutler_oxidize::{git2_to_gix_object_id, gix_to_git2_oid};
+use gitbutler_oxidize::{git2_to_gix_object_id, gix_to_git2_oid, GixRepositoryExt};
 use gitbutler_project::FetchResult;
 use gitbutler_reference::{Refname, RemoteRefname};
-use gitbutler_repo::{GixRepositoryExt, LogUntil, RepositoryExt};
+use gitbutler_repo::{LogUntil, RepositoryExt};
 use gitbutler_repo_actions::RepoActionsExt;
 use gitbutler_stack::{BranchOwnershipClaims, Stack, Target, VirtualBranchesHandle};
 use serde::Serialize;

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

@@ -7,11 +7,11 @@ use gitbutler_branch::BranchIdentity;
 use gitbutler_branch::ReferenceExtGix;
 use gitbutler_command_context::CommandContext;
 use gitbutler_diff::DiffByPathMap;
-use gitbutler_oxidize::{git2_to_gix_object_id, gix_to_git2_oid};
+use gitbutler_oxidize::{git2_to_gix_object_id, gix_to_git2_oid, GixRepositoryExt};
 use gitbutler_project::access::WorktreeReadPermission;
 use gitbutler_reference::normalize_branch_name;
 use gitbutler_reference::RemoteRefname;
-use gitbutler_repo::{GixRepositoryExt, RepositoryExt as _};
+use gitbutler_repo::RepositoryExt as _;
 use gitbutler_serde::BStringForFrontend;
 use gitbutler_stack::{Stack as GitButlerBranch, StackId, Target};
 use gix::object::tree::diff::Action;

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

@@ -1,14 +1,19 @@
+use super::BranchManager;
 use crate::r#virtual as vbranch;
+use crate::{
+    conflicts::RepoConflictsExt, hunk::VirtualBranchHunk, integration::update_workspace_commit,
+    VirtualBranchesExt,
+};
 use anyhow::{anyhow, bail, Context, Result};
 use gitbutler_branch::BranchCreateRequest;
 use gitbutler_branch::{self, dedup};
 use gitbutler_cherry_pick::RepositoryExt as _;
 use gitbutler_commit::{commit_ext::CommitExt, commit_headers::HasCommitHeaders};
 use gitbutler_error::error::Marker;
 use gitbutler_oplog::SnapshotExt;
+use gitbutler_oxidize::GixRepositoryExt;
 use gitbutler_project::access::WorktreeWritePermission;
 use gitbutler_reference::{Refname, RemoteRefname};
-use gitbutler_repo::GixRepositoryExt;
 use gitbutler_repo::{
     rebase::{cherry_rebase_group, gitbutler_merge_commits},
     LogUntil, RepositoryExt,
@@ -19,12 +24,6 @@ use gitbutler_time::time::now_since_unix_epoch_ms;
 use gitbutler_workspace::checkout_branch_trees;
 use tracing::instrument;
 
-use super::BranchManager;
-use crate::{
-    conflicts::RepoConflictsExt, hunk::VirtualBranchHunk, integration::update_workspace_commit,
-    VirtualBranchesExt,
-};
-
 impl BranchManager<'_> {
     #[instrument(level = tracing::Level::DEBUG, skip(self, perm), err(Debug))]
     pub fn create_virtual_branch(

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

@@ -5,11 +5,10 @@ use git2::Commit;
 use gitbutler_branch::BranchExt;
 use gitbutler_commit::commit_headers::CommitHeadersV2;
 use gitbutler_oplog::SnapshotExt;
-use gitbutler_oxidize::git2_to_gix_object_id;
 use gitbutler_oxidize::gix_to_git2_oid;
+use gitbutler_oxidize::{git2_to_gix_object_id, GixRepositoryExt};
 use gitbutler_project::access::WorktreeWritePermission;
 use gitbutler_reference::{normalize_branch_name, ReferenceName, Refname};
-use gitbutler_repo::GixRepositoryExt;
 use gitbutler_repo::RepositoryExt;
 use gitbutler_repo::SignaturePurpose;
 use gitbutler_repo_actions::RepoActionsExt;

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

@@ -1083,7 +1083,7 @@ mod test {
         fn hard_reset_to_externally_amended_commit() {
             let test_repository = TestingRepository::open();
 
-            let base_commit = dbg!(test_repository.commit_tree(None, &[]));
+            let base_commit = test_repository.commit_tree(None, &[]);
             let local_a = test_repository.commit_tree_with_message(
                 Some(&base_commit),
                 "A",
@@ -1145,7 +1145,7 @@ mod test {
         fn hard_reset_to_externally_removed_commit() {
             let test_repository = TestingRepository::open();
 
-            let base_commit = dbg!(test_repository.commit_tree(None, &[]));
+            let base_commit = test_repository.commit_tree(None, &[]);
             let local_a = test_repository.commit_tree_with_message(
                 Some(&base_commit),
                 "A",
@@ -1212,7 +1212,7 @@ mod test {
         fn hard_reset_to_externally_amended_branch() {
             let test_repository = TestingRepository::open();
 
-            let base_commit = dbg!(test_repository.commit_tree(None, &[]));
+            let base_commit = test_repository.commit_tree(None, &[]);
             let local_a = test_repository.commit_tree_with_message(
                 Some(&base_commit),
                 "A",

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

@@ -9,9 +9,9 @@ use gitbutler_command_context::CommandContext;
 use gitbutler_commit::commit_ext::CommitExt;
 use gitbutler_error::error::Marker;
 use gitbutler_operating_modes::OPEN_WORKSPACE_REFS;
-use gitbutler_oxidize::{git2_to_gix_object_id, gix_to_git2_oid};
+use gitbutler_oxidize::{git2_to_gix_object_id, gix_to_git2_oid, GixRepositoryExt};
 use gitbutler_project::access::WorktreeWritePermission;
-use gitbutler_repo::{GixRepositoryExt, SignaturePurpose};
+use gitbutler_repo::SignaturePurpose;
 use gitbutler_repo::{LogUntil, RepositoryExt};
 use gitbutler_stack::{Stack, VirtualBranchesHandle};
 use tracing::instrument;

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

@@ -4,12 +4,12 @@ use anyhow::{anyhow, bail, Context, Result};
 use gitbutler_cherry_pick::RepositoryExt;
 use gitbutler_command_context::CommandContext;
 use gitbutler_commit::commit_ext::CommitExt as _;
-use gitbutler_oxidize::{git2_to_gix_object_id, gix_to_git2_oid};
+use gitbutler_oxidize::{git2_to_gix_object_id, gix_to_git2_oid, GixRepositoryExt};
 use gitbutler_project::access::WorktreeWritePermission;
 use gitbutler_repo::RepositoryExt as _;
 use gitbutler_repo::{
     rebase::{cherry_rebase_group, gitbutler_merge_commits},
-    GixRepositoryExt, LogUntil,
+    LogUntil,
 };
 use gitbutler_repo_actions::RepoActionsExt as _;
 use gitbutler_stack::stack_context::StackContext;

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

@@ -22,12 +22,14 @@ use gitbutler_diff::{trees, GitHunk, Hunk};
 use gitbutler_error::error::Code;
 use gitbutler_hunk_dependency::RangeCalculationError;
 use gitbutler_operating_modes::assure_open_workspace_mode;
-use gitbutler_oxidize::{git2_signature_to_gix_signature, git2_to_gix_object_id, gix_to_git2_oid};
+use gitbutler_oxidize::{
+    git2_signature_to_gix_signature, git2_to_gix_object_id, gix_to_git2_oid, GixRepositoryExt,
+};
 use gitbutler_project::access::WorktreeWritePermission;
 use gitbutler_reference::{normalize_branch_name, Refname, RemoteRefname};
 use gitbutler_repo::{
     rebase::{cherry_rebase, cherry_rebase_group},
-    GixRepositoryExt, LogUntil, RepositoryExt,
+    LogUntil, RepositoryExt,
 };
 use gitbutler_repo_actions::RepoActionsExt;
 use gitbutler_stack::{