gitoriaLog in with ident

gitoria

All repositories: gitoria

ReadmeCodePull requestsReleasesTicketsSettings
Main branchmain4f47843egate: ticket links use the tickets short URL (/<slug>/<n>, tickets#25)mremain/components/pulls.hl

3.9 KB

  1. // components/pulls.hl — THE PULL REQUESTS of a repo (gitoria#11, gitoria#16): `/pulls` on <slug>.<domain>, its
  2. // own route. The repo head is rendered on the server from the request's host. The list comes from git (the
  3. // commits whose message starts with |||PR) on the SERVER too
  4. // (lib/pulls.hl pullsNow — hl:proc run() waits, hybriel#80): it is in the first HTML and in every hl:web navigation.
  5. parent './main.hl'
  6. import { siteName } from '../project.hl'
  7. import RepoHead from './repohead.hl'
  8. import { slugOfHost } from '../lib/util.hl'
  9. import { userOfSession } from '../lib/users.hl'
  10. import { repoAt, ownsRepo } from '../lib/repos.hl'
  11. import { pageTitle } from '../lib/repos-helpers.hl'
  12. import { pullsNow, mergePullNow, withMerge, pullsView } from '../lib/pulls.hl'
  13. import { withPullParts } from '../lib/tickets-helpers.hl'
  14. import { notifyPush } from '../lib/tickets.hl'
  15. host = null
  16. session = null
  17. slug = slugOfHost(host)
  18. repo = repoAt(slug)
  19. hasRepo = repo != null
  20. isOwner = repo != null && ownsRepo(slug, session)
  21. mergeError = ''
  22. got = repo != null ? pullsNow(slug, repo.branch) : null
  23. pullsShown = got != null && !got.isMessage
  24. pullsMessage = got != null && got.isMessage
  25. pullsText = got != null && got.isMessage ? got.message : ''
  26. pullsNone = got != null && !got.isMessage && got.noPulls
  27. pullsList = got != null && !got.isMessage ? withPullParts(withMerge(got.pulls, isOwner), repo.ticketsProject) : []
  28. pullsDefault = got != null && !got.isMessage ? got.defaultName : ''
  29. __title = pageTitle(siteName, slug, 'Pull requests')
  30. View {
  31. repoPage {
  32. RepoHead { }
  33. if (hasRepo) {
  34. repoPulls { id = "pulls"
  35. if (pullsMessage) { p { id = "pullsmessage" class = "empty" pullsText } }
  36. if (pullsShown) {
  37. p { id = "pullshelp" class = "muted" "A commit whose message starts with " code { "|||PR " } " opens a pull request; " code { "|||PR|branch] " } " sets the target (now: " strong { pullsDefault } " by default)." }
  38. if (pullsNone) { p { id = "nopulls" class = "empty" "No pull request yet." } }
  39. p { id = "mergeerror" class = "message" mergeError }
  40. ol { id = "pulllist"
  41. for (pr of pullsList) {
  42. li {
  43. span { class = "subject" for (pt of pr.parts) { if (pt.isText) { a { href = pr.href pt.text } } if (pt.isLink) { a { class = "ticketref" href = pt.href pt.text } } } }
  44. span { class = pr.state pr.state }
  45. span { class = "branches"
  46. if (pr.hasSource) { a { class = "source" href = pr.sourceHref pr.source } }
  47. if (pr.noSource) { span { class = "source muted" "(branch gone)" } }
  48. span { class = "muted" "→" }
  49. if (pr.targetLinked) { a { class = "target" href = pr.targetHref pr.target } }
  50. if (pr.targetMissing) { span { class = "target muted" pr.target " (no such branch)" } }
  51. }
  52. span { class = "muted" pr.author }
  53. time { pr.date }
  54. button { class = pr.mergeClass type = "button" value = pr.sha "Merge" on click(e) { emit mergePull(e.target.value) } }
  55. }
  56. }
  57. }
  58. }
  59. }
  60. }
  61. }
  62. }
  63. // "Merge" (the owner, only when clicked): the face merges and answers with the list read again
  64. on mergePull(sha) {
  65. mergeError = ''
  66. r = emit server gitoriaMergePull(slug, sha)
  67. if (r == null || r.error != null) {
  68. mergeError = r != null ? r.error : 'could not merge'
  69. return null
  70. }
  71. got = r.result
  72. pullsList = r.list
  73. pullsNone = got.noPulls
  74. }
  75. on server gitoriaMergePull(slugOf, sha, session) {
  76. if (session == null || repoAt(slugOf) == null) { return { error = 'could not merge' } }
  77. u = userOfSession(session)
  78. if (u == null || !ownsRepo(slugOf, session)) { return { error = 'only the owner can merge a pull request' } }
  79. r = mergePullNow(slugOf, repoAt(slugOf).branch, sha, u.name)
  80. if (r.error != null) { return { error = r.error } }
  81. notifyPush(slugOf, false)
  82. // the list again, with its ticket links made here: tickets-helpers.hl reads the environment, which the browser has not
  83. return pullsView(slugOf, repoAt(slugOf).branch, true, repoAt(slugOf).ticketsProject)
  84. }

Branches

Latest commits

  • 4f47843egate: ticket links use the tickets short URL (/<slug>/<n>, tickets#25)mre
  • 86605446mission 002 (code order) 4/4: README file map + import order + 'Same output' test + gate run with a tickets HEAD copy, STATUS (entry, lessons), LOG, report; tests/realdata-baseline.mjs + realdata-compare.py (a cleanup answers the same on live data: pages, modules, API, git over HTTPS and SSH, faces), tests/letcount.pymre
  • cc7bf7bamission 002 (code order) 3/4: let only where a variable is reassigned or re-bound in a loop body (289 lets → plain declarations; 213 left: 125 reassigned, 88 loop-bound; no member/import/param clash). gates 200/0, 46/0, 44/0; real-data reads + writes identical (browser modules: var → const only)mre
  • 090a20c6mission 002 (code order) 2/4: one lib/ file per topic — git.hl split into git (calls, branches, init, temp folder) / homepage / code / pulls / releases (+ git-helpers: paths, ids, |||PR/|||RL markers); repos-helpers, tickets-helpers, transport-helpers; util.hl = localtime + env, storage dir, addresses, lists, text checks, one newest-first sort (was 3 copies); the function routes out of project.hl into lib/api.hl (thin; plumbing in api-helpers.hl), sshgate.hl folded into api.hl + sshkeys.hl keyLine + repos.hl mayPush; 'Make main' and the merge answer out of the faces (code.hl makeMain, pulls.hl pullsView), one login helper (users.hl userOfLoginCode); project.hl is the map. Session-writing routes get &req + &server.sessions. gates 200/0, 46/0, 44/0; real-data identical except /login/failed now shows the parked reason for a browser that already had a session (the old copy-of-req lost it)mre
  • 110c2799mission 002 (code order) 1/4: .hl files out of the root — lib/ (api, git, localtime, markdown, repos, sshgate, sshkeys, tickets, tokens, transport, users), components/styles.hl; jsoncheck.hl removed (imported nowhere); import paths only. gates 200/0, 46/0, 44/0; real-data reads + writes identicalmre
  • fdfb4b1bgitoria: Hybriel master 06617221 (plugin allocators 3a781359 + 413f60e4, mpackdb 2cb7ae5e, http1 773de63e); gates 200/0, 46/0, 44/0mre
  • 5b46ac84antcolony#40: LOG.md — missions 069/072 are antcolony missions (report paths on Byrodin)mre
  • 5602ff41gitoria: Hybriel master 190aa11d (fc838894 GC correctness, #127 mountKids by reference, #126, #48) — tracker README flat; gates 200/0, 46/0, 44/0mre
  • e85eaf01gitoria: 069 round 2 — hybriel 1a096ad3 not adopted (Markdown SSR still grows); browser gate waits for the server-side logout before restartmre
  • 09ce4f3fgitoria: mission 069 re-vendor hybriel 8efba065 stopped (big SSR pages grow + slow down); lambda audit clean; old vendor keptmre
  • 3dc43108antcolony#40: mission references point to the moved missionsmre
  • 8d9450fdantcolony#40: history (LOG.md), worker briefs (missions/) and reports moved here from antcolony, numbered per project; old numbers in antcolony docs/mission-map.mdmre
  • 205d5fe4gitoria: Hybriel master ff51cf46; ssh keys/tokens no double rows (session sync); gates follow #20mre
  • 9b27cb26gitoria#21: installable app (manifest, service worker, offline start page), own iconmre
  • 68dcb603deploy.sh: back up live storage/.sessions/.env before every deploy (newest 5 kept)mre
  • e2deed6dgitoria#20: "Add code" only on the Code page of an empty repository, no collapsiblemre
  • 8bb97ffddeploy.sh: never send .git or .gitignore to Byrodinmre
  • fd981932State of 2026-09-27; bin/ no longer tracked (Hybriel commit is in README)mre
  • 4a2d7125initial commitmre