feat: add ability to say "no" in auto confirmation

Author: nik-rev

src/cli.rs

@@ -1,7 +1,7 @@
 //! Parse the command-line arguments
 
 use clap::{
-    CommandFactory as _, Parser, Subcommand,
+    CommandFactory as _, Parser, Subcommand, ValueEnum,
     builder::styling::{AnsiColor, Effects},
 };
 
@@ -27,19 +27,28 @@ pub struct Cli {
     pub use_gh_cli: bool,
 }
 
+/// Overwrite existing patchy config file if it exists
+#[derive(ValueEnum, Clone, Debug, Copy)]
+pub enum Confirm {
+    /// Overwrite
+    Yes,
+    /// Do not overwrite
+    No,
+}
+
 #[derive(Subcommand, Debug)]
 pub enum Command {
     /// Create example config file
     Init {
-        /// Do not prompt when overwriting local-branch specified in the config
+        /// Do not ask for confirmation when overwriting existing config file
         #[arg(short, long)]
-        yes: bool,
+        confirm: Option<Confirm>,
     },
     /// Invoke patchy
     Run {
-        /// Do not prompt when overwriting local-branch specified in the config
+        /// Do not ask for confirmation when overwriting the specified branch
         #[arg(short, long)]
-        yes: bool,
+        confirm: Option<Confirm>,
     },
     /// Generate a .patch file from a commit hash
     GenPatch {
@@ -94,8 +103,10 @@ impl Command {
     /// Execute the command
     pub async fn execute(self, use_gh_cli: bool) -> anyhow::Result<()> {
         match self {
-            Self::Init { yes } => commands::init(yes)?,
-            Self::Run { yes } => commands::run(yes, use_gh_cli).await?,
+            Self::Init {
+                confirm: overwrite_file_if_exists,
+            } => commands::init(overwrite_file_if_exists)?,
+            Self::Run { confirm } => commands::run(confirm, use_gh_cli).await?,
             Self::GenPatch { commit, filename } => {
                 commands::gen_patch(commit, filename)?;
             }

src/commands/init.rs

@@ -6,18 +6,24 @@ use std::io::Write as _;
 use anyhow::bail;
 use colored::Colorize as _;
 
+use crate::cli::Confirm;
 use crate::{config, confirm_prompt};
 
 /// Initialize the Patchy config file
-pub fn init(yes: bool) -> anyhow::Result<()> {
-    if config::FILE_PATH.exists()
-        && !yes
-        && !confirm_prompt!(
-            "File {} already exists. Overwrite it?",
-            config::FILE_PATH.to_string_lossy().bright_blue(),
-        )
-    {
-        bail!("Did not overwrite {}", config::FILE_PATH.display());
+pub fn init(overwrite: Option<Confirm>) -> anyhow::Result<()> {
+    if config::FILE_PATH.exists() {
+        let overwrite_if_exists = match overwrite {
+            Some(Confirm::Yes) => true,
+            Some(Confirm::No) => false,
+            None => confirm_prompt!(
+                "File {} already exists. Overwrite it?",
+                config::FILE_PATH.to_string_lossy().bright_blue(),
+            ),
+        };
+
+        if !overwrite_if_exists {
+            bail!("Did not overwrite {}", config::FILE_PATH.display());
+        }
     }
 
     fs::create_dir_all(&*config::PATH)?;

src/commands/run.rs

@@ -1,5 +1,6 @@
 //! `run` subcommand
 
+use crate::cli::Confirm;
 use crate::config::{self, BranchName, Config, PrNumber, PullRequest};
 use anyhow::Result;
 use std::fs;
@@ -12,7 +13,7 @@ use crate::utils::{format_pr, format_url, with_uuid};
 use crate::{commands, confirm_prompt, git};
 
 /// Run patchy, if `yes` then there will be no prompt
-pub async fn run(yes: bool, use_gh_cli: bool) -> Result<()> {
+pub async fn run(confirm: Option<Confirm>, use_gh_cli: bool) -> Result<()> {
     let root = config::ROOT.as_str();
 
     let Ok(config_string) = fs::read_to_string(&*config::FILE_PATH) else {
@@ -21,14 +22,16 @@ pub async fn run(yes: bool, use_gh_cli: bool) -> Result<()> {
             config::FILE
         );
 
-        // We don't want to have *any* sort of prompt when using the -y flag since that
-        // would be problematic in scripts
-        if !yes && confirm_prompt!("Would you like us to run `patchy init` to initialize it?",) {
-            commands::init(false)?;
-        } else if yes {
-            log::info!("You can create it with `patchy init`",);
+        let init_file = match confirm {
+            Some(Confirm::Yes) => true,
+            Some(Confirm::No) => false,
+            None => confirm_prompt!("Would you like us to run `patchy init` to initialize it?",),
+        };
+
+        if init_file {
+            commands::init(Some(Confirm::Yes))?;
         } else {
-            // user said "no" in the prompt, so we don't do any initializing
+            log::info!("You can create it with `patchy init`",);
         }
 
         // We don't want to read the default configuration file as config_string. Since
@@ -243,20 +246,17 @@ pub async fn run(yes: bool, use_gh_cli: bool) -> Result<()> {
         &info.branch.local_branch_name,
     )?;
 
-    if yes
-        || confirm_prompt!(
+    let overwrite_branch = match confirm {
+        Some(Confirm::Yes) => true,
+        Some(Confirm::No) => false,
+        None => confirm_prompt!(
             "Overwrite branch {}? This is irreversible.",
             config.local_branch.as_ref().cyan()
-        )
-    {
+        ),
+    };
+
+    if overwrite_branch {
         git::rename_branch(&temporary_branch, config.local_branch.as_ref())?;
-        if yes {
-            log::info!(
-                "Automatically overwrote branch {} since you supplied the {} flag",
-                config.local_branch.as_ref().cyan(),
-                "--yes".bright_magenta()
-            );
-        }
         log::info!("Success!");
         return Ok(());
     }