feat: add merge_base_octopus().

GitoxideLabs · Nov 7, 2024 · 23efec3 · 23efec3
1 parent 905e5b4
commit 23efec3
Show file tree

Hide file tree

Showing 28 changed files with 498 additions and 342 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crate-status.md b/crate-status.md
@@ -621,6 +621,8 @@ Make it the best-performing implementation and the most convenient one.
 
 ### gix-revision
 * [x] `describe()` (similar to `git name-rev`)
+* [x] merge-base
+* [x] merge-base octopus
 * parse specifications
     * [x] parsing and navigation
     * [x] revision ranges

diff --git a/gix-revision/Cargo.toml b/gix-revision/Cargo.toml
@@ -44,6 +44,7 @@ document-features = { version = "0.2.1", optional = true }
 [dev-dependencies]
 gix-odb = { path = "../gix-odb" }
 gix-testtools = { path = "../tests/tools" }
+permutohedron = "0.2.4"
 
 [package.metadata.docs.rs]
 all-features = true

diff --git a/gix-revision/src/lib.rs b/gix-revision/src/lib.rs
@@ -18,7 +18,7 @@ pub use describe::function::describe;
 #[cfg(feature = "merge_base")]
 pub mod merge_base;
 #[cfg(feature = "merge_base")]
-pub use merge_base::function::merge_base;
+pub use merge_base::{function::merge_base, octopus};
 
 ///
 pub mod spec;

diff --git a/gix-revision/src/merge_base.rs b/gix-revision/src/merge_base.rs