adapt to changes in gix

Author: Byron

gitoxide-core/src/repository/merge/tree.rs

@@ -2,7 +2,7 @@ use crate::OutputFormat;
 
 pub struct Options {
     pub format: OutputFormat,
-    pub resolve_content_merge: Option<gix::merge::blob::builtin_driver::text::Conflict>,
+    pub file_favor: Option<gix::merge::tree::FileFavor>,
     pub in_memory: bool,
 }
 
@@ -12,8 +12,6 @@ pub(super) mod function {
     use anyhow::{anyhow, bail, Context};
     use gix::bstr::BString;
     use gix::bstr::ByteSlice;
-    use gix::merge::blob::builtin_driver::binary;
-    use gix::merge::blob::builtin_driver::text::Conflict;
     use gix::merge::tree::UnresolvedConflict;
     use gix::prelude::Write;
 
@@ -29,7 +27,7 @@ pub(super) mod function {
         theirs: BString,
         Options {
             format,
-            resolve_content_merge,
+            file_favor,
             in_memory,
         }: Options,
     ) -> anyhow::Result<()> {
@@ -44,17 +42,7 @@ pub(super) mod function {
         let (ours_ref, ours_id) = refname_and_tree(&repo, ours)?;
         let (theirs_ref, theirs_id) = refname_and_tree(&repo, theirs)?;
 
-        let mut options = repo.tree_merge_options()?;
-        if let Some(resolve) = resolve_content_merge {
-            options.blob_merge.text.conflict = resolve;
-            options.blob_merge.resolve_binary_with = match resolve {
-                Conflict::Keep { .. } => None,
-                Conflict::ResolveWithOurs => Some(binary::ResolveWith::Ours),
-                Conflict::ResolveWithTheirs => Some(binary::ResolveWith::Theirs),
-                Conflict::ResolveWithUnion => None,
-            };
-        }
-
+        let options = repo.tree_merge_options()?.with_file_favor(file_favor);
         let base_id_str = base_id.to_string();
         let ours_id_str = ours_id.to_string();
         let theirs_id_str = theirs_id.to_string();

justfile

@@ -46,7 +46,7 @@ check:
     if cargo check -p gix-packetline --all-features 2>/dev/null; then false; else true; fi
     if cargo check -p gix-transport --all-features 2>/dev/null; then false; else true; fi
     if cargo check -p gix-protocol --all-features 2>/dev/null; then false; else true; fi
-    if cargo tree -p gix --no-default-features -i imara-diff 2>/dev/null; then false; else true; fi
+    cargo tree -p gix --no-default-features -e normal -i imara-diff 2>&1 | grep warning # warning happens if nothing found, no exit code :/
     if cargo tree -p gix --no-default-features -i gix-protocol 2>/dev/null; then false; else true; fi
     if cargo tree -p gix --no-default-features -i gix-submodule 2>/dev/null; then false; else true; fi
     if cargo tree -p gix --no-default-features -i gix-pathspec 2>/dev/null; then false; else true; fi

src/plumbing/main.rs

@@ -173,7 +173,7 @@ pub fn main() -> Result<()> {
             ),
             merge::SubCommands::Tree {
                 in_memory,
-                resolve_content_with,
+                file_favor,
                 ours,
                 base,
                 theirs,
@@ -194,7 +194,7 @@ pub fn main() -> Result<()> {
                         theirs,
                         core::repository::merge::tree::Options {
                             format,
-                            resolve_content_merge: resolve_content_with.map(Into::into),
+                            file_favor: file_favor.map(Into::into),
                             in_memory,
                         },
                     )

src/plumbing/options/mod.rs

@@ -367,6 +367,23 @@ pub mod merge {
         }
     }
 
+    #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, clap::ValueEnum)]
+    pub enum FileFavor {
+        /// Use only ours in case of conflict.
+        Ours,
+        /// Use only theirs in case of conflict.
+        Theirs,
+    }
+
+    impl From<FileFavor> for gix::merge::tree::FileFavor {
+        fn from(value: FileFavor) -> Self {
+            match value {
+                FileFavor::Ours => gix::merge::tree::FileFavor::Ours,
+                FileFavor::Theirs => gix::merge::tree::FileFavor::Theirs,
+            }
+        }
+    }
+
     #[derive(Debug, clap::Parser)]
     #[command(about = "perform merges of various kinds")]
     pub struct Platform {
@@ -400,9 +417,9 @@ pub mod merge {
             /// Note that the resulting tree won't be available or inspectable.
             #[clap(long, short = 'm')]
             in_memory: bool,
-            /// Decide how to resolve content conflicts. If unset, write conflict markers and fail.
-            #[clap(long, short = 'c')]
-            resolve_content_with: Option<ResolveWith>,
+            /// Decide how to resolve content conflicts in files. If unset, write conflict markers and fail.
+            #[clap(long, short = 'f')]
+            file_favor: Option<FileFavor>,
 
             /// A revspec to our treeish.
             #[clap(value_name = "OURS", value_parser = crate::shared::AsBString)]