refactor

- put `Options` into the right place

Author: Byron

gix/Cargo.toml

@@ -145,7 +145,7 @@ blob-diff = ["gix-diff/blob", "attributes"]
 merge = ["tree-editor", "blob-diff", "dep:gix-merge", "attributes"]
 
 ## Add blame command similar to `git blame`.
-blame = ["dep:gix-blame"]
+blame = ["dep:gix-blame", "blob-diff"]
 
 ## Make it possible to turn a tree into a stream of bytes, which can be decoded to entries and turned into various other formats.
 worktree-stream = ["gix-worktree-stream", "attributes"]

gix/src/repository/blame.rs

@@ -3,19 +3,6 @@ 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
@@ -26,12 +13,12 @@ impl Repository {
         &self,
         file_path: &BStr,
         suspect: impl Into<ObjectId>,
-        options: Options,
+        options: blame_file::Options,
     ) -> Result<gix_blame::Outcome, blame_file::Error> {
-        let cache: Option<gix_commitgraph::Graph> = self.commit_graph_if_enabled()?;
+        let cache = self.commit_graph_if_enabled()?;
         let mut resource_cache = self.diff_resource_cache_for_tree_diff()?;
 
-        let Options {
+        let blame_file::Options {
             diff_algorithm,
             ranges,
             since,

gix/src/repository/mod.rs

@@ -21,7 +21,7 @@ pub enum Kind {
 pub mod attributes;
 ///
 #[cfg(feature = "blame")]
-pub mod blame;
+mod blame;
 mod cache;
 #[cfg(feature = "worktree-mutation")]
 mod checkout;
@@ -97,6 +97,19 @@ mod new_commit_as {
 ///
 #[cfg(feature = "blame")]
 pub mod blame_file {
+    /// 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 `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>,
+    }
+
     /// The error returned by [Repository::blame_file()](crate::Repository::blame_file()).
     #[derive(Debug, thiserror::Error)]
     #[allow(missing_docs)]

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::repository::blame::Options {
+    let options = gix::repository::blame_file::Options {
         ranges: gix::blame::BlameRanges::from_one_based_inclusive_range(1..=2)?,
         ..Default::default()
     };