adapt to changes in gix-revision

Author: Byron

Cargo.lock

@@ -469,6 +469,7 @@ Make it the best-performing implementation and the most convenient one.
 
 ### gix-revision
 * [x] `describe()` (similar to `git name-rev`)
+* [x] primitives to help with graph traversal, along with commit-graph acceleration.
 * parse specifications 
     * [x] parsing and navigation
     * [x] revision ranges
@@ -638,7 +639,7 @@ See its [README.md](https://github.com/Byron/gitoxide/blob/main/gix-lock/README.
     * **Id**
         * [x] short hashes with detection of ambiguity.
     * **Commit**
-        * [x] `describe()` like functionality
+        * [x] `git describe` like functionality, with optional commit-graph acceleration
         * [x] create new commit from tree
     * **Objects**
         * [x] lookup

crate-status.md

@@ -33,15 +33,14 @@ async-client = ["gix/async-network-client-async-std", "gix-transport-configurati
 
 #! ### Other
 ## Data structures implement `serde::Serialize` and `serde::Deserialize`.
-serde = ["gix-commitgraph/serde", "gix/serde", "serde_json", "dep:serde", "bytesize/serde"]
+serde = ["gix/serde", "serde_json", "dep:serde", "bytesize/serde"]
 
 
 [dependencies]
 # deselect everything else (like "performance") as this should be controllable by the parent application.
 gix = { version = "^0.44.1", path = "../gix", default-features = false }
 gix-pack-for-configuration-only = { package = "gix-pack", version = "^0.35.0", path = "../gix-pack", default-features = false, features = ["pack-cache-lru-dynamic", "pack-cache-lru-static"] }
 gix-transport-configuration-only = { package = "gix-transport", version = "^0.31.0", path = "../gix-transport", default-features = false }
-gix-commitgraph = { version = "^0.14.0", path = "../gix-commitgraph" }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 anyhow = "1.0.42"
 thiserror = "1.0.34"

gitoxide-core/Cargo.toml

@@ -1,7 +1,7 @@
 use std::{io, path::Path};
 
 use anyhow::{Context as AnyhowContext, Result};
-use gix_commitgraph::Graph;
+use gix::commitgraph::Graph;
 
 use crate::OutputFormat;
 
@@ -31,15 +31,15 @@ pub fn graph_or_file<W1, W2>(
         mut out,
         output_statistics,
     }: Context<W1, W2>,
-) -> Result<gix_commitgraph::verify::Outcome>
+) -> Result<gix::commitgraph::verify::Outcome>
 where
     W1: io::Write,
     W2: io::Write,
 {
     let g = Graph::at(path).with_context(|| "Could not open commit graph")?;
 
     #[allow(clippy::unnecessary_wraps, unknown_lints)]
-    fn noop_processor(_commit: &gix_commitgraph::file::Commit<'_>) -> std::result::Result<(), std::fmt::Error> {
+    fn noop_processor(_commit: &gix::commitgraph::file::Commit<'_>) -> std::result::Result<(), std::fmt::Error> {
         Ok(())
     }
     let stats = g
@@ -57,7 +57,7 @@ where
     Ok(stats)
 }
 
-fn print_human_output(out: &mut impl io::Write, stats: &gix_commitgraph::verify::Outcome) -> io::Result<()> {
+fn print_human_output(out: &mut impl io::Write, stats: &gix::commitgraph::verify::Outcome) -> io::Result<()> {
     writeln!(out, "number of commits with the given number of parents")?;
     let mut parent_counts: Vec<_> = stats.parent_counts.iter().map(|(a, b)| (*a, *b)).collect();
     parent_counts.sort_by_key(|e| e.0);

gitoxide-core/src/commitgraph/verify.rs

@@ -68,6 +68,7 @@ serde = [   "dep:serde",
             "gix-ignore/serde",
             "gix-revision/serde",
             "gix-worktree/serde",
+            "gix-commitgraph/serde",
             "gix-credentials/serde"]
 
 ## Re-export the progress tree root which allows to obtain progress from various functions which take `impl gix::Progress`.
@@ -148,6 +149,7 @@ gix-prompt = { version = "^0.5.0", path = "../gix-prompt" }
 gix-index = { version = "^0.16.1", path = "../gix-index" }
 gix-worktree = { version = "^0.17.1", path = "../gix-worktree" }
 gix-hashtable = { version = "^0.2.0", path = "../gix-hashtable" }
+gix-commitgraph = { version = "^0.14.0", path = "../gix-commitgraph" }
 
 prodash = { version = "23.1", optional = true, default-features = false, features = ["progress-tree"] }
 once_cell = "1.14.0"

gix/Cargo.toml

@@ -52,7 +52,7 @@ pub mod describe {
     #[allow(missing_docs)]
     pub enum Error {
         #[error(transparent)]
-        Describe(#[from] gix_revision::describe::Error<gix_odb::store::find::Error>),
+        Describe(#[from] gix_revision::describe::Error),
         #[error("Could not produce an unambiguous shortened id for formatting.")]
         ShortId(#[from] crate::id::shorten::Error),
         #[error(transparent)]
@@ -201,15 +201,18 @@ pub mod describe {
         /// to save ~40% of time.
         pub fn try_resolve(&self) -> Result<Option<Resolution<'repo>>, Error> {
             // TODO: dirty suffix with respective dirty-detection
-            let outcome = gix_revision::describe(
-                &self.id,
+            let mut graph = gix_revision::Graph::new(
                 |id, buf| {
-                    Ok(self
-                        .repo
+                    self.repo
                         .objects
-                        .try_find(id, buf)?
-                        .and_then(|d| d.try_into_commit_iter()))
+                        .try_find(id, buf)
+                        .map(|r| r.and_then(|d| d.try_into_commit_iter()))
                 },
+                gix_commitgraph::Graph::from_info_dir(self.repo.objects.store_ref().path().join("info")).ok(),
+            );
+            let outcome = gix_revision::describe(
+                &self.id,
+                &mut graph,
                 gix_revision::describe::Options {
                     name_by_oid: self.select.names(self.repo)?,
                     fallback_to_oid: self.id_as_fallback,
@@ -218,7 +221,7 @@ pub mod describe {
                 },
             )?;
 
-            Ok(outcome.map(|outcome| crate::commit::describe::Resolution {
+            Ok(outcome.map(|outcome| Resolution {
                 outcome,
                 id: self.id.attach(self.repo),
             }))

gix/src/commit.rs

@@ -68,6 +68,7 @@
 // APIs/instances anyway.
 pub use gix_actor as actor;
 pub use gix_attributes as attrs;
+pub use gix_commitgraph as commitgraph;
 pub use gix_credentials as credentials;
 pub use gix_date as date;
 pub use gix_features as features;