fix!: respect diff.algorithm in Repository::blame_file

Author: cruessler

gix/src/repository/blame.rs

@@ -3,6 +3,19 @@ use gix_ref::bstr::BStr;
 
 use crate::{repository::blame_file, Repository};
 
+/// Options to be passed to [Repository::blame_file()](crate::Repository::blame_file()).
+#[derive(Default, Debug, Clone)]
+pub struct Options {
+    /// The algorithm to use for diffing. If this is `None`, `diff.algorithm` will be used.
+    pub diff_algorithm: Option<gix_diff::blob::Algorithm>,
+    /// The ranges to blame in the file.
+    pub ranges: gix_blame::BlameRanges,
+    /// Don't consider commits before the given date.
+    pub since: Option<gix_date::Time>,
+    /// Determine if rename tracking should be performed, and how.
+    pub rewrites: Option<gix_diff::Rewrites>,
+}
+
 impl Repository {
     /// Produce a list of consecutive [`gix_blame::BlameEntry`] instances. Each `BlameEntry`
     /// corresponds to a hunk of consecutive lines of the file at `suspect:<file_path>` that got
@@ -13,11 +26,30 @@ impl Repository {
         &self,
         file_path: &BStr,
         suspect: impl Into<ObjectId>,
-        options: gix_blame::Options,
+        options: Options,
     ) -> Result<gix_blame::Outcome, blame_file::Error> {
         let cache: Option<gix_commitgraph::Graph> = self.commit_graph_if_enabled()?;
         let mut resource_cache = self.diff_resource_cache_for_tree_diff()?;
 
+        let Options {
+            diff_algorithm,
+            ranges,
+            since,
+            rewrites,
+        } = options;
+        let diff_algorithm = match diff_algorithm {
+            Some(diff_algorithm) => diff_algorithm,
+            None => self.diff_algorithm()?,
+        };
+
+        let options = gix_blame::Options {
+            diff_algorithm,
+            ranges,
+            since,
+            rewrites,
+            debug_track_path: false,
+        };
+
         let outcome = gix_blame::file(
             &self.objects,
             suspect.into(),

gix/src/repository/mod.rs

@@ -19,8 +19,9 @@ pub enum Kind {
 
 #[cfg(any(feature = "attributes", feature = "excludes"))]
 pub mod attributes;
+///
 #[cfg(feature = "blame")]
-mod blame;
+pub mod blame;
 mod cache;
 #[cfg(feature = "worktree-mutation")]
 mod checkout;
@@ -103,6 +104,8 @@ pub mod blame_file {
         #[error(transparent)]
         CommitGraphIfEnabled(#[from] super::commit_graph_if_enabled::Error),
         #[error(transparent)]
+        DiffAlgorithm(#[from] crate::config::diff::algorithm::Error),
+        #[error(transparent)]
         DiffResourceCache(#[from] super::diff_resource_cache::Error),
         #[error(transparent)]
         Blame(#[from] gix_blame::Error),

gix/tests/gix/repository/blame.rs

@@ -17,7 +17,7 @@ fn simple() -> crate::Result {
 fn with_options() -> crate::Result {
     let repo = crate::named_repo("make_blame_repo.sh")?;
 
-    let options = gix::blame::Options {
+    let options = gix::repository::blame::Options {
         ranges: gix::blame::BlameRanges::from_one_based_inclusive_range(1..=2)?,
         ..Default::default()
     };