1 files changed, 48 insertions, 7 deletions

diff --git a/src/bin/ngit/sub_commands/checkout.rs b/src/bin/ngit/sub_commands/checkout.rs
index 6ded778..2fc9a09 100644
--- a/src/bin/ngit/sub_commands/checkout.rs
+++ b/src/bin/ngit/sub_commands/checkout.rs
@@ -1,9 +1,11 @@
 use std::{
     collections::HashSet,
     process::{Command, Stdio},
+    time::Duration,
 };
 
 use anyhow::{Context, Result, bail};
+use indicatif::{ProgressBar, ProgressStyle};
 use ngit::{
     client::{
         Params, get_all_proposal_patch_pr_pr_update_events_from_cache,
@@ -97,16 +99,55 @@ pub async fn launch(id: &str) -> Result<()> {
 }
 
 fn run_git_fetch(remote_name: &str) -> Result<()> {
-    println!("fetching from {remote_name}...");
-    let exit_status = Command::new("git")
+    let verbose = ngit::client::is_verbose();
+    if verbose {
+        println!("fetching from {remote_name}...");
+    }
+
+    let spinner = if verbose {
+        None
+    } else {
+        let pb = ProgressBar::new_spinner()
+            .with_style(
+                ProgressStyle::with_template("{spinner} {msg}")
+                    .unwrap()
+                    .tick_chars("⠁⠂⠄⡀⢀⠠⠐⠈"),
+            )
+            .with_message(format!("Fetching from {remote_name}..."));
+        pb.enable_steady_tick(Duration::from_millis(100));
+        Some(pb)
+    };
+
+    let output = Command::new("git")
         .args(["fetch", remote_name])
-        .stdout(Stdio::inherit())
-        .stderr(Stdio::inherit())
-        .status()
+        .stdout(if verbose {
+            Stdio::inherit()
+        } else {
+            Stdio::piped()
+        })
+        .stderr(if verbose {
+            Stdio::inherit()
+        } else {
+            Stdio::piped()
+        })
+        .output()
         .context("failed to run git fetch")?;
 
-    if !exit_status.success() {
-        bail!("git fetch {remote_name} exited with error: {exit_status}");
+    if let Some(spinner) = spinner {
+        spinner.finish_and_clear();
+    }
+
+    if !output.status.success() {
+        if !verbose {
+            let stderr = String::from_utf8_lossy(&output.stderr);
+            if !stderr.is_empty() {
+                eprintln!("{stderr}");
+            }
+        }
+        bail!(
+            "git fetch {remote_name} exited with error: {}",
+            output.status
+        );
     }
     Ok(())
 }