VersionControl:PRs/magenta/433: Difference between revisions
From PickiPedia: A knowledge base of bluegrass, old time psychedelic jams, and other public domain music
Jump to navigationJump to search
cryptograss/magenta#433, as GitHub has it |
cryptograss/magenta#433, as GitHub has it |
||
| (One intermediate revision by the same user not shown) | |||
| Line 5: | Line 5: | ||
|url=https://github.com/cryptograss/magenta/pull/433 | |url=https://github.com/cryptograss/magenta/pull/433 | ||
|author=magent-cryptograss | |author=magent-cryptograss | ||
|state= | |state=merged | ||
|base=main | |base=main | ||
|branch=magent/merge-button | |branch=magent/merge-button | ||
|opened=2026-11-08 16:53:06 | |opened=2026-11-08 16:53:06 | ||
|pushed=2026-11-08 16:57:06 | |pushed=2026-11-08 16:57:06 | ||
|merged= | |merged=2026-11-09 00:29:55 | ||
|closed= | |closed= | ||
|worked_on_by=magent, justin, re | |worked_on_by=magent, justin, re | ||
| Line 16: | Line 16: | ||
|deploy=redeploy maybelle, with maybelle-config#289 (without it, githouse refuses a press as malformed and says so in the sheet) | |deploy=redeploy maybelle, with maybelle-config#289 (without it, githouse refuses a press as malformed and says so in the sheet) | ||
}} | }} | ||
<pre class="pr-body">The merge button (Plan, section 10). Justin, 8 Nov: "I'm not gonna wanna manually type merge commands in the CLI for every branch." githouse's half is maybelle-config#289. | |||
**Where it shows up**, for a merger signed in with their SSH key (`githouse_mergers`, deployed here as `GITHOUSE_MERGERS`): | |||
- **The ramp:** a Merge… button on each open row. | |||
- **A 🪢 ask:** a "Merge magenta#426…" button for each piece of work the ask names. It reads `repo#N`, a bare `#N` after one (which takes the same repo), and `repo:branch`. | |||
- **The composer:** `/merge pickipedia:re/foo` or `/merge magenta#123`. The `~` autocomplete finds the name. This opens the sheet and posts nothing. | |||
**The sheet** shows the log and diffstat from githouse's copy, then "Merge now". What it shows is memory-lane's word, which is the trade Justin chose for merging from a phone (7 Nov). | |||
**The press:** | |||
- memory-lane signs the order with its own merge key (`MERGE_KEY_PATH`; Justin made the key on 8 Nov). The key file may hold it in base64 or not. | |||
- The order names whoever pressed in a `for` line and goes into the mailbox. | |||
- githouse checks the signature, that the presser may merge in their own right, and the brakes for that person, never for the key. | |||
- A press for a commit or target that moved after the sheet opened is refused (409). | |||
- Only memory-lane's press writes `for`; the mailbox refuses an order with it from anyone else. | |||
- A pull request's branch and base come from its card. | |||
Checked: 11 new tests, and every inline script on the rendered Moods page passes `node --check`. Full suite: 1796 tests, OK. Not yet tried in a browser: the first real press is the test. | |||
Deploy: redeploy maybelle, with maybelle-config#289 (without it, githouse refuses a press as malformed and says so in the sheet) | |||
Worked on by: magent, justin, re, in #ramp</pre> | |||
Latest revision as of 16:06, 9 November 2026
| State | 🟣 merged 2026-11-09 00:29:55 |
|---|---|
| Worked on by | magent, justin, re |
| Moods | #ramp |
| Deploy | redeploy maybelle, with maybelle-config#289 (without it, githouse refuses a press as malformed and says so in the sheet) |
| Branch | magent/merge-button → main, by magent-cryptograss
|
| Opened · last pushed | 2026-11-08 16:53:06 · 2026-11-08 16:57:06 |
The merge button (Plan, section 10). Justin, 8 Nov: "I'm not gonna wanna manually type merge commands in the CLI for every branch." githouse's half is maybelle-config#289. **Where it shows up**, for a merger signed in with their SSH key (`githouse_mergers`, deployed here as `GITHOUSE_MERGERS`): - **The ramp:** a Merge… button on each open row. - **A 🪢 ask:** a "Merge magenta#426…" button for each piece of work the ask names. It reads `repo#N`, a bare `#N` after one (which takes the same repo), and `repo:branch`. - **The composer:** `/merge pickipedia:re/foo` or `/merge magenta#123`. The `~` autocomplete finds the name. This opens the sheet and posts nothing. **The sheet** shows the log and diffstat from githouse's copy, then "Merge now". What it shows is memory-lane's word, which is the trade Justin chose for merging from a phone (7 Nov). **The press:** - memory-lane signs the order with its own merge key (`MERGE_KEY_PATH`; Justin made the key on 8 Nov). The key file may hold it in base64 or not. - The order names whoever pressed in a `for` line and goes into the mailbox. - githouse checks the signature, that the presser may merge in their own right, and the brakes for that person, never for the key. - A press for a commit or target that moved after the sheet opened is refused (409). - Only memory-lane's press writes `for`; the mailbox refuses an order with it from anyone else. - A pull request's branch and base come from its card. Checked: 11 new tests, and every inline script on the rendered Moods page passes `node --check`. Full suite: 1796 tests, OK. Not yet tried in a browser: the first real press is the test. Deploy: redeploy maybelle, with maybelle-config#289 (without it, githouse refuses a press as malformed and says so in the sheet) Worked on by: magent, justin, re, in #ramp