Repository navigation
π tracker: chevron and caption agree β queue slot is a suffix until the PR is ready - #15581
Conversation
β¦he PR is ready
The merge-train post-pass marks a train's front at any stage, and the SPA
painted the train word ("Merge queued Β· 1st") over the stage word, so the
chevron advertised a future queue slot while the caption described the
current blocker (CI running / verdict pending).
- Go: StageTrackerMergeTrain.Provisional (stage in (0,80)); provisional
front gate reason says "merges first once it is ready".
- SPA: stage-first headline; train slot is a trailing suffix until
merge-ready; chevron tip carries the blocker.
- Tests: Go provisional-front test and node ratchet asserting headline
and stage agree for every (stage, merge_train.state, provisional) combo.
Fixes #15580
Signed-off-by: Andrew Anderson <andy@clubanderson.com>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
|
merged by Hive trusted-author auto-merge: author @clubanderson holds role owner and GitHub permission admin on repo; CI green at 7f97fdb. |
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
There was a problem hiding this comment.
Read stageTrackerMergeTrainPostPass, the stage table, and both JS copies on this head. Looks correct to me.
src/pkg/dashboard/stage_tracker_merge_train.go:98-100:stageTrackerMergeTrainProvisionalusesstagelabels.AwaitingMergeAdmission.Number(), which is 80 (src/pkg/stagelabels/stagelabels.go:275); the JSSTAGE_TRACKER_MERGE_READY = 80agrees, and stage 85 (needs-decision) correctly falls outside the provisional range on both sides.STAGE_TRACKER_PROVISIONAL_STAGE_WORDmatchesstageTrackerShortword-for-word for every key (src/pkg/dashboard/stage_tracker.go:807-831), so the chevron headline and the stage column name the same blocker.- The
tracker-words.jsandstatic/index.htmladditions are byte-identical, andstageTrackerTrainProvisionalJSis lifted into the existing JS test harness so a drift between them would fail the Go tests. Provisionalisomitempty; the JS falls back to the stage check when the field is absent, so an older server still renders sensibly.- The tooltip
.replace(/ Β· merges next/, β¦)attracker-words.js:869has a real target instageTrackerTrainQueueTip(:326), anddetailis consumed by the chip renderer (:992), so the suffix actually shows.
Nothing to flag.
β hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
Fixes #15580
Which one was correct for #15577
The caption. Tracker item:
stage: 50,reason: required-check-pending:build-and-test;gh pr view 15577: build-and-test IN_PROGRESS, no reviews,BLOCKED. The PR was merely ordered first in a 2-PR train (overlap:tracker-words.js), not mergeable.Root cause
stageTrackerMergeTrainPostPassmarks a train's front at any stage < 110 (merge_gate.state=front, "merges next"), and the SPA (stageTrackerMergeGateInfoFor/stageTrackerTrainWord) painted the train word over the stage word whenevermerge_trainwas present. The chevron therefore showed a future queue slot while the caption showed the current blocker.Change
StageTrackerMergeTrainprovisional: truefor members at stage in (0, 80)π Merge queued Β· 1stπ CI / Review Β· queued 1st once ready(stage-first; slot is a muted suffix)<stage word> β <blocker>. <queue tip>Stages β₯ 080 (merge-ready, soak, merging) are unchanged.
Tests
TestStageTrackerMergeTrainProvisionalFrontβ Go: front at 050 is provisional with the new reason; rider at 080 is not.TestStageTrackerQueueSlotHeadlineAgreesWithStageβ node ratchet: every (stage Γfront/queued-behindΓprovisionaltrue/false/undefined) combination yields a headline whose blocker class matches the stage; exact π tracker: say 'mergeable' instead of merge-sweep jargon on soaking rowsΒ #15577 case asserted.headAt50assertion updated.Screenshots
Before (#15577 repro):
After: