Move setup out of blame_file

Don't depend on `gix-filter`, `gix-fs` and `gix-index`.

Author: cruessler

gix-blame/Cargo.toml

@@ -22,10 +22,10 @@ gix-worktree = { version = "^0.36.0", path = "../gix-worktree", default-features
 # TODO: remove dependencies below this comment by abstracting them away, or passing 'big' types as argument
 gix-ref = { version = "^0.47.0", path = "../gix-ref" }
 gix-traverse = { version = "^0.41.0", path = "../gix-traverse" }
-gix-fs = { version = "^0.11.3", path = "../gix-fs" }
-gix-index = { version = "^0.35.0", path = "../gix-index" }
-gix-filter = { version = "^0.13.0", path = "../gix-filter" }
 
 [dev-dependencies]
+gix-filter = { version = "^0.13.0", path = "../gix-filter" }
+gix-fs = { version = "^0.11.3", path = "../gix-fs" }
+gix-index = { version = "^0.35.0", path = "../gix-index" }
 gix-odb = { version = "^0.63.0", path = "../gix-odb" }
 gix-testtools = { path = "../tests/tools" }

gix-blame/src/lib.rs

@@ -7,10 +7,11 @@ use std::{
     path::PathBuf,
 };
 
-use gix_diff::blob::Sink;
-use gix_hash::ObjectId;
+use gix_diff::blob::{Platform, Sink};
+use gix_hash::{oid, ObjectId};
 use gix_object::FindExt;
 use gix_ref::bstr::BStr;
+use gix_traverse::commit::Simple;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum Offset {
@@ -661,8 +662,9 @@ fn coalesce_blame_entries(lines_blamed: Vec<BlameEntry>) -> Vec<BlameEntry> {
 
 // TODO: do not instantiate anything, get everything passed as argument.
 pub fn blame_file<T: gix_object::Find + gix_object::FindHeader>(
-    odb: T,
-    start_id: ObjectId,
+    odb: &T,
+    traverse: &mut Simple<&T, fn(&oid) -> bool>,
+    resource_cache: &mut Platform,
     worktree_path: PathBuf,
     file_path: &BStr,
 ) -> Vec<BlameEntry> {
@@ -684,39 +686,6 @@ pub fn blame_file<T: gix_object::Find + gix_object::FindHeader>(
     // <---><---><-----><-------><-----><------->
     // <---><---><-----><-------><-----><-><-><->
 
-    let mut traverse = gix_traverse::commit::Simple::new(Some(start_id), &odb);
-
-    let git_dir = worktree_path.join(".git");
-    let index = gix_index::File::at(git_dir.join("index"), gix_hash::Kind::Sha1, false, Default::default()).unwrap();
-    let stack = gix_worktree::Stack::from_state_and_ignore_case(
-        worktree_path.clone(),
-        false,
-        gix_worktree::stack::State::AttributesAndIgnoreStack {
-            attributes: Default::default(),
-            ignore: Default::default(),
-        },
-        &index,
-        index.path_backing(),
-    );
-    let capabilities = gix_fs::Capabilities::probe(&git_dir);
-    let mut resource_cache = gix_diff::blob::Platform::new(
-        Default::default(),
-        gix_diff::blob::Pipeline::new(
-            gix_diff::blob::pipeline::WorktreeRoots {
-                old_root: None,
-                new_root: None,
-            },
-            gix_filter::Pipeline::new(Default::default(), Default::default()),
-            vec![],
-            gix_diff::blob::pipeline::Options {
-                large_file_threshold_bytes: 0,
-                fs: capabilities,
-            },
-        ),
-        gix_diff::blob::pipeline::Mode::ToGit,
-        stack,
-    );
-
     // Needed for `to_str`.
     use gix_object::bstr::ByteSlice;
 

gix-blame/tests/blame.rs

@@ -105,9 +105,49 @@ macro_rules! mktest {
 
             let head_id = reference.peel_to_id_in_place(&store, &odb).unwrap();
 
+            let mut traverse = gix_traverse::commit::Simple::new(Some(head_id), &odb);
+
+            let git_dir = worktree_path.join(".git");
+            let index = gix_index::File::at(
+                git_dir.join("index"),
+                gix_hash::Kind::Sha1,
+                false,
+                Default::default(),
+            )
+            .unwrap();
+            let stack = gix_worktree::Stack::from_state_and_ignore_case(
+                worktree_path.clone(),
+                false,
+                gix_worktree::stack::State::AttributesAndIgnoreStack {
+                    attributes: Default::default(),
+                    ignore: Default::default(),
+                },
+                &index,
+                index.path_backing(),
+            );
+            let capabilities = gix_fs::Capabilities::probe(&git_dir);
+            let mut resource_cache = gix_diff::blob::Platform::new(
+                Default::default(),
+                gix_diff::blob::Pipeline::new(
+                    gix_diff::blob::pipeline::WorktreeRoots {
+                        old_root: None,
+                        new_root: None,
+                    },
+                    gix_filter::Pipeline::new(Default::default(), Default::default()),
+                    vec![],
+                    gix_diff::blob::pipeline::Options {
+                        large_file_threshold_bytes: 0,
+                        fs: capabilities,
+                    },
+                ),
+                gix_diff::blob::pipeline::Mode::ToGit,
+                stack,
+            );
+
             let lines_blamed = blame_file(
-                odb,
-                head_id,
+                &odb,
+                &mut traverse,
+                &mut resource_cache,
                 worktree_path,
                 format!("{}.txt", $case).as_str().into(),
             );