move 'verify' up one level (#331)

Author: Byron

src/plumbing/main.rs

@@ -474,6 +474,35 @@ pub fn main() -> Result<()> {
                 },
             },
         },
+        Subcommands::Verify {
+            args:
+                free::pack::VerifyOptions {
+                    statistics,
+                    algorithm,
+                    decode,
+                    re_encode,
+                },
+        } => prepare_and_run(
+            "repository-verify",
+            verbose,
+            progress,
+            progress_keep_open,
+            core::repository::verify::PROGRESS_RANGE,
+            move |progress, out, _err| {
+                core::repository::verify::integrity(
+                    repository()?.into(),
+                    out,
+                    progress,
+                    &should_interrupt,
+                    core::repository::verify::Context {
+                        output_statistics: statistics.then(|| format),
+                        algorithm,
+                        verify_mode: verify_mode(decode, re_encode),
+                        thread_limit,
+                    },
+                )
+            },
+        ),
         Subcommands::Revision { cmd } => match cmd {
             revision::Subcommands::Explain { spec } => prepare_and_run(
                 "repository-commit-describe",
@@ -625,35 +654,6 @@ pub fn main() -> Result<()> {
                     },
                 ),
             },
-            repo::Subcommands::Verify {
-                args:
-                    free::pack::VerifyOptions {
-                        statistics,
-                        algorithm,
-                        decode,
-                        re_encode,
-                    },
-            } => prepare_and_run(
-                "repository-verify",
-                verbose,
-                progress,
-                progress_keep_open,
-                core::repository::verify::PROGRESS_RANGE,
-                move |progress, out, _err| {
-                    core::repository::verify::integrity(
-                        repository()?.into(),
-                        out,
-                        progress,
-                        &should_interrupt,
-                        core::repository::verify::Context {
-                            output_statistics: statistics.then(|| format),
-                            algorithm,
-                            verify_mode: verify_mode(decode, re_encode),
-                            thread_limit,
-                        },
-                    )
-                },
-            ),
         },
     }?;
     Ok(())

src/plumbing/options.rs

@@ -51,6 +51,11 @@ pub struct Args {
 
 #[derive(Debug, clap::Subcommand)]
 pub enum Subcommands {
+    /// Verify the integrity of the entire repository
+    Verify {
+        #[clap(flatten)]
+        args: free::pack::VerifyOptions,
+    },
     /// Query and obtain information about revisions.
     Revision {
         #[clap(subcommand)]
@@ -483,11 +488,6 @@ pub mod repo {
     #[derive(Debug, clap::Subcommand)]
     #[clap(visible_alias = "repo")]
     pub enum Subcommands {
-        /// Verify the integrity of the entire repository
-        Verify {
-            #[clap(flatten)]
-            args: super::free::pack::VerifyOptions,
-        },
         /// Interact with commit objects.
         Commit {
             #[clap(subcommand)]