From 5cf08ce3d04d635bbfee169cb77ce259efbf6bc3 Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <sebastian.thiel@icloud.com>
Date: Fri, 22 Jul 2022 10:47:17 +0800
Subject: [PATCH] move 'mailmap' up one level (#331)

---
 src/plumbing/main.rs    | 24 +++++++++++-------------
 src/plumbing/options.rs | 26 +++++++++++++-------------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/plumbing/main.rs b/src/plumbing/main.rs
index 9641fededec..5ae821550ee 100644
--- a/src/plumbing/main.rs
+++ b/src/plumbing/main.rs
@@ -13,7 +13,7 @@ use git_repository::bstr::io::BufReadExt;
 use gitoxide_core as core;
 use gitoxide_core::pack::verify;
 
-use crate::plumbing::options::{commit, odb, revision, tree};
+use crate::plumbing::options::{commit, mailmap, odb, revision, tree};
 use crate::{
     plumbing::options::{free, repo, Args, Subcommands},
     shared::pretty::prepare_and_run,
@@ -599,6 +599,16 @@ pub fn main() -> Result<()> {
                 move |_progress, out, err| core::repository::odb::info(repository()?.into(), format, out, err),
             ),
         },
+        Subcommands::Mailmap { cmd } => match cmd {
+            mailmap::Subcommands::Entries => prepare_and_run(
+                "repository-mailmap-entries",
+                verbose,
+                progress,
+                progress_keep_open,
+                None,
+                move |_progress, out, err| core::repository::mailmap::entries(repository()?.into(), format, out, err),
+            ),
+        },
         Subcommands::Repository(repo::Platform { cmd }) => match cmd {
             repo::Subcommands::Exclude { cmd } => match cmd {
                 repo::exclude::Subcommands::Query {
@@ -635,18 +645,6 @@ pub fn main() -> Result<()> {
                     },
                 ),
             },
-            repo::Subcommands::Mailmap { cmd } => match cmd {
-                repo::mailmap::Subcommands::Entries => prepare_and_run(
-                    "repository-mailmap-entries",
-                    verbose,
-                    progress,
-                    progress_keep_open,
-                    None,
-                    move |_progress, out, err| {
-                        core::repository::mailmap::entries(repository()?.into(), format, out, err)
-                    },
-                ),
-            },
         },
     }?;
     Ok(())
diff --git a/src/plumbing/options.rs b/src/plumbing/options.rs
index e4b8d9cb0c3..9d20138cf67 100644
--- a/src/plumbing/options.rs
+++ b/src/plumbing/options.rs
@@ -76,6 +76,11 @@ pub enum Subcommands {
         #[clap(subcommand)]
         cmd: revision::Subcommands,
     },
+    /// Interact with the mailmap.
+    Mailmap {
+        #[clap(subcommand)]
+        cmd: mailmap::Subcommands,
+    },
     /// Subcommands for interacting with entire git repositories
     Repository(repo::Platform),
     /// Subcommands that need no git repository to run.
@@ -83,6 +88,14 @@ pub enum Subcommands {
     Free(free::Subcommands),
 }
 
+pub mod mailmap {
+    #[derive(Debug, clap::Subcommand)]
+    pub enum Subcommands {
+        /// Print all entries in configured mailmaps, inform about errors as well.
+        Entries,
+    }
+}
+
 pub mod odb {
     #[derive(Debug, clap::Subcommand)]
     pub enum Subcommands {
@@ -579,11 +592,6 @@ pub mod repo {
     #[derive(Debug, clap::Subcommand)]
     #[clap(visible_alias = "repo")]
     pub enum Subcommands {
-        /// Interact with the mailmap.
-        Mailmap {
-            #[clap(subcommand)]
-            cmd: mailmap::Subcommands,
-        },
         /// Interact with the exclude files like .gitignore.
         Exclude {
             #[clap(subcommand)]
@@ -616,12 +624,4 @@ pub mod repo {
             },
         }
     }
-
-    pub mod mailmap {
-        #[derive(Debug, clap::Subcommand)]
-        pub enum Subcommands {
-            /// Print all entries in configured mailmaps, inform about errors as well.
-            Entries,
-        }
-    }
 }