Merge pull request #10490 from gitbutlerapp/kv-branch-57

Implement but unmark

Author: krlvi

crates/but/src/args.rs

@@ -76,6 +76,8 @@ For examples see `but rub --help`."
         #[clap(long, short = 'd')]
         delete: bool,
     },
+    /// Removes all marks from the workspace
+    Unmark,
     /// Commit changes to a stack.
     Commit {
         /// Commit message

crates/but/src/main.rs

@@ -165,6 +165,15 @@ async fn main() -> Result<()> {
             metrics_if_configured(app_settings, CommandName::Rub, props(start, &result)).ok();
             Ok(())
         }
+        Subcommands::Unmark => {
+            let result = mark::unmark(&args.current_dir, args.json)
+                .context("Can't unmark this. Taaaa-na-na-na. Can't unmark this.");
+            if let Err(e) = &result {
+                eprintln!("{} {}", e, e.root_cause());
+            }
+            metrics_if_configured(app_settings, CommandName::Rub, props(start, &result)).ok();
+            Ok(())
+        }
         Subcommands::Commit {
             message,
             branch,

crates/but/src/mark/mod.rs

@@ -114,3 +114,27 @@ pub(crate) fn commit_marked(ctx: &mut CommandContext, commit_id: String) -> anyh
         .any(|r| r.target_commit_id() == Some(change_id.clone()));
     Ok(rules)
 }
+
+pub(crate) fn unmark(repo_path: &Path, _json: bool) -> anyhow::Result<()> {
+    let project = Project::find_by_path(repo_path).expect("Failed to create project from path");
+    let ctx = &mut CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
+
+    let rules = but_rules::list_rules(ctx)?;
+    let rule_count = rules.len();
+
+    if rule_count == 0 {
+        println!("No marks to remove");
+        return Ok(());
+    }
+
+    for rule in rules {
+        but_rules::delete_rule(ctx, &rule.id())?;
+    }
+
+    println!(
+        "Removed {} mark{}",
+        rule_count,
+        if rule_count == 1 { "" } else { "s" }
+    );
+    Ok(())
+}