Don't depend on gix-odb

Author: cruessler

gix-blame/Cargo.toml

@@ -20,12 +20,12 @@ gix-hash = { version = "^0.14.2", path = "../gix-hash" }
 gix-worktree = { version = "^0.36.0", path = "../gix-worktree", default-features = false, features = ["attributes"] }
 
 # TODO: remove dependencies below this comment by abstracting them away, or passing 'big' types as argument
-gix-odb = { version = "^0.63.0", path = "../gix-odb" }
 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-odb = { version = "^0.63.0", path = "../gix-odb" }
 gix-testtools = { path = "../tests/tools" }

gix-blame/src/lib.rs

@@ -10,7 +10,7 @@ use std::{
 use gix_diff::blob::Sink;
 use gix_hash::ObjectId;
 use gix_object::FindExt;
-use gix_ref::{bstr::BStr, file::ReferenceExt, store::WriteReflog};
+use gix_ref::bstr::BStr;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum Offset {
@@ -641,7 +641,12 @@ fn coalesce_blame_entries(lines_blamed: Vec<BlameEntry>) -> Vec<BlameEntry> {
 }
 
 // TODO: do not instantiate anything, get everything passed as argument.
-pub fn blame_file(worktree_path: PathBuf, file_path: &BStr) -> Vec<BlameEntry> {
+pub fn blame_file<T: gix_object::Find + gix_object::FindHeader>(
+    odb: T,
+    start_id: ObjectId,
+    worktree_path: PathBuf,
+    file_path: &BStr,
+) -> Vec<BlameEntry> {
     // TODO
     // At a high level, what we want to do is the following:
     //
@@ -660,20 +665,7 @@ pub fn blame_file(worktree_path: PathBuf, file_path: &BStr) -> Vec<BlameEntry> {
     // <---><---><-----><-------><-----><------->
     // <---><---><-----><-------><-----><-><-><->
 
-    let store = gix_ref::file::Store::at(
-        worktree_path.join(".git"),
-        gix_ref::store::init::Options {
-            write_reflog: WriteReflog::Disable,
-            ..Default::default()
-        },
-    );
-    let odb = gix_odb::at(worktree_path.join(".git/objects")).unwrap();
-
-    let mut reference = gix_ref::file::Store::find(&store, "HEAD").unwrap();
-
-    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 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();

gix-blame/tests/blame.rs

@@ -85,7 +85,32 @@ macro_rules! mktest {
     ($name:ident, $case:expr, $number_of_lines:literal) => {
         #[test]
         fn $name() {
-            let lines_blamed = blame_file(fixture_path(), format!("{}.txt", $case).as_str().into());
+            let worktree_path = fixture_path();
+
+            use gix_ref::store::WriteReflog;
+
+            let store = gix_ref::file::Store::at(
+                worktree_path.join(".git"),
+                gix_ref::store::init::Options {
+                    write_reflog: WriteReflog::Disable,
+                    ..Default::default()
+                },
+            );
+            let odb = gix_odb::at(worktree_path.join(".git/objects")).unwrap();
+
+            let mut reference = gix_ref::file::Store::find(&store, "HEAD").unwrap();
+
+            // Needed for `peel_to_id_in_place`.
+            use gix_ref::file::ReferenceExt;
+
+            let head_id = reference.peel_to_id_in_place(&store, &odb).unwrap();
+
+            let lines_blamed = blame_file(
+                odb,
+                head_id,
+                worktree_path,
+                format!("{}.txt", $case).as_str().into(),
+            );
 
             assert_eq!(lines_blamed.len(), $number_of_lines);