zsp/everything-claude-code
1
0
Fork 0
mirror of https://github.com/affaan-m/everything-claude-code.git synced 2026-04-12 04:33:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: auto-rebase blocked merge queue worktrees

Browse Source
This commit is contained in:
Affaan Mustafa
2026-04-09 21:28:33 -07:00
parent 5fb2e62216
commit 599a9d1e7b
5 changed files with 641 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ecc2/src/tui/dashboard.rs
View File

@@ -2734,9 +2734,11 @@ impl Dashboard {
Ok(outcome) => {
self.refresh();
if outcome.merged.is_empty()
&& outcome.rebased.is_empty()
&& outcome.active_with_worktree_ids.is_empty()
&& outcome.conflicted_session_ids.is_empty()
&& outcome.dirty_worktree_ids.is_empty()
&& outcome.blocked_by_queue_session_ids.is_empty()
&& outcome.failures.is_empty()
{
self.set_operator_note("no ready worktrees to merge".to_string());
@@ -2744,6 +2746,9 @@ impl Dashboard {
}
let mut parts = vec![format!("merged {} ready worktree(s)", outcome.merged.len())];
if !outcome.rebased.is_empty() {
parts.push(format!("rebased {}", outcome.rebased.len()));
}
if !outcome.active_with_worktree_ids.is_empty() {
parts.push(format!(
"skipped {} active",
@@ -2762,6 +2767,12 @@ impl Dashboard {
outcome.dirty_worktree_ids.len()
));
}
if !outcome.blocked_by_queue_session_ids.is_empty() {
parts.push(format!(
"blocked {} in queue",
outcome.blocked_by_queue_session_ids.len()
));
}
if !outcome.failures.is_empty() {
parts.push(format!("{} failed", outcome.failures.len()));
}