Merge pull request #10561 from gitbutlerapp/kv-branch-55

feat(oplog): add --force flag to skip restore confirmation and

Author: krlvi

crates/but/src/args.rs

@@ -110,6 +110,9 @@ For examples see `but rub --help`."
     Restore {
         /// Oplog SHA to restore to
         oplog_sha: String,
+        /// Skip confirmation prompt
+        #[clap(short = 'f', long = "force")]
+        force: bool,
     },
     /// Undo the last operation by reverting to the previous snapshot.
     Undo,

crates/but/src/main.rs

@@ -220,9 +220,9 @@ async fn main() -> Result<()> {
             metrics_if_configured(app_settings, CommandName::Oplog, props(start, &result)).ok();
             result
         }
-        Subcommands::Restore { oplog_sha } => {
+        Subcommands::Restore { oplog_sha, force } => {
             let project = get_or_init_project(&args.current_dir)?;
-            let result = oplog::restore_to_oplog(&project, args.json, oplog_sha);
+            let result = oplog::restore_to_oplog(&project, args.json, oplog_sha, *force);
             metrics_if_configured(app_settings, CommandName::Restore, props(start, &result)).ok();
             result
         }

crates/but/src/oplog/mod.rs

@@ -117,6 +117,7 @@ pub(crate) fn restore_to_oplog(
     project: &Project,
     _json: bool,
     oplog_sha: &str,
+    force: bool,
 ) -> anyhow::Result<()> {
     let snapshots = but_api::undo::list_snapshots(project.id, 1000, None, None)?;
 
@@ -160,23 +161,25 @@ pub(crate) fn restore_to_oplog(
     println!("  Snapshot: {}", commit_sha_string[..7].cyan().underline());
 
     // Confirm the restoration (safety check)
-    println!(
-        "\n{}",
-        "⚠️  This will overwrite your current workspace state."
-            .yellow()
-            .bold()
-    );
-    print!("Continue with restore? [y/N]: ");
-    use std::io::{self, Write};
-    io::stdout().flush()?;
-
-    let mut input = String::new();
-    io::stdin().read_line(&mut input)?;
-
-    let input = input.trim().to_lowercase();
-    if input != "y" && input != "yes" {
-        println!("{}", "Restore cancelled.".yellow());
-        return Ok(());
+    if !force {
+        println!(
+            "\n{}",
+            "⚠️  This will overwrite your current workspace state."
+                .yellow()
+                .bold()
+        );
+        print!("Continue with restore? [y/N]: ");
+        use std::io::{self, Write};
+        io::stdout().flush()?;
+
+        let mut input = String::new();
+        io::stdin().read_line(&mut input)?;
+
+        let input = input.trim().to_lowercase();
+        if input != "y" && input != "yes" {
+            println!("{}", "Restore cancelled.".yellow());
+            return Ok(());
+        }
     }
 
     // Restore to the target snapshot using the but-api crate