vole
Clone
Read only, no credentials:
https://rodent.software/git/vole.git
Write over SSH with a registered key:
git clone ssh://git@0.0.0.0:2222/vole.git
A free and open-source forge that lives in your Git repo.
Land a change request on the server instead of by pushing
38b3025145d8cee8479733fd4d3b0df443c72607 · Keenan Nemetz · 13d ago · parent 536f08b9
Land a change request on the server instead of by pushing A change request could only be landed by merging locally and pushing the base branch: the web page was a review surface with no way to finish, and nothing recorded that the request had landed. `state: merged` was already accepted by the request reader and rendered by the activity feed, but nothing ever wrote it, so a merged request and an abandoned one looked identical. The gate that decides a landing lives in the pre-receive hook, and the hook only sees pushes. A merge performed inside the server moves the ref without the hook, so a server-side merge either re-runs that rule or becomes the easiest way to land an unapproved change. It now re-runs it: the approval and check rule moved to forge/landing, and both the hook and the new landing operation call the same Check. Landing is fast-forward when the base is an ancestor of the reviewed head, so the commit that passed CI is the commit that lands; otherwise a two-parent merge commit, which is the only other shape the gate accepts. Conflicts are refused with the conflicting paths, never resolved. The ref moves by compare-and-swap, so a concurrent push loses cleanly and the landing retries; the request is marked merged after the ref moves, which makes a retry after a crash finish the marking instead of failing. The request now records merged_head, merged_by and merged_at, and the reader refuses a merged request that names no commit, and refuses those fields on a request that is not merged. "merged" is no longer settable through the generic state writer: it has to travel with the commit. The browser gets a Merge button that preflights the same gate, so it only appears when the landing would succeed, and the page shows what landed, who landed it, and when. `vole change merge` follows in its own change: the CLI has no access to the ACL or the run queue, so it needs a verb on the SSH channel, and that transport is worth reviewing on its own. Closes the landing half of #01M5XF4XWHVMMCQEYENA8X32GK.
server/web/capabilities.go +9
| @@ -54,6 +54,15 @@ func canApproveRequest(acl *access.ACL, name, author string) bool { | |||
| 54 | 54 | return canApprove(acl, name) && name != author | |
| 55 | 55 | } | |
| 56 | 56 | ||
| 57 | // canMerge reports whether the account may land a change request here. It is the | ||
| 58 | // approve capability: landing is the act of accepting the review, so the accounts | ||
| 59 | // that may approve may merge. The author is not excluded — merging your own request | ||
| 60 | // after somebody else approved it is the point of separating the two — and whether | ||
| 61 | // this approval count is satisfied is the gate's question, not this one. | ||
| 62 | func canMerge(acl *access.ACL, name string) bool { | ||
| 63 | return canMaintain(acl, name) | ||
| 64 | } | ||
| 65 | |||
| 57 | 66 | // contributorOnly reports whether the account is a contributor and nothing more, | |
| 58 | 67 | // so every branch it may push is inside its own contrib/ namespace. The rule | |
| 59 | 68 | // matters to change requests: a contributor must open one from their own branch, | |