Write blame to stdout

Author: cruessler

gitoxide-core/src/repository/blame.rs

@@ -1,30 +1,54 @@
-use std::{ffi::OsStr, os::unix::ffi::OsStrExt, path::PathBuf};
+use std::{ffi::OsStr, os::unix::ffi::OsStrExt, path::PathBuf, str::Lines};
 
 use gix::bstr::BStr;
 
-pub fn blame_file(repo: gix::Repository, file: &OsStr) -> anyhow::Result<()> {
-    let traverse: Vec<Result<gix::traverse::commit::Info, gix::traverse::commit::simple::Error>> = vec![];
+pub fn blame_file(repo: gix::Repository, file: &OsStr, out: impl std::io::Write) -> anyhow::Result<()> {
+    let suspect = repo.head()?.peel_to_commit_in_place()?;
+    let traverse: Vec<_> = gix::traverse::commit::Simple::new(Some(suspect.id), &repo.objects).collect();
     let mut resource_cache = repo.diff_resource_cache_for_tree_diff()?;
-    let mut reference = gix::refs::file::Store::find(&repo.refs, "HEAD")?;
-
-    // Needed for `peel_to_id_in_place`.
-    use gix::refs::file::ReferenceExt;
-
-    let suspect = reference.peel_to_id_in_place(&repo.refs, &repo.objects)?;
 
     let work_dir: PathBuf = repo.work_dir().expect("TODO").into();
     let file_path: &BStr = file.as_bytes().into();
 
-    if let Ok(_blame_entries) = gix::blame::blame_file(
-        repo.objects,
+    let blame_entries = gix::blame::blame_file(
+        &repo.objects,
         traverse,
         &mut resource_cache,
-        suspect,
-        work_dir,
+        suspect.id,
+        work_dir.clone(),
         &file_path,
-    ) {
-        todo!()
-    } else {
-        todo!()
+    )
+    .expect("TODO");
+
+    let absolute_path = work_dir.join(file);
+    let file_content = std::fs::read_to_string(absolute_path).expect("TODO");
+    let lines = file_content.lines();
+
+    write_blame_entries(out, lines, blame_entries)?;
+
+    Ok(())
+}
+
+fn write_blame_entries(
+    mut out: impl std::io::Write,
+    mut lines: Lines<'_>,
+    blame_entries: Vec<gix::blame::BlameEntry>,
+) -> Result<(), std::io::Error> {
+    for blame_entry in blame_entries {
+        for line_number in blame_entry.range_in_blamed_file {
+            let line = lines.next().unwrap();
+
+            writeln!(
+                out,
+                "{} {} {}",
+                blame_entry.commit_id.to_hex_with_len(8),
+                // `line_number` is 0-based, but we want to show 1-based line numbers (as `git`
+                // does).
+                line_number + 1,
+                line
+            )?;
+        }
     }
+
+    Ok(())
 }

src/plumbing/main.rs

@@ -1442,7 +1442,7 @@ pub fn main() -> Result<()> {
             progress,
             progress_keep_open,
             None,
-            move |_progress, _out, _err| core::repository::blame::blame_file(repository(Mode::Lenient)?, &file),
+            move |_progress, out, _err| core::repository::blame::blame_file(repository(Mode::Lenient)?, &file, out),
         ),
         Subcommands::Completions { shell, out_dir } => {
             let mut app = Args::command();