adapt to changes in gix-diff

Author: Byron

crate-status.md

@@ -304,12 +304,16 @@ Check out the [performance discussion][gix-diff-performance] as well.
 
 * **tree**
     * [x] changes needed to obtain _other tree_
-* **patches**    
-    * There are various ways to generate a patch from two blobs.
-    * [ ] text
-    * [ ] binary
-* **lines**
-    * [x] Simple line-by-line diffs powered by the `imara-diff` crate.
+* **blobs** 
+    * **patches**    
+        * There are various ways to generate a patch from two blobs.
+        * [ ] text
+        * [ ] binary
+        * [ ] `git-apply` compatibility
+        * [ ] merge hunks that are close enough based on line-setting (`interhunk-lines`)
+        * [ ] white-space related settings
+    * **lines**
+        * [x] Simple line-by-line diffs powered by the `imara-diff` crate.
 * **generic rename tracker to find renames and copies**
     * [x] find blobs by exact match
     * [x] find blobs by similarity check
@@ -335,12 +339,13 @@ Check out the [performance discussion][gix-diff-performance] as well.
 
 ### gix-merge
 
-* [x] three-way merge analysis of blobs with choice of how to resolve conflicts
+* [x] three-way merge analysis of **blobs** with choice of how to resolve conflicts
     - [ ] choose how to resolve conflicts on the data-structure
     - [ ] produce a new blob based on data-structure containing possible resolutions
         - [x] `merge` style
         - [x] `diff3` style
         - [x] `zdiff` style
+    - [ ] a way to control inter-hunk merging based on proximity (maybe via `gix-diff` feature which could use the same)
 * [ ] diff-heuristics match Git perfectly
 * [x] API documentation
     * [ ] Examples

gix-pack/src/data/output/count/objects/mod.rs

@@ -247,14 +247,14 @@ mod expand {
 
                                         changes_delegate.clear();
                                         let objects = CountingObjects::new(db);
-                                        gix_diff::tree::Changes::from(Some(parent_tree))
-                                            .needed_to_obtain(
-                                                current_tree_iter,
-                                                &mut tree_diff_state,
-                                                &objects,
-                                                &mut changes_delegate,
-                                            )
-                                            .map_err(Error::TreeChanges)?;
+                                        gix_diff::tree(
+                                            parent_tree,
+                                            current_tree_iter,
+                                            &mut tree_diff_state,
+                                            &objects,
+                                            &mut changes_delegate,
+                                        )
+                                        .map_err(Error::TreeChanges)?;
                                         stats.decoded_objects += objects.into_count();
                                     }
                                     &changes_delegate.objects

gix-pack/src/data/output/count/objects/types.rs

@@ -90,7 +90,7 @@ pub enum Error {
     #[error(transparent)]
     TreeTraverse(gix_traverse::tree::breadthfirst::Error),
     #[error(transparent)]
-    TreeChanges(gix_diff::tree::changes::Error),
+    TreeChanges(gix_diff::tree::Error),
     #[error("Operation interrupted")]
     Interrupted,
 }

gix/src/object/tree/diff/for_each.rs

@@ -14,7 +14,7 @@ use crate::{
 #[allow(missing_docs)]
 pub enum Error {
     #[error(transparent)]
-    Diff(#[from] gix_diff::tree::changes::Error),
+    Diff(#[from] gix_diff::tree::Error),
     #[error("The user-provided callback failed")]
     ForEach(#[source] Box<dyn std::error::Error + Send + Sync + 'static>),
     #[error(transparent)]
@@ -88,7 +88,8 @@ impl<'old> Platform<'_, 'old> {
             tracked: self.rewrites.map(rewrites::Tracker::new),
             err: None,
         };
-        match gix_diff::tree::Changes::from(TreeRefIter::from_bytes(&self.lhs.data)).needed_to_obtain(
+        match gix_diff::tree(
+            TreeRefIter::from_bytes(&self.lhs.data),
             TreeRefIter::from_bytes(&other.data),
             &mut self.state,
             &repo.objects,
@@ -103,9 +104,9 @@ impl<'old> Platform<'_, 'old> {
                     None => Ok(outcome),
                 }
             }
-            Err(gix_diff::tree::changes::Error::Cancelled) => delegate
+            Err(gix_diff::tree::Error::Cancelled) => delegate
                 .err
-                .map_or(Err(Error::Diff(gix_diff::tree::changes::Error::Cancelled)), |err| {
+                .map_or(Err(Error::Diff(gix_diff::tree::Error::Cancelled)), |err| {
                     Err(Error::ForEach(err.into()))
                 }),
             Err(err) => Err(err.into()),