feat: auto-enabled verbosity for gix fetch/clone and add `--no-verb…

…ose`. I found myself always adding (and having to remember to add) the `-v` flag for long-running operations so these should be able to default to a higher verbosity level. To counter that, there is a new `--no-verbose` flag to turn that off.
Byron · Dec 2, 2022 · 9814369 · 9814369
1 parent 1b7a35a
commit 9814369
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 62 deletions.
diff --git a/src/plumbing/main.rs b/src/plumbing/main.rs
@@ -111,6 +111,7 @@ pub fn main() -> Result<()> {
         progress = false;
         progress_keep_open = false;
     }
+    let auto_verbose = !progress && !args.no_verbose;
 
     let should_interrupt = Arc::new(AtomicBool::new(false));
     git_repository::interrupt::init_handler({
@@ -133,7 +134,7 @@ pub fn main() -> Result<()> {
             };
             prepare_and_run(
                 "clone",
-                verbose,
+                auto_verbose,
                 progress,
                 progress_keep_open,
                 core::repository::clone::PROGRESS_RANGE,
@@ -156,7 +157,7 @@ pub fn main() -> Result<()> {
             };
             prepare_and_run(
                 "fetch",
-                verbose,
+                auto_verbose,
                 progress,
                 progress_keep_open,
                 core::repository::fetch::PROGRESS_RANGE,
@@ -202,7 +203,7 @@ pub fn main() -> Result<()> {
                     {
                         prepare_and_run(
                             "remote-refs",
-                            verbose,
+                            auto_verbose,
                             progress,
                             progress_keep_open,
                             core::repository::remote::refs::PROGRESS_RANGE,
@@ -221,7 +222,7 @@ pub fn main() -> Result<()> {
                     #[cfg(feature = "gitoxide-core-async-client")]
                     {
                         let (_handle, progress) = async_util::prepare(
-                            verbose,
+                            auto_verbose,
                             "remote-refs",
                             Some(core::repository::remote::refs::PROGRESS_RANGE),
                         );
@@ -258,7 +259,7 @@ pub fn main() -> Result<()> {
             free::Subcommands::CommitGraph(subcommands) => match subcommands {
                 free::commitgraph::Subcommands::Verify { path, statistics } => prepare_and_run(
                     "commitgraph-verify",
-                    verbose,
+                    auto_verbose,
                     progress,
                     progress_keep_open,
                     None,
@@ -339,7 +340,7 @@ pub fn main() -> Result<()> {
                 ),
                 free::index::Subcommands::Verify => prepare_and_run(
                     "index-verify",
-                    verbose,
+                    auto_verbose,
                     progress,
                     progress_keep_open,
                     None,
@@ -353,7 +354,7 @@ pub fn main() -> Result<()> {
             } => match cmd {
                 free::mailmap::Subcommands::Verify => prepare_and_run(
                     "mailmap-verify",
-                    verbose,
+                    auto_verbose,
                     progress,
                     progress_keep_open,
                     core::mailmap::PROGRESS_RANGE,
@@ -468,7 +469,7 @@ pub fn main() -> Result<()> {
                     verify,
                 } => prepare_and_run(
                     "pack-explode",
-                    verbose,
+                    auto_verbose,
                     progress,
                     progress_keep_open,
                     None,
@@ -500,7 +501,7 @@ pub fn main() -> Result<()> {
                     path,
                 } => prepare_and_run(
                     "pack-verify",
-                    verbose,
+                    auto_verbose,
                     progress,
                     progress_keep_open,
                     verify::PROGRESS_RANGE,
@@ -546,7 +547,7 @@ pub fn main() -> Result<()> {
                         ),
                         free::pack::multi_index::Subcommands::Verify => prepare_and_run(
                             "pack-multi-index-verify",
-                            verbose,
+                            auto_verbose,
                             progress,
                             progress_keep_open,
                             core::pack::multi_index::PROGRESS_RANGE,
@@ -624,7 +625,7 @@ pub fn main() -> Result<()> {
                 },
         } => prepare_and_run(
             "verify",
-            verbose,
+            auto_verbose,
             progress,
             progress_keep_open,
             core::repository::verify::PROGRESS_RANGE,

diff --git a/src/plumbing/options/mod.rs b/src/plumbing/options/mod.rs
@@ -30,6 +30,10 @@ pub struct Args {
     #[clap(long, short = 'v')]
     pub verbose: bool,
 
+    /// Turn off verbose message display for commands where these are shown by default.
+    #[clap(long, conflicts_with("verbose"))]
+    pub no_verbose: bool,
+
     /// Bring up a terminal user interface displaying progress visually
     #[cfg(feature = "prodash-render-tui")]
     #[clap(long, conflicts_with("verbose"))]