Flatten fsck connectivity into just fsck much like git fsck

Author: Byron

gitoxide-core/src/repository/fsck.rs

@@ -1,11 +1,7 @@
 use anyhow::Context;
 use gix::{objs::Kind, ObjectId};
 
-pub fn connectivity(
-    mut repo: gix::Repository,
-    spec: Option<String>,
-    mut out: impl std::io::Write,
-) -> anyhow::Result<()> {
+pub fn function(mut repo: gix::Repository, spec: Option<String>, mut out: impl std::io::Write) -> anyhow::Result<()> {
     let spec = spec.unwrap_or("HEAD".into());
 
     repo.object_cache_size_if_unset(4 * 1024 * 1024);
@@ -31,7 +27,7 @@ pub fn connectivity(
     // Walk all commits, checking each one for connectivity
     for commit in commits {
         let commit = commit?;
-        check.check_commit(&commit.id);
+        check.check_commit(&commit.id)?;
         // Note that we leave parent-iteration to the commits iterator, as it will
         // correctly handle shallow repositories which are expected to have the commits
         // along the shallow boundary missing.

gitoxide-core/src/repository/mod.rs

@@ -35,7 +35,8 @@ pub use clone::function::clone;
 pub use fetch::function::fetch;
 
 pub mod commitgraph;
-pub mod fsck;
+mod fsck;
+pub use fsck::function as fsck;
 pub mod index;
 pub mod mailmap;
 pub mod odb;

src/plumbing/main.rs

@@ -1072,17 +1072,15 @@ pub fn main() -> Result<()> {
                 move |_progress, out, err| core::repository::odb::info(repository(Mode::Strict)?, format, out, err),
             ),
         },
-        Subcommands::Fsck(cmd) => match cmd {
-            fsck::Subcommands::Connectivity { spec } => prepare_and_run(
-                "fsck-connectivity",
-                trace,
-                auto_verbose,
-                progress,
-                progress_keep_open,
-                None,
-                move |_progress, out, _err| core::repository::fsck::connectivity(repository(Mode::Strict)?, spec, out),
-            ),
-        },
+        Subcommands::Fsck(fsck::Platform { spec }) => prepare_and_run(
+            "fsck",
+            trace,
+            auto_verbose,
+            progress,
+            progress_keep_open,
+            None,
+            move |_progress, out, _err| core::repository::fsck(repository(Mode::Strict)?, spec, out),
+        ),
         Subcommands::Mailmap(cmd) => match cmd {
             mailmap::Subcommands::Entries => prepare_and_run(
                 "mailmap-entries",

src/plumbing/options/mod.rs

@@ -87,9 +87,8 @@ pub enum Subcommands {
     /// Interact with the object database.
     #[clap(subcommand)]
     Odb(odb::Subcommands),
-    /// Perform (some) integrity checks on the repository.
-    #[clap(subcommand)]
-    Fsck(fsck::Subcommands),
+    /// Check for missing objects.
+    Fsck(fsck::Platform),
     /// Interact with tree objects.
     #[clap(subcommand)]
     Tree(tree::Subcommands),
@@ -493,13 +492,10 @@ pub mod odb {
 }
 
 pub mod fsck {
-    #[derive(Debug, clap::Subcommand)]
-    pub enum Subcommands {
-        /// Perform a (partial) connectivity check on the repository.
-        Connectivity {
-            /// A revspec to start the connectivity check from.
-            spec: Option<String>,
-        },
+    #[derive(Debug, clap::Parser)]
+    pub struct Platform {
+        /// A revspec to start the connectivity check from.
+        pub spec: Option<String>,
     }
 }