BUTCLI: adds the ability to remove marks

Author: krlvi

crates/but/src/args.rs

@@ -109,10 +109,13 @@ For examples see `but rub --help`."
         /// The target entity to combine with the source
         target: String,
     },
-    /// Creates a rule for auto-assigning or auto-comitting
+    /// Creates or removes a rule for auto-assigning or auto-comitting
     Mark {
         /// The target entity that will be marked
         target: String,
+        /// Deletes a mark
+        #[clap(long, short = 'd')]
+        delete: bool,
     },
     /// Starts up the MCP server.
     Mcp {

crates/but/src/main.rs

@@ -169,8 +169,8 @@ async fn main() -> Result<()> {
             metrics_if_configured(app_settings, CommandName::Rub, props(start, &result)).ok();
             Ok(())
         }
-        Subcommands::Mark { target } => {
-            let result = mark::handle(&args.current_dir, args.json, target)
+        Subcommands::Mark { target, delete } => {
+            let result = mark::handle(&args.current_dir, args.json, target, *delete)
                 .context("Can't mark this. Taaaa-na-na-na. Can't mark this.");
             if let Err(e) = &result {
                 eprintln!("{} {}", e, e.root_cause());

crates/but/src/mark/mod.rs

@@ -6,7 +6,12 @@ use but_rules::Operation;
 use but_settings::AppSettings;
 use gitbutler_command_context::CommandContext;
 use gitbutler_project::Project;
-pub(crate) fn handle(repo_path: &Path, _json: bool, target_str: &str) -> anyhow::Result<()> {
+pub(crate) fn handle(
+    repo_path: &Path,
+    _json: bool,
+    target_str: &str,
+    delete: bool,
+) -> anyhow::Result<()> {
     let project = Project::from_path(repo_path).expect("Failed to create project from path");
     let ctx = &mut CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
     let target_result = crate::id::CliId::from_str(ctx, target_str)?;
@@ -18,19 +23,29 @@ pub(crate) fn handle(repo_path: &Path, _json: bool, target_str: &str) -> anyhow:
         ));
     }
     match target_result[0].clone() {
-        crate::id::CliId::Branch { name } => mark_branch(ctx, name),
-        crate::id::CliId::Commit { oid } => mark_commit(oid),
+        crate::id::CliId::Branch { name } => mark_branch(ctx, name, delete),
+        crate::id::CliId::Commit { oid } => mark_commit(oid, delete),
         _ => bail!("Nope"),
     }
 }
 
-fn mark_commit(_oid: gix::ObjectId) -> anyhow::Result<()> {
+fn mark_commit(_oid: gix::ObjectId, _delete: bool) -> anyhow::Result<()> {
     bail!("Not implemented yet");
 }
 
-fn mark_branch(ctx: &mut CommandContext, branch_name: String) -> anyhow::Result<()> {
-    let stack_id =
-        branch_name_to_stack_id(ctx, Some(&branch_name))?.expect("Cant find stack for this branch");
+fn mark_branch(ctx: &mut CommandContext, branch_name: String, delete: bool) -> anyhow::Result<()> {
+    let stack_id = branch_name_to_stack_id(ctx, Some(&branch_name))?;
+    if delete {
+        let rules = but_rules::list_rules(ctx)?;
+        for rule in rules {
+            if rule.target_stack_id() == stack_id.map(|s| s.to_string()) {
+                but_rules::delete_rule(ctx, &rule.id())?;
+            }
+        }
+        println!("Mark was removed");
+        return Ok(());
+    }
+    let stack_id = stack_id.expect("Cant find stack for this branch");
     let action = but_rules::Action::Explicit(Operation::Assign {
         target: but_rules::StackTarget::StackId(stack_id.to_string()),
     });