Display marked branches in but status and log

Author: krlvi

crates/but/src/log/mod.rs

@@ -17,12 +17,18 @@ pub(crate) fn commit_graph(repo_path: &Path, _json: bool) -> anyhow::Result<()>
     but_rules::process_rules(ctx).ok(); // TODO: this is doing double work (dependencies can be reused)
     let stacks = stacks(ctx)?
         .iter()
-        .filter_map(|s| s.id.map(|id| stack_details(ctx, id)))
+        .filter_map(|s| s.id.map(|id| stack_details(ctx, id).map(|d| (id, d))))
         .filter_map(Result::ok)
         .collect::<Vec<_>>();
 
     let mut nesting = 0;
-    for (i, stack) in stacks.iter().enumerate() {
+    for (i, (stack_id, stack)) in stacks.iter().enumerate() {
+        let marked = crate::mark::stack_marked(ctx, *stack_id).unwrap_or_default();
+        let mut mark = if marked {
+            Some("◀ Marked ▶".red().bold())
+        } else {
+            None
+        };
         let mut second_consecutive = false;
         let mut stacked = false;
         for branch in stack.branch_details.iter() {
@@ -46,13 +52,15 @@ pub(crate) fn commit_graph(repo_path: &Path, _json: bool) -> anyhow::Result<()>
                 .underline()
                 .blue();
             println!(
-                "{}{}{} [{}] {}",
+                "{}{}{} [{}] {} {}",
                 "│ ".repeat(nesting),
                 extra_space,
                 line,
                 branch.name.to_string().green().bold(),
-                id
+                id,
+                mark.clone().unwrap_or_default()
             );
+            mark = None; // show this on the first branch in the stack
             for (j, commit) in branch.upstream_commits.iter().enumerate() {
                 let time_string = chrono::DateTime::from_timestamp_millis(commit.created_at as i64)
                     .ok_or(anyhow::anyhow!("Could not parse timestamp"))?

crates/but/src/mark/mod.rs

@@ -4,6 +4,7 @@ use crate::rub::branch_name_to_stack_id;
 use anyhow::bail;
 use but_rules::Operation;
 use but_settings::AppSettings;
+use but_workspace::StackId;
 use gitbutler_command_context::CommandContext;
 use gitbutler_project::Project;
 pub(crate) fn handle(
@@ -45,6 +46,7 @@ fn mark_branch(ctx: &mut CommandContext, branch_name: String, delete: bool) -> a
         println!("Mark was removed");
         return Ok(());
     }
+    // TODO: if there are other marks of this kind, get rid of them
     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()),
@@ -60,3 +62,10 @@ fn mark_branch(ctx: &mut CommandContext, branch_name: String, delete: bool) -> a
     println!("Changes will be assigned to → {}", branch_name);
     Ok(())
 }
+
+pub(crate) fn stack_marked(ctx: &mut CommandContext, stack_id: StackId) -> anyhow::Result<bool> {
+    let rules = but_rules::list_rules(ctx)?
+        .iter()
+        .any(|r| r.target_stack_id() == Some(stack_id.to_string()));
+    Ok(rules)
+}

crates/but/src/status/mod.rs

@@ -52,12 +52,13 @@ pub(crate) fn worktree(repo_path: &Path, _json: bool) -> anyhow::Result<()> {
     }
 
     let unassigned = assignment::filter_by_stack_id(assignments_by_file.values(), &None);
-    print_group(None, unassigned, &changes)?;
+    print_group(None, unassigned, &changes, false)?;
 
     for (stack_id, branch) in &stack_id_to_branch {
         let filtered =
             assignment::filter_by_stack_id(assignments_by_file.values(), &Some(*stack_id));
-        print_group(Some(branch.as_str()), filtered, &changes)?;
+        let marked = crate::mark::stack_marked(ctx, *stack_id).unwrap_or_default();
+        print_group(Some(branch.as_str()), filtered, &changes, marked)?;
     }
     Ok(())
 }
@@ -66,6 +67,7 @@ pub fn print_group(
     group: Option<&str>,
     assignments: Vec<FileAssignment>,
     changes: &[TreeChange],
+    marked: bool,
 ) -> anyhow::Result<()> {
     let id = if let Some(group) = group {
         CliId::branch(group)
@@ -78,7 +80,17 @@ pub fn print_group(
     let group = &group
         .map(|s| format!("[{}]", s))
         .unwrap_or("<UNASSIGNED>".to_string());
-    println!("{}    {}", id, group.green().bold());
+    let mark = if marked {
+        Some("◀ Marked ▶".red().bold())
+    } else {
+        None
+    };
+    println!(
+        "{}    {} {}",
+        id,
+        group.green().bold(),
+        mark.unwrap_or_default()
+    );
     for fa in assignments {
         let state = status_from_changes(changes, fa.path.clone());
         let path = match state {