move 'revision' one level up (#331)

Byron · Byron · commit c9c78e86c387 · 2022-07-22T10:33:14.000+08:00
diff --git a/src/plumbing/main.rs b/src/plumbing/main.rs
@@ -13,6 +13,7 @@ use git_repository::bstr::io::BufReadExt;
 use gitoxide_core as core;
 use gitoxide_core::pack::verify;
 
+use crate::plumbing::options::revision;
 use crate::{
     plumbing::options::{free, repo, Args, Subcommands},
     shared::pretty::prepare_and_run,
@@ -473,17 +474,17 @@ pub fn main() -> Result<()> {
                 },
             },
         },
+        Subcommands::Revision { cmd } => match cmd {
+            revision::Subcommands::Explain { spec } => prepare_and_run(
+                "repository-commit-describe",
+                verbose,
+                progress,
+                progress_keep_open,
+                None,
+                move |_progress, out, _err| core::repository::revision::explain(repository()?.into(), spec, out),
+            ),
+        },
         Subcommands::Repository(repo::Platform { cmd }) => match cmd {
-            repo::Subcommands::Revision { cmd } => match cmd {
-                repo::revision::Subcommands::Explain { spec } => prepare_and_run(
-                    "repository-commit-describe",
-                    verbose,
-                    progress,
-                    progress_keep_open,
-                    None,
-                    move |_progress, out, _err| core::repository::revision::explain(repository()?.into(), spec, out),
-                ),
-            },
             repo::Subcommands::Commit { cmd } => match cmd {
                 repo::commit::Subcommands::Describe {
                     annotated_tags,
diff --git a/src/plumbing/options.rs b/src/plumbing/options.rs
@@ -51,13 +51,27 @@ pub struct Args {
 
 #[derive(Debug, clap::Subcommand)]
 pub enum Subcommands {
+    /// Query and obtain information about revisions.
+    Revision {
+        #[clap(subcommand)]
+        cmd: revision::Subcommands,
+    },
     /// Subcommands for interacting with entire git repositories
     Repository(repo::Platform),
     /// Subcommands that need no git repository to run.
     #[clap(subcommand)]
     Free(free::Subcommands),
 }
 
+pub mod revision {
+    #[derive(Debug, clap::Subcommand)]
+    #[clap(visible_alias = "rev")]
+    pub enum Subcommands {
+        /// Provide the revision specification like `@~1` to explain.
+        Explain { spec: std::ffi::OsString },
+    }
+}
+
 ///
 pub mod free {
     #[derive(Debug, clap::Subcommand)]
@@ -499,20 +513,6 @@ pub mod repo {
             #[clap(subcommand)]
             cmd: exclude::Subcommands,
         },
-        /// Query and obtain information about revisions.
-        Revision {
-            #[clap(subcommand)]
-            cmd: revision::Subcommands,
-        },
-    }
-
-    pub mod revision {
-        #[derive(Debug, clap::Subcommand)]
-        #[clap(visible_alias = "rev")]
-        pub enum Subcommands {
-            /// Provide the revision specification like `@~1` to explain.
-            Explain { spec: std::ffi::OsString },
-        }
     }
 
     pub mod exclude {
