crashlabs/huskies
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 27 Wiki Activity

huskies: merge 982

Browse Source
This commit is contained in:
dave
2026-05-13 15:30:03 +00:00
parent e6d051d016
commit 91fbad568a
15 changed files with 357 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/chat/commands/status/render.rs
+4 -4
View File
@@ -235,12 +235,12 @@ fn render_item_line(
) {
match &item.stage {
// MergeFailureFinal: mergemaster already tried and gave up — always ⛔.
Stage::MergeFailureFinal { reason } => {
let snippet = first_non_empty_snippet(reason, 120);
Stage::MergeFailureFinal { kind } => {
let snippet = first_non_empty_snippet(&kind.display_reason(), 120);
return format!(" \u{26D4} {display}{cost_suffix}{dep_suffix} — {snippet}\n");
}
// MergeFailure: a recovery agent may be running or queued.
Stage::MergeFailure { reason, .. } => {
Stage::MergeFailure { kind, .. } => {
return match agent.map(|a| &a.status) {
Some(AgentStatus::Running) => format!(
" \u{1F916} {display}{cost_suffix}{dep_suffix} — mergemaster running\n"
@@ -249,7 +249,7 @@ fn render_item_line(
" \u{23F3} {display}{cost_suffix}{dep_suffix} — mergemaster queued\n"
),
_ => {
let snippet = first_non_empty_snippet(reason, 120);
let snippet = first_non_empty_snippet(&kind.display_reason(), 120);
format!(" \u{26D4} {display}{cost_suffix}{dep_suffix} — {snippet}\n")
}
};