Use correct diff algorithm when diffing text (#450)

Byron · Byron · commit 6fe93c2473c6 · 2022-10-28T13:53:26.000+02:00
diff --git a/git-repository/src/object/tree/diff/change.rs b/git-repository/src/object/tree/diff/change.rs
@@ -51,24 +51,41 @@ impl<'old, 'new> Event<'old, 'new> {
     }
 }
 
+///
+pub mod event {
+    ///
+    pub mod diff {
+        /// The error returned by [`Event::diff()`][super::Event::diff()].
+        #[derive(Debug, thiserror::Error)]
+        #[allow(missing_docs)]
+        pub enum Error {
+            #[error("Could not find the previous object to diff against")]
+            FindPrevious(#[from] crate::object::find::existing::Error),
+            #[error("Could not obtain diff algorithm from configuration")]
+            DiffAlgorithm(#[from] crate::config::diff::algorithm::Error),
+        }
+    }
+}
+
 impl<'old, 'new> Event<'old, 'new> {
     /// Produce a platform for performing a line-diff, or `None` if this is not a [`Modification`][Event::Modification]
     /// or one of the entries to compare is not a blob.
-    pub fn diff(&self) -> Option<Result<DiffPlatform<'old, 'new>, crate::object::find::existing::Error>> {
-        // let algo = self.repo().config.diff_algorithm()?;
+    pub fn diff(&self) -> Option<Result<DiffPlatform<'old, 'new>, event::diff::Error>> {
         match self {
             Event::Modification {
                 previous_entry_mode: EntryMode::BlobExecutable | EntryMode::Blob,
                 previous_id,
                 entry_mode: EntryMode::BlobExecutable | EntryMode::Blob,
                 id,
             } => match previous_id.object().and_then(|old| id.object().map(|new| (old, new))) {
-                Ok((old, new)) => Some(Ok(DiffPlatform {
-                    old,
-                    new,
-                    algo: git_diff::text::Algorithm::Myers,
-                })),
-                Err(err) => Some(Err(err)),
+                Ok((old, new)) => {
+                    let algo = match self.repo().config.diff_algorithm() {
+                        Ok(algo) => algo,
+                        Err(err) => return Some(Err(err.into())),
+                    };
+                    Some(Ok(DiffPlatform { old, new, algo }))
+                }
+                Err(err) => Some(Err(err.into())),
             },
             _ => None,
         }
@@ -88,7 +105,7 @@ impl<'old, 'new> DiffPlatform<'old, 'new> {
         git_diff::text::with(
             self.old.data.as_bstr(),
             self.new.data.as_bstr(),
-            git_diff::text::Algorithm::Myers, // TODO: use diff.algorithm
+            self.algo,
             // TODO: make use of `core.eol` and/or filters to do line-counting correctly. It's probably
             //       OK to just know how these objects are saved to know what constitutes a line.
             git_diff::text::imara::intern::InternedInput::new,
diff --git a/git-repository/tests/repository/mod.rs b/git-repository/tests/repository/mod.rs
@@ -11,7 +11,7 @@ mod worktree;
 #[test]
 fn size_in_memory() {
     let actual_size = std::mem::size_of::<Repository>();
-    let limit = 810;
+    let limit = 850;
     assert!(
         actual_size < limit,
         "size of Repository shouldn't change without us noticing, it's meant to be cloned: should have been below {:?}, was {}",
