Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/fixed-blocked-every-marker.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- The blocked sweep now waits on every blocker a blocked-on comment (or the issue body) names, not just the first. An issue blocked on two issues was unblocked and called "actionable again" as soon as the first one closed while the second was still open. `blocked` now comes off only once every named PR has merged or closed and every named issue has closed, with one note naming them all; `pr=` and `issue=` markers in the same comment are both honored, and a re-target of one blocker carries the others' markers forward. A single marker behaves as before.
4 changes: 2 additions & 2 deletions src/docs/labels-and-control-signals/reference.md

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/docs/notifications.md
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,7 @@ without a class. Review submissions and review requests are always counted as
| `github.(*Client).postBlockedOnPRMarker` | `protocol_command` | carries the machine-consumed blocked-on marker; shared by a relay's blocked verdict and a PR's `Depends-on:` placement |
| `github.(*Client).markBlockedPRSuccessor` | `protocol_command` | moves a PR's `Depends-on:` hold to the open pull request that replaced a target closed without merging; carries the blocked-on marker and the `hive:depends-on-successor` link the sweep reads back |
| `github.blockedSuccessorRetargetIssue` | `protocol_command` | moves an issue's block to the open issue that replaced its closed blocker (a duplicate closure or a trusted "Superseded by"); carries the issue-form blocked-on marker |
| `github.retargetBlockedOnAll` | `protocol_command` | moves one or more of an issue's several blockers to their open replacements; carries the blocked-on marker of every blocker still open, so the newest marker-bearing comment names all of them |
| `github.(*Client).handleOnePRRequest` | `security_event` | |
| `github.(*Client).markReporterTrustAwaiting` | `security_event` | |
| `github.(*Client).reconcileReporterTrustSignal` | `security_event` | |
Expand Down
4 changes: 4 additions & 0 deletions src/pkg/github/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -5377,6 +5377,10 @@ type RepoWorkIssue struct {
// (liftBlockedMarkerless).
ReviewBacklog bool `json:"review_backlog,omitempty"`
OpenBlockedBy int `json:"open_blocked_by,omitempty"`
// BlockedOn lists every blocker the body's blocked-on markers name
// ("owner/repo#N", or "issue owner/repo#N"), set only when there are
// several, so ReconcileBlockedIssues keeps the block until all settle.
BlockedOn []string `json:"blocked_on,omitempty"`
// OpenBlockers are the keys ("repo#N") of a decision park's open
// blocked-by issues, read only for such a park; the dashboard checks
// whether one is itself a decision park (Issue.OpenBlockers).
Expand Down
Loading
Loading