-
-
Notifications
You must be signed in to change notification settings - Fork 326
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat!: list commit-graph entries by graph traversal, move commit-grap…
…h up to `gix` level. This is merely a debug tool to learn about generation numbers. All commit-graph commands now operate on a repository.
- Loading branch information
Showing
10 changed files
with
213 additions
and
134 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| pub(crate) mod function { | ||
| use std::borrow::Cow; | ||
| use std::ffi::OsString; | ||
|
|
||
| use anyhow::{bail, Context}; | ||
| use gix::prelude::ObjectIdExt; | ||
| use gix::traverse::commit::Sorting; | ||
|
|
||
| use crate::OutputFormat; | ||
|
|
||
| pub fn list( | ||
| mut repo: gix::Repository, | ||
| spec: OsString, | ||
| mut out: impl std::io::Write, | ||
| format: OutputFormat, | ||
| ) -> anyhow::Result<()> { | ||
| if format != OutputFormat::Human { | ||
| bail!("Only human output is currently supported"); | ||
| } | ||
| let graph = repo | ||
| .commit_graph() | ||
| .context("a commitgraph is required, but none was found")?; | ||
| repo.object_cache_size_if_unset(4 * 1024 * 1024); | ||
|
|
||
| let spec = gix::path::os_str_into_bstr(&spec)?; | ||
| let id = repo | ||
| .rev_parse_single(spec) | ||
| .context("Only single revisions are currently supported")?; | ||
| let commits = id | ||
| .object()? | ||
| .peel_to_kind(gix::object::Kind::Commit) | ||
| .context("Need commitish as starting point")? | ||
| .id() | ||
| .ancestors() | ||
| .sorting(Sorting::ByCommitTimeNewestFirst) | ||
| .all()?; | ||
| for commit in commits { | ||
| let commit = commit?; | ||
| writeln!( | ||
| out, | ||
| "{} {} {} {}", | ||
| commit.id().shorten_or_id(), | ||
| commit.commit_time.expect("traversal with date"), | ||
| commit.parent_ids.len(), | ||
| graph.commit_by_id(commit.id).map_or_else( | ||
| || Cow::Borrowed("<NOT IN GRAPH-CACHE>"), | ||
| |c| Cow::Owned(format!( | ||
| "{} {}", | ||
| c.root_tree_id().to_owned().attach(&repo).shorten_or_id(), | ||
| c.generation() | ||
| )) | ||
| ) | ||
| )?; | ||
| } | ||
| Ok(()) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,5 @@ | ||
| pub mod list; | ||
| pub use list::function::list; | ||
|
|
||
| pub mod verify; | ||
| pub use verify::function::verify; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,77 +1,70 @@ | ||
| use std::{io, path::Path}; | ||
|
|
||
| use anyhow::{Context as AnyhowContext, Result}; | ||
| use gix::commitgraph::Graph; | ||
|
|
||
| use crate::OutputFormat; | ||
|
|
||
| /// A general purpose context for many operations provided here | ||
| pub struct Context<W1: io::Write, W2: io::Write> { | ||
| pub struct Context<W1: std::io::Write, W2: std::io::Write> { | ||
| /// A stream to which to output errors | ||
| pub err: W2, | ||
| /// A stream to which to output operation results | ||
| pub out: W1, | ||
| pub output_statistics: Option<OutputFormat>, | ||
| } | ||
|
|
||
| impl Default for Context<Vec<u8>, Vec<u8>> { | ||
| fn default() -> Self { | ||
| pub(crate) mod function { | ||
| use std::io; | ||
|
|
||
| use crate::commitgraph::verify::Context; | ||
| use crate::OutputFormat; | ||
| use anyhow::{Context as AnyhowContext, Result}; | ||
|
|
||
| pub fn verify<W1, W2>( | ||
| repo: gix::Repository, | ||
| Context { | ||
| err: Vec::new(), | ||
| out: Vec::new(), | ||
| output_statistics: None, | ||
| } | ||
| } | ||
| } | ||
| err: _err, | ||
| mut out, | ||
| output_statistics, | ||
| }: Context<W1, W2>, | ||
| ) -> Result<gix::commitgraph::verify::Outcome> | ||
| where | ||
| W1: io::Write, | ||
| W2: io::Write, | ||
| { | ||
| let g = repo.commit_graph()?; | ||
|
|
||
| pub fn graph_or_file<W1, W2>( | ||
| path: impl AsRef<Path>, | ||
| Context { | ||
| err: _err, | ||
| mut out, | ||
| output_statistics, | ||
| }: Context<W1, W2>, | ||
| ) -> 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> { | ||
| Ok(()) | ||
| } | ||
| let stats = g | ||
| .verify_integrity(noop_processor) | ||
| .with_context(|| "Verification failure")?; | ||
|
|
||
| #[allow(clippy::unnecessary_wraps, unknown_lints)] | ||
| fn noop_processor(_commit: &gix::commitgraph::file::Commit<'_>) -> std::result::Result<(), std::fmt::Error> { | ||
| Ok(()) | ||
| } | ||
| let stats = g | ||
| .verify_integrity(noop_processor) | ||
| .with_context(|| "Verification failure")?; | ||
| #[cfg_attr(not(feature = "serde"), allow(clippy::single_match))] | ||
| match output_statistics { | ||
| Some(OutputFormat::Human) => drop(print_human_output(&mut out, &stats)), | ||
| #[cfg(feature = "serde")] | ||
| Some(OutputFormat::Json) => serde_json::to_writer_pretty(out, &stats)?, | ||
| _ => {} | ||
| } | ||
|
|
||
| #[cfg_attr(not(feature = "serde"), allow(clippy::single_match))] | ||
| match output_statistics { | ||
| Some(OutputFormat::Human) => drop(print_human_output(&mut out, &stats)), | ||
| #[cfg(feature = "serde")] | ||
| Some(OutputFormat::Json) => serde_json::to_writer_pretty(out, &stats)?, | ||
| _ => {} | ||
| Ok(stats) | ||
| } | ||
|
|
||
| Ok(stats) | ||
| } | ||
| 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); | ||
| for (parent_count, commit_count) in parent_counts.into_iter() { | ||
| writeln!(out, "\t{parent_count:>2}: {commit_count}")?; | ||
| } | ||
| writeln!(out, "\t->: {}", stats.num_commits)?; | ||
|
|
||
| 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); | ||
| for (parent_count, commit_count) in parent_counts.into_iter() { | ||
| writeln!(out, "\t{parent_count:>2}: {commit_count}")?; | ||
| } | ||
| writeln!(out, "\t->: {}", stats.num_commits)?; | ||
| write!(out, "\nlongest path length between two commits: ")?; | ||
| if let Some(n) = stats.longest_path_length { | ||
| writeln!(out, "{n}")?; | ||
| } else { | ||
| writeln!(out, "unknown")?; | ||
| } | ||
|
|
||
| write!(out, "\nlongest path length between two commits: ")?; | ||
| if let Some(n) = stats.longest_path_length { | ||
| writeln!(out, "{n}")?; | ||
| } else { | ||
| writeln!(out, "unknown")?; | ||
| Ok(()) | ||
| } | ||
|
|
||
| Ok(()) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.