repo: make merge commit creation gix-first

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

Author: codex

crates/gitbutler-repo/src/config.rs

@@ -1,5 +1,3 @@
-use gix::date::parse::TimeBuf;
-
 pub mod rebase;
 
 mod commands;
@@ -32,17 +30,13 @@ mod repository_ext;
 pub use repository_ext::{RepositoryExt, commit_with_signature_gix, commit_without_signature_gix};
 
 pub mod credentials;
-
-mod config;
-use config::Config;
 pub mod hooks;
 pub mod managed_hooks;
 mod remote;
 pub mod staging;
 
 pub mod commit_message;
 
-use but_oxidize::gix_to_git2_signature;
 pub const GITBUTLER_COMMIT_AUTHOR_NAME: &str = "GitButler";
 pub const GITBUTLER_COMMIT_AUTHOR_EMAIL: &str = "gitbutler@gitbutler.com";
 
@@ -51,13 +45,6 @@ pub enum SignaturePurpose {
     Committer,
 }
 
-/// Provide a signature with the GitButler author, and the current time or the time overridden
-/// depending on the value for `purpose`.
-pub fn signature(purpose: SignaturePurpose) -> anyhow::Result<git2::Signature<'static>> {
-    let signature = signature_gix(purpose);
-    gix_to_git2_signature(signature.to_ref(&mut TimeBuf::default()))
-}
-
 /// Provide a `gix` signature with the GitButler author and the current or overridden time.
 pub fn signature_gix(purpose: SignaturePurpose) -> gix::actor::Signature {
     gix::actor::Signature {

crates/gitbutler-repo/src/lib.rs

@@ -1,15 +1,14 @@
 use std::path::PathBuf;
 
 use anyhow::{Context as _, Result};
+use bstr::ByteSlice;
 use but_core::{
     RepositoryExt,
     commit::{ConflictEntries, Headers},
 };
 use but_oxidize::{ObjectIdExt as _, OidExt as _};
 use gitbutler_cherry_pick::{ConflictedTreeKey, GixRepositoryExt as _};
 
-use crate::RepositoryExt as _;
-
 fn extract_conflicted_files(
     merged_tree_id: gix::Id<'_>,
     merge_result: gix::merge::tree::Outcome<'_>,
@@ -166,22 +165,20 @@ pub fn merge_commits(
         Headers::new_with_random_change_id()
     };
 
-    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,
+    let (author, committer) = gix_repository.commit_signatures()?;
+    let commit_oid = crate::commit_with_signature_gix(
+        gix_repository,
         None,
-        &author,
-        &committer,
-        resulting_name,
-        &repo.find_tree(tree_oid).context("failed to find tree")?,
-        &[&target_commit, &incoming_commit],
+        author,
+        committer,
+        resulting_name.into(),
+        tree_oid.to_gix(),
+        &[target_commit.id, incoming_commit.id],
         Some(commit_headers),
     )
     .context("failed to create commit")?;
 
-    Ok(commit_oid.to_gix())
+    Ok(commit_oid)
 }
 pub fn gitbutler_merge_commits<'repo>(
     repo: &'repo git2::Repository,

crates/gitbutler-repo/src/rebase.rs

@@ -6,14 +6,9 @@ use but_core::{
     RepositoryExt as RepositoryExtGix,
     commit::{Headers, SignCommit},
 };
-use but_error::Code;
-use but_oxidize::{
-    ObjectIdExt as _, OidExt, git2_signature_to_gix_signature, gix_to_git2_signature,
-};
+use but_oxidize::{ObjectIdExt as _, OidExt, git2_signature_to_gix_signature};
 use gitbutler_reference::{Refname, RemoteRefname};
 
-use crate::{Config, SignaturePurpose};
-
 /// Extension trait for `git2::Repository`.
 ///
 /// For now, it collects useful methods from `gitbutler-core::git::Repository`
@@ -27,7 +22,6 @@ pub trait RepositoryExt {
     /// conflict with the libgit2 binding I upstreamed when it eventually
     /// gets merged.
     fn merge_base_octopussy(&self, ids: &[git2::Oid]) -> Result<git2::Oid>;
-    fn signatures(&self) -> Result<(git2::Signature<'_>, git2::Signature<'_>)>;
 
     fn remote_branches(&self) -> Result<Vec<RemoteRefname>>;
     fn remotes_as_string(&self) -> Result<Vec<String>>;
@@ -255,30 +249,6 @@ impl RepositoryExt for git2::Repository {
             .collect()
     }
 
-    fn signatures(&self) -> Result<(git2::Signature<'_>, git2::Signature<'_>)> {
-        let repo = gix::open(self.path())?;
-
-        let author = repo
-            .author()
-            .transpose()?
-            .map(gix_to_git2_signature)
-            .transpose()?
-            .context("No author is configured in Git")
-            .context(Code::AuthorMissing)?;
-
-        let config: Config = (&repo).into();
-        let committer = if config.user_real_comitter()? {
-            repo.committer()
-                .transpose()?
-                .map(gix_to_git2_signature)
-                .unwrap_or_else(|| crate::signature(SignaturePurpose::Committer))
-        } else {
-            crate::signature(SignaturePurpose::Committer)
-        }?;
-
-        Ok((author, committer))
-    }
-
     fn merge_base_octopussy(&self, ids: &[git2::Oid]) -> Result<git2::Oid> {
         if ids.len() < 2 {
             bail!("Merge base octopussy requires at least two commit ids to operate on");