Merge pull request #1557 from Byron/merge-base

initial merge-base support

Author: Byron

Cargo.lock

@@ -389,3 +389,4 @@ borrow_as_ptr = "allow"  # x2
 unnecessary_join = "allow"  # x1
 stable_sort_primitive = "allow"  # x1
 no_effect_underscore_binding = "allow"  # x1
+empty_docs = "allow"

Cargo.toml

@@ -0,0 +1,31 @@
+use crate::OutputFormat;
+use anyhow::bail;
+
+pub fn merge_base(
+    mut repo: gix::Repository,
+    first: String,
+    others: Vec<String>,
+    mut out: impl std::io::Write,
+    format: OutputFormat,
+) -> anyhow::Result<()> {
+    if format != OutputFormat::Human {
+        bail!("Only 'human' format is currently supported");
+    }
+    repo.object_cache_size_if_unset(50 * 1024 * 1024);
+    let first_id = repo.rev_parse_single(first.as_str())?;
+    let other_ids: Vec<_> = others
+        .iter()
+        .cloned()
+        .map(|other| repo.rev_parse_single(other.as_str()).map(gix::Id::detach))
+        .collect::<Result<_, _>>()?;
+
+    let cache = repo.commit_graph_if_enabled()?;
+    let bases = repo.merge_bases_many_with_cache(first_id, &other_ids, cache.as_ref())?;
+    if bases.is_empty() {
+        bail!("No base found for {first} and {others}", others = others.join(", "))
+    }
+    for id in bases {
+        writeln!(&mut out, "{id}")?;
+    }
+    Ok(())
+}

gitoxide-core/src/repository/merge_base.rs

@@ -44,6 +44,8 @@ mod fsck;
 pub use fsck::function as fsck;
 pub mod index;
 pub mod mailmap;
+mod merge_base;
+pub use merge_base::merge_base;
 pub mod odb;
 pub mod remote;
 pub mod revision;

gitoxide-core/src/repository/mod.rs

@@ -22,7 +22,6 @@ use gix_date::Time;
 
 mod identity;
 ///
-#[allow(clippy::empty_docs)]
 pub mod signature;
 
 /// A person with name and email.

gix-actor/src/lib.rs

@@ -129,6 +129,5 @@ pub(crate) mod write {
 }
 
 ///
-#[allow(clippy::empty_docs)]
 pub mod decode;
 pub use decode::function::decode;

gix-actor/src/signature/mod.rs

@@ -14,18 +14,14 @@ use kstring::{KString, KStringRef};
 
 mod assignment;
 ///
-#[allow(clippy::empty_docs)]
 pub mod name;
 ///
-#[allow(clippy::empty_docs)]
 pub mod state;
 
 ///
-#[allow(clippy::empty_docs)]
 pub mod search;
 
 ///
-#[allow(clippy::empty_docs)]
 pub mod parse;
 
 /// Parse attribute assignments line by line from `bytes`, and fail the operation on error.

gix-attributes/src/lib.rs

@@ -1,5 +1,4 @@
 ///
-#[allow(clippy::empty_docs)]
 pub mod decode {
     /// The error returned by [`decode()`][super::decode()].
     #[derive(Debug, thiserror::Error)]

gix-bitmap/src/ewah.rs

@@ -3,7 +3,6 @@ use std::ops::Range;
 use crate::file::Index;
 
 ///
-#[allow(clippy::empty_docs)]
 pub mod offset_by_kind {
     use std::fmt::{Display, Formatter};
 
@@ -28,7 +27,6 @@ pub mod offset_by_kind {
 }
 
 ///
-#[allow(clippy::empty_docs)]
 pub mod data_by_kind {
     /// The error returned by [`Index::data_by_id()`][super::Index::data_by_id()].
     #[derive(Debug, thiserror::Error)]

gix-chunk/src/file/index.rs

@@ -1,12 +1,9 @@
 ///
-#[allow(clippy::empty_docs)]
 pub mod decode;
 ///
-#[allow(clippy::empty_docs)]
 pub mod index;
 
 ///
-#[allow(clippy::empty_docs)]
 pub mod write;
 
 /// The offset to a chunk as seen relative to the beginning of the file containing it.