Implement text and binary merge algorithms, also with baseline te…

…sts for correctness.
GitoxideLabs · Sep 26, 2024 · 4783693 · 4783693
1 parent 9efa09f
commit 4783693
Show file tree

Hide file tree

Showing 10 changed files with 1,667 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crate-status.md b/crate-status.md
@@ -324,19 +324,23 @@ Check out the [performance discussion][gix-diff-performance] as well.
     * [x] prepare invocation of external diff program
         - [ ] pass meta-info
 * [ ] working with hunks of data
+* [ ] diff-heuristics match Git perfectly
 * [x] API documentation
     * [ ] Examples
 
+[gix-diff-performance]: https://github.com/Byron/gitoxide/discussions/74
+
 ### gix-merge
 
-* [ ] 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
-        - [ ] `merge` style
-        - [ ] `diff3` style
-        - [ ] `zdiff` style
-
-[gix-diff-performance]: https://github.com/Byron/gitoxide/discussions/74
+        - [x] `merge` style
+        - [x] `diff3` style
+        - [x] `zdiff` style
+* [ ] diff-heuristics match Git perfectly
+* [x] API documentation
+    * [ ] Examples
 
 ### gix-traverse
 

diff --git a/gix-merge/Cargo.toml b/gix-merge/Cargo.toml
@@ -39,6 +39,10 @@ serde = { version = "1.0.114", optional = true, default-features = false, featur
 
 document-features = { version = "0.2.0", optional = true }
 
+[dev-dependencies]
+gix-testtools = { path = "../tests/tools" }
+pretty_assertions = "1.4.0"
+
 [package.metadata.docs.rs]
 all-features = true
 features = ["document-features"]
diff --git a/gix-merge/src/blob/builtin_driver.rs b/gix-merge/src/blob/builtin_driver.rs
diff --git a/gix-merge/src/blob/platform.rs b/gix-merge/src/blob/platform.rs
@@ -137,7 +137,7 @@ pub mod merge {
         pub other: ResourceRef<'parent>,
     }
 
-    #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+    #[derive(Copy, Clone, Debug, Eq, PartialEq)]
     pub struct Options {
         /// If `true`, the resources being merged are contained in a virtual ancestor,
         /// which is the case when merge bases are merged into one.

diff --git a/gix-merge/tests/fixtures/generated-archives/text-baseline.tar b/gix-merge/tests/fixtures/generated-archives/text-baseline.tar