vinzenz/hyperhive
vinzenz/hyperhive
Watch
0
0
Fork
You've already forked hyperhive
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

docs, prompts, hive-forge: stop handing readers the renamed verbs

Browse source 
docs/tools/forge.md already listed the nine renamed verbs as removed, then
used them ~30 more times in pasteable blocks. Sweeps every occurrence a
reader would type, including three runtime messages that told the user to
run a verb the same binary rejects.

The renamed-verb list itself keeps the old names; it is what documents them.

Refs #4155
This commit is contained in:
atlas 2026-09-10 15:56:20 +02:00 • committed by mara
commit 55f01942a2
23 changed files with 73 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hive-forge/src/verbs/pr_merge.rs
View file

@ -1,11 +1,11 @@
//! `pr-merge <number> [--method merge|rebase] [--keep-branch] [--force]`
//! `pr merge <number> [--method merge|rebase] [--keep-branch] [--force]`
//! — merge a pull request.
//!
//! Wraps `POST /api/v1/repos/{owner}/{repo}/pulls/{n}/merge` so agents on a
//! peer-review-and-merge workflow (e.g. the paper repo, where agents merge
//! each other's PRs without an operator approval) have a CLI path instead of
//! reaching for the raw API. Pairs with `pr-status` (the merge-readiness
//! verdict this verb pre-checks) and `pr-create`.
//! reaching for the raw API. Pairs with `pr status` (the merge-readiness
//! verdict this verb pre-checks) and `pr create`.
//!
//! Safe by default: refuses unless the PR is mergeable, CI is not red, and no
//! review requests changes — pass `--force` to override (which also sets
@ -120,7 +120,7 @@ pub fn run(client: &Client, args: Args) -> Result<()> {
Ok(())
}
/// Pre-merge readiness gate, mirroring `pr-status`'s verdict: the PR must be
/// Pre-merge readiness gate, mirroring `pr status`'s verdict: the PR must be
/// mergeable, CI must not be red/pending, and no review may request changes.
/// Bails with an actionable message (pointing at `--force`) on the first
/// failure.
@ -133,7 +133,7 @@ fn check_ready(client: &Client, repo: &str, number: u64, pull: &PullRequest) ->
// correct for one of those causes and actively wrong advice for the
// others (rebasing a draft does nothing). Only name the
// cause when the API actually confirms it (draft); otherwise report
// the bare observation and let `pr-status` be consulted for detail.
// the bare observation and let `pr status` be consulted for detail.
// Report the confirmed cause without prescribing the fix — a draft
// can be a deliberate signal (from the author, or the operator)
// rather than an oversight, so don't tell the caller to just
@ -142,7 +142,7 @@ fn check_ready(client: &Client, repo: &str, number: u64, pull: &PullRequest) ->
"pr-merge: PR #{number} is a draft, not mergeable. Pass --force, or check with whoever set draft before un-drafting it."
),
Some(false) => bail!(
"pr-merge: PR #{number} is not mergeable. Check `pr-status --pr {number}` for detail, or pass --force."
"pr-merge: PR #{number} is not mergeable. Check `pr status --pr {number}` for detail, or pass --force."
),
None => bail!(
"pr-merge: PR #{number} mergeability is still being computed. Retry shortly, or pass --force."
@ -165,7 +165,7 @@ fn check_ready(client: &Client, repo: &str, number: u64, pull: &PullRequest) ->
// (latest-per-reviewer, so a later APPROVED clears an earlier
// REQUEST_CHANGES). A superseded REQUEST_CHANGES — stale (older head) or
// dismissed — no longer applies, so it doesn't block. Shares the verdict
// logic with `pr-status`.
// logic with `pr status`.
let blockers: Vec<String> = super::latest_reviews(client, repo, number)?
.into_iter()
.filter(|r| r.state == "REQUEST_CHANGES" && !r.superseded())