gitoria

7.7 KB

1. // lib/pulls.hl — PULL REQUESTS (ticket gitoria#11): /pulls of a repo address.
2. // A pull request is a COMMIT whose subject starts `|||PR ` (target = the repo's main branch) or
3. // `|||PR|<branch>] ` (target = <branch>). Nothing is stored: the list is read from git each time.
4. // Title = the text after the marker (else the source branch's name). Source = the branch holding the
5. // commit that is not the target. State: `merged` when the commit is in the target branch, else `open`.
6. // One request per source branch (its newest marker commit). Merging happens with git itself (push to the target).
7. import { localStamp } from './util.hl'
8. import { git, gitRaw, branchNames, pickDefault } from './git.hl'
9. import { enc, isHexId, tabs, safeName, parsePull } from './git-helpers.hl'
10. import { withPullParts } from './tickets-helpers.hl'
12. static maxPulls = 50
13. static pullScan = 500
15. // the list, SYNCHRONOUSLY (git() calls back before it returns): what the pulls page's root uses
16. static pullsNow = (slug, setting) => {
17. let out = null
18. pulls(slug, setting, (result) => {
19. out = result
20. return null
21. })
22. return out
23. }
25. static pullShape = (state, message) => {
26. return { state = state isMessage = message != '' message = message pulls = [] hasPulls = false noPulls = false defaultName = '' openCount = 0 mergedCount = 0 }
27. }
29. // every pull request of a repo → done(result). setting = the repo's saved main branch ('' = none)
30. static pulls = (slug, setting, done) => {
31. branchNames(slug, (names) => {
32. if (names.length == 0) {
33. done(pullShape('empty', 'This repository has no commits yet.'))
34. return null
35. }
36. dflt = pickDefault(names, setting)
37. git(slug, ['log', '-' + pullScan, '--branches', '--format=%H%x09%ct%x09%an%x09%s'], pullScan, (lg) => {
38. found = []
39. for (l of lg.ok ? lg.lines : []) {
40. let f = tabs(l)
41. if (f.length >= 4) {
42. let sub = f.slice(3).join(' ')
43. let pr = parsePull(sub)
44. if (pr != null && isHexId(f[0]) && found.length < maxPulls) {
45. found.push({ sha = f[0] short = f[0].slice(0, 8) date = localStamp(toNumber(f[1]) * 1000) author = f[2] target = pr.target == '' ? dflt : pr.target title = pr.title })
46. }
47. }
48. }
49. out = pullShape('ok', '')
50. out.defaultName = dflt
51. seen = []
52. next = (i) => {
53. if (i >= found.length) {
54. out.hasPulls = out.pulls.length > 0
55. out.noPulls = out.pulls.length == 0
56. done(out)
57. return null
58. }
59. c = found[i]
60. git(slug, ['for-each-ref', '--contains', c.sha, '--format=%(refname:short)', 'refs/heads'], 500, (ct) => {
61. let source = ''
62. for (n of ct.ok ? ct.lines : []) { if (source == '' && safeName(n) && n != c.target) { source = n } }
63. if (source != '' && seen.includes(source)) {
64. next(i + 1)
65. return null
66. }
67. if (source != '') { seen.push(source) }
68. finish = (merged, targetMissing) => {
69. let title = c.title != '' ? c.title : (source != '' ? source : c.short)
70. out.pulls.push({ sha = c.sha short = c.short href = '/commit/' + c.sha title = title source = source hasSource = source != '' noSource = source == '' sourceHref = source != '' ? '/branch/' + enc(source) : '' target = c.target targetHref = targetMissing ? '' : '/branch/' + enc(c.target) targetLinked = !targetMissing state = merged ? 'merged' : 'open' isMerged = merged isOpen = !merged mergeable = !merged && source != '' && !targetMissing targetMissing = targetMissing author = c.author date = c.date })
71. if (merged) { out.mergedCount = out.mergedCount + 1 } else { out.openCount = out.openCount + 1 }
72. next(i + 1)
73. return null
74. }
75. if (!names.includes(c.target)) { return finish(false, true) }
76. git(slug, ['merge-base', '--is-ancestor', c.sha, c.target], 1, (mb) => {
77. return finish(mb.ok, false)
78. })
79. return null
80. })
81. return null
82. }
83. next(0)
84. return null
85. })
86. })
87. }
89. // the rows with `canMerge` (the owner, an open request whose branches exist) and the button's class: an `if` inside a
90. // `for` row is not re-evaluated when the list is reassigned (the old button stayed), an attribute is — so the button
91. // is always there and `.nomerge` hides it (styles.hl)
92. static withMerge = (list, owner) => {
93. out = []
94. for (p of list) {
95. let q = p
96. q.canMerge = owner && p.mergeable
97. q.mergeClass = q.canMerge ? 'quiet mergepr' : 'nomerge'
98. out.push(q)
99. }
100. return out
101. }
103. // ---- MERGE a pull request (ticket gitoria#17): only when the owner clicks the button ---------------------------
104. // The repo is BARE (no work tree), so the merge is made with plumbing: `merge-tree --write-tree` merges the two
105. // branches into a tree (exit 1 = conflict: nothing is written to any branch), `commit-tree` makes the merge commit
106. // (parents: target, source), `update-ref` moves the target — with the old value given, so a push that arrived meanwhile
107. // makes it fail instead of being overwritten. Always a merge commit (like GitHub's "Create a merge commit").
108. // The pull request is found again on the SERVER by the sha of its `|||PR` commit (the client only names that).
109. // → { ok } | { error }. who = the user's name (author of the merge commit).
110. static mergePullNow = (slug, setting, sha, who) => {
111. let found = null
112. if (sha == null || hlTypeName(sha) != 'String' || !isHexId(sha) || sha.length != 40) { return { error = 'no such pull request' } }
113. got = pullsNow(slug, setting)
114. if (got == null || got.isMessage) { return { error = 'no such pull request' } }
115. for (p of got.pulls) { if (p.sha == sha) { found = p } }
116. if (found == null) { return { error = 'no such pull request' } }
117. if (found.isMerged) { return { error = 'this pull request is already merged' } }
118. if (found.noSource) { return { error = 'the branch of this pull request is gone' } }
119. if (found.targetMissing) { return { error = 'the target branch ' + found.target + ' does not exist' } }
120. target = 'refs/heads/' + found.target
121. old = gitRaw(slug, ['rev-parse', '--verify', '-q', target])
122. tip = gitRaw(slug, ['rev-parse', '--verify', '-q', 'refs/heads/' + found.source])
123. if (old == null || old.exit != 0 || old.lines.length == 0 || tip == null || tip.exit != 0 || tip.lines.length == 0) { return { error = 'could not read the branches' } }
124. oldSha = old.lines[0]
125. tipSha = tip.lines[0]
126. if (!isHexId(oldSha) || !isHexId(tipSha)) { return { error = 'could not read the branches' } }
127. m = gitRaw(slug, ['merge-tree', '--write-tree', '--name-only', '--no-messages', oldSha, tipSha])
128. if (m == null) { return { error = 'could not merge (git did not answer)' } }
129. if (m.exit == 1) {
130. files = []
131. let i = 1
132. while (i < m.lines.length && m.lines[i] != '') {
133. if (files.length < 5) { files.push(m.lines[i]) }
134. i = i + 1
135. }
136. return { error = 'Not merged: ' + found.source + ' conflicts with ' + found.target + (files.length > 0 ? ' in ' + files.join(', ') : '') + '. Resolve it with git, then push.' }
137. }
138. if (m.exit != 0 || m.lines.length == 0 || !isHexId(m.lines[0])) { return { error = 'could not merge' } }
139. name = who != null && who != '' ? who : 'gitoria'
140. msg = "Merge branch '" + found.source + "' into " + found.target
141. c = gitRaw(slug, ['-c', 'user.name=' + name, '-c', 'user.email=noreply@gitoria', 'commit-tree', m.lines[0], '-p', oldSha, '-p', tipSha, '-m', msg])
142. if (c == null || c.exit != 0 || c.lines.length == 0 || !isHexId(c.lines[0])) { return { error = 'could not write the merge commit' } }
143. u = gitRaw(slug, ['update-ref', '-m', msg, target, c.lines[0], oldSha])
144. if (u == null || u.exit != 0) { return { error = 'The branch ' + found.target + ' changed meanwhile — nothing merged, try again.' } }
145. return { ok = true }
146. }
148. // the list read again, with the Merge buttons and the ticket links: the answer of the Merge face (components/pulls.hl)
149. static pullsView = (slug, setting, owner, project) => {
150. got = pullsNow(slug, setting)
151. return { result = got list = withPullParts(withMerge(got.pulls, owner), project) }
152. }