Adapt to changes in gix-blame

Author: cruessler

gitoxide-core/src/repository/blame.rs

@@ -47,15 +47,23 @@ pub fn blame_file(
         options,
     )?;
     let statistics = outcome.statistics;
-    write_blame_entries(out, outcome)?;
+    write_blame_entries(out, outcome, file)?;
 
     if let Some(err) = err {
         writeln!(err, "{statistics:#?}")?;
     }
     Ok(())
 }
 
-fn write_blame_entries(mut out: impl std::io::Write, outcome: gix::blame::Outcome) -> Result<(), std::io::Error> {
+fn write_blame_entries(
+    mut out: impl std::io::Write,
+    outcome: gix::blame::Outcome,
+    source_file_name: gix::bstr::BString,
+) -> Result<(), std::io::Error> {
+    let show_file_names = outcome
+        .entries_with_lines()
+        .any(|(entry, _)| entry.source_file_name.is_some());
+
     for (entry, lines_in_hunk) in outcome.entries_with_lines() {
         for ((actual_lno, source_lno), line) in entry
             .range_in_blamed_file()
@@ -64,11 +72,20 @@ fn write_blame_entries(mut out: impl std::io::Write, outcome: gix::blame::Outcom
         {
             write!(
                 out,
-                "{short_id} {line_no} {src_line_no} {line}",
-                line_no = actual_lno + 1,
-                src_line_no = source_lno + 1,
+                "{short_id} {line_no} ",
                 short_id = entry.commit_id.to_hex_with_len(8),
+                line_no = actual_lno + 1,
             )?;
+
+            if show_file_names {
+                if let Some(ref source_file_name) = entry.source_file_name {
+                    write!(out, "{source_file_name} ")?;
+                } else {
+                    write!(out, "{source_file_name} ")?;
+                }
+            }
+
+            write!(out, "{src_line_no} {line}", src_line_no = source_lno + 1)?;
         }
     }