Extract get_changes_for_file_path

Author: cruessler

gix-blame/src/lib.rs

@@ -615,6 +615,50 @@ pub fn process_changes(
     new_hunks_to_blame
 }
 
+fn get_changes_for_file_path(
+    odb: impl gix_object::Find + gix_object::FindHeader,
+    file_path: &BStr,
+    id: ObjectId,
+    parent_id: ObjectId,
+) -> Vec<gix_diff::tree::recorder::Change> {
+    let mut buffer = Vec::new();
+
+    let parent = odb.find_commit(&parent_id, &mut buffer).unwrap();
+
+    let mut buffer = Vec::new();
+    let parent_tree_iter = odb
+        .find(&parent.tree(), &mut buffer)
+        .unwrap()
+        .try_into_tree_iter()
+        .unwrap();
+
+    let mut buffer = Vec::new();
+    let commit = odb.find_commit(&id, &mut buffer).unwrap();
+
+    let mut buffer = Vec::new();
+    let tree_iter = odb
+        .find(&commit.tree(), &mut buffer)
+        .unwrap()
+        .try_into_tree_iter()
+        .unwrap();
+
+    let mut recorder = gix_diff::tree::Recorder::default();
+    gix_diff::tree::Changes::from(parent_tree_iter)
+        .needed_to_obtain(tree_iter, gix_diff::tree::State::default(), &odb, &mut recorder)
+        .unwrap();
+
+    recorder
+        .records
+        .iter()
+        .filter(|change| match change {
+            gix_diff::tree::recorder::Change::Modification { path, .. } => path == file_path,
+            gix_diff::tree::recorder::Change::Addition { path, .. } => path == file_path,
+            gix_diff::tree::recorder::Change::Deletion { path, .. } => path == file_path,
+        })
+        .cloned()
+        .collect()
+}
+
 /// This function merges adjacent blame entries. It merges entries that are adjacent both in the
 /// blamed file and in the original file that introduced them. This follows `git`’s
 /// behaviour. `libgit2`, as of 2024-09-19, only checks whether two entries are adjacent in the
@@ -731,43 +775,9 @@ pub fn blame_file<E>(
 
         let last_parent_id: ObjectId = *parent_ids.last().unwrap();
 
-        let mut buffer = Vec::new();
-
-        let last_parent = odb.find_commit(&last_parent_id, &mut buffer).unwrap();
-
-        let mut buffer = Vec::new();
-        let last_parent_tree_iter = odb
-            .find(&last_parent.tree(), &mut buffer)
-            .unwrap()
-            .try_into_tree_iter()
-            .unwrap();
-
-        let mut buffer = Vec::new();
-        let commit = odb.find_commit(&item.id, &mut buffer).unwrap();
-
-        let mut buffer = Vec::new();
-        let tree_iter = odb
-            .find(&commit.tree(), &mut buffer)
-            .unwrap()
-            .try_into_tree_iter()
-            .unwrap();
-
-        let mut recorder = gix_diff::tree::Recorder::default();
-        gix_diff::tree::Changes::from(last_parent_tree_iter)
-            .needed_to_obtain(tree_iter, gix_diff::tree::State::default(), &odb, &mut recorder)
-            .unwrap();
+        let changes_for_file_path = get_changes_for_file_path(&odb, file_path, item.id, last_parent_id);
 
-        let records_for_file_path: Vec<&gix_diff::tree::recorder::Change> = recorder
-            .records
-            .iter()
-            .filter(|change| match change {
-                gix_diff::tree::recorder::Change::Modification { path, .. } => path == file_path,
-                gix_diff::tree::recorder::Change::Addition { path, .. } => path == file_path,
-                gix_diff::tree::recorder::Change::Deletion { path, .. } => path == file_path,
-            })
-            .collect();
-
-        let [modification]: [&gix_diff::tree::recorder::Change] = records_for_file_path[..] else {
+        let [ref modification]: [gix_diff::tree::recorder::Change] = changes_for_file_path[..] else {
             // None of the changes affected the file we’re currently blaming.
             continue;
         };