add completions

Author: wbbradley

src/main.rs

@@ -2,7 +2,8 @@
 use std::{env, fs::canonicalize};
 
 use anyhow::{Context, Result, anyhow, bail, ensure};
-use clap::{Parser, Subcommand};
+use clap::{CommandFactory, Parser, Subcommand};
+use clap_complete::{Shell, generate};
 use colored::Colorize;
 use git::{after_text, git_checkout_main, git_fetch, git_trunk, run_git_status};
 use state::{Branch, RestackStep, StackMethod};
@@ -142,6 +143,12 @@ enum Command {
         #[command(subcommand)]
         action: CacheAction,
     },
+    /// Generate shell completions.
+    Completions {
+        /// Shell to generate completions for.
+        #[arg(value_enum)]
+        shell: Shell,
+    },
     /// Sync local git-stack state with GitHub PRs.
     /// Default: weak push then weak pull (bidirectional sync).
     Sync {
@@ -260,6 +267,13 @@ fn inner_main() -> Result<()> {
         unsafe { std::env::set_var("GIT_STACK_BENCHMARK_JSON", "1") };
     }
 
+    // Handle completions early (doesn't require git repo)
+    if let Some(Command::Completions { shell }) = args.command {
+        let mut cmd = Args::command();
+        generate(shell, &mut cmd, "git-stack", &mut std::io::stdout());
+        return Ok(());
+    }
+
     let repo = canonicalize(
         run_git(&["rev-parse", "--show-toplevel"])?.output_or("No git directory found")?,
     )?
@@ -398,6 +412,7 @@ fn inner_main() -> Result<()> {
             };
             sync::sync(&git_repo, &mut state, &repo, options)
         }
+        Some(Command::Completions { .. }) => unreachable!("handled above"),
         None => {
             state.try_auto_mount(&git_repo, &repo, &current_branch)?;
             status(

src/state.rs

@@ -632,12 +632,13 @@ impl State {
         let trunk = self.ensure_trunk(git_repo, repo);
 
         if let Some(ref trunk) = trunk
-            && trunk.main_branch == branch_name {
-                bail!(
-                    "Branch {branch_name} cannot be stacked on anything else.",
-                    branch_name = branch_name.red()
-                );
-            }
+            && trunk.main_branch == branch_name
+        {
+            bail!(
+                "Branch {branch_name} cannot be stacked on anything else.",
+                branch_name = branch_name.red()
+            );
+        }
 
         let parent_branch = parent_branch
             .or_else(|| trunk.map(|t| t.main_branch))

src/tui/app.rs

@@ -272,37 +272,36 @@ fn render_branch_item(branch: &RenderableBranch, verbose: bool) -> ListItem<'sta
     }
 
     // PR info (non-verbose mode)
-    if !verbose
-        && let Some(ref pr) = branch.pr_info {
-            let state_color = match pr.state {
-                PrDisplayState::Draft => apply_dim(theme::GRAY, dim),
-                PrDisplayState::Open => apply_dim(theme::GREEN, dim),
-                PrDisplayState::Merged => apply_dim(theme::PURPLE, dim),
-                PrDisplayState::Closed => apply_dim(theme::RED, dim),
-            };
-
-            let author_rgb = string_to_color(&pr.author);
-            let author_color = apply_dim(author_rgb, dim);
-
-            spans.push(Span::styled(
-                " ",
-                Style::default().fg(apply_dim(theme::PR_ARROW, dim)),
-            ));
-            spans.push(Span::styled(
-                format!("@{}", pr.author),
-                Style::default().fg(author_color),
-            ));
-            spans.push(Span::raw(" "));
-            spans.push(Span::styled(
-                format!("#{}", pr.number),
-                Style::default().fg(apply_dim(theme::PR_NUMBER, dim)),
-            ));
-            spans.push(Span::raw(" "));
-            spans.push(Span::styled(
-                format!("[{}]", pr.state),
-                Style::default().fg(state_color),
-            ));
-        }
+    if !verbose && let Some(ref pr) = branch.pr_info {
+        let state_color = match pr.state {
+            PrDisplayState::Draft => apply_dim(theme::GRAY, dim),
+            PrDisplayState::Open => apply_dim(theme::GREEN, dim),
+            PrDisplayState::Merged => apply_dim(theme::PURPLE, dim),
+            PrDisplayState::Closed => apply_dim(theme::RED, dim),
+        };
+
+        let author_rgb = string_to_color(&pr.author);
+        let author_color = apply_dim(author_rgb, dim);
+
+        spans.push(Span::styled(
+            " ",
+            Style::default().fg(apply_dim(theme::PR_ARROW, dim)),
+        ));
+        spans.push(Span::styled(
+            format!("@{}", pr.author),
+            Style::default().fg(author_color),
+        ));
+        spans.push(Span::raw(" "));
+        spans.push(Span::styled(
+            format!("#{}", pr.number),
+            Style::default().fg(apply_dim(theme::PR_NUMBER, dim)),
+        ));
+        spans.push(Span::raw(" "));
+        spans.push(Span::styled(
+            format!("[{}]", pr.state),
+            Style::default().fg(state_color),
+        ));
+    }
 
     ListItem::new(Line::from(spans))
 }