Merge pull request #13913 from gitbutlerapp/remove-unapply-prompt

breaking(but): remove confirmation prompt for `but unapply`

Author: slarse

crates/but/src/args/mod.rs

@@ -1016,9 +1016,6 @@ pub enum Subcommands {
     Unapply {
         /// CLI ID or name of the branch/stack to unapply
         identifier: String,
-        /// Force unapply without confirmation
-        #[clap(long, short = 'f')]
-        force: bool,
     },
 
     /// Apply a branch to the workspace.

crates/but/src/command/legacy/unapply.rs

@@ -3,10 +3,7 @@
 use anyhow::{Context as _, bail};
 use but_core::ref_metadata::StackId;
 
-use crate::{
-    CliId, IdMap,
-    utils::{Confirm, ConfirmDefault, OutputChannel},
-};
+use crate::{CliId, IdMap, utils::OutputChannel};
 
 /// Handle the unapply command.
 ///
@@ -20,7 +17,6 @@ pub fn handle(
     ctx: &mut but_ctx::Context,
     out: &mut OutputChannel,
     identifier: &str,
-    force: bool,
 ) -> anyhow::Result<()> {
     let mut guard = ctx.exclusive_worktree_access();
     // Fetch stacks once at the start
@@ -70,14 +66,7 @@ pub fn handle(
         );
     };
 
-    confirm_and_unapply_stack(
-        ctx,
-        stack_id,
-        &branches,
-        force,
-        out,
-        guard.write_permission(),
-    )
+    unapply_stack(ctx, stack_id, &branches, out, guard.write_permission())
 }
 
 /// Get branches for a stack by ID, validating the stack exists.
@@ -121,27 +110,15 @@ fn find_stack_by_branch_name(
     bail!("Branch '{branch_name}' not found in any applied stack");
 }
 
-/// Confirm with the user and unapply the stack.
-fn confirm_and_unapply_stack(
+fn unapply_stack(
     ctx: &mut but_ctx::Context,
     sid: StackId,
     branches: &[String],
-    force: bool,
     out: &mut OutputChannel,
     perm: &mut but_core::sync::RepoExclusive,
 ) -> anyhow::Result<()> {
     let branches_display = branches.join(", ");
 
-    if !force
-        && let Some(mut inout) = out.prepare_for_terminal_input()
-        && inout.confirm(
-            format!("Are you sure you want to unapply stack with branches '{branches_display}'?"),
-            ConfirmDefault::No,
-        )? == Confirm::No
-    {
-        bail!("Aborted unapply operation.");
-    }
-
     but_api::legacy::virtual_branches::unapply_stack_with_perm(ctx, sid, perm)?;
 
     if let Some(out) = out.for_human() {

crates/but/src/lib.rs

@@ -1448,7 +1448,7 @@ async fn match_subcommand(
                 .show_root_cause_error_then_exit_without_destructors(output)
         }
         #[cfg(feature = "legacy")]
-        Subcommands::Unapply { identifier, force } => {
+        Subcommands::Unapply { identifier } => {
             let mut ctx = setup::init_ctx(
                 &args,
                 InitCtxOptions {
@@ -1457,7 +1457,7 @@ async fn match_subcommand(
                 },
                 out,
             )?;
-            command::legacy::unapply::handle(&mut ctx, out, &identifier, force)
+            command::legacy::unapply::handle(&mut ctx, out, &identifier)
                 .context("Failed to unapply branch.")
                 .emit_metrics(metrics_ctx)
                 .show_root_cause_error_then_exit_without_destructors(output)