internal/control/mr.go
1281 lines · 44164 bytes
1package control
2
3import (
4 "errors"
5 "fmt"
6 "io"
7 "slices"
8 "strconv"
9 "strings"
10 "time"
11
12 "gitbay.org/gitbay/internal/gitutil"
13 "gitbay.org/gitbay/internal/policy"
14 "gitbay.org/gitbay/internal/protocol"
15 "gitbay.org/gitbay/internal/sig"
16 "gitbay.org/gitbay/internal/store"
17)
18
19func init() {
20 register(Command{Path: []string{"repo", "fork"},
21 Summary: "fork a repository under your account",
22 Usage: "repo fork <owner/name> [--name <n>]", Run: runRepoFork})
23 register(Command{Path: []string{"repo", "settings", "require-approvals"},
24 Summary: "require N fresh approvals to merge",
25 Usage: "repo settings require-approvals <owner/name> <n> (0 = off)", Run: runRequireApprovals})
26 register(Command{Path: []string{"repo", "settings", "require-resolved"},
27 Summary: "require all review threads resolved to merge",
28 Usage: "repo settings require-resolved <owner/name> on|off", Run: runRequireResolved})
29 register(Command{Path: []string{"repo", "settings", "require-checks"},
30 Summary: "gate merges on green statuses",
31 Usage: "repo settings require-checks <owner/name> on|off", Run: runRequireChecks})
32 register(Command{Path: []string{"repo", "settings", "require-signed"},
33 Summary: "require verified commit signatures",
34 Usage: "repo settings require-signed <owner/name> on|off", Run: runRequireSigned})
35 register(Command{Path: []string{"mr", "create"},
36 Summary: "open a merge request",
37 Usage: "mr create <target owner/name> --source [owner/name:]<branch> --target <branch> --title <t> [--body <b> | --file -] [--format md|org]",
38 ReadsStdin: true, Run: runMRCreate})
39 register(Command{Path: []string{"mr", "list"},
40 Summary: "list merge requests",
41 Usage: "mr list <owner/name> [--state open|merged|closed|source_gone|all] [--author <user>] [--milestone <title>|none] [--limit <n>] [--cursor <c>]", ReadOnly: true, Run: runMRList})
42 register(Command{Path: []string{"mr", "show"},
43 Summary: "show a merge request",
44 Usage: "mr show <owner/name> <n>", ReadOnly: true, Run: runMRShow})
45 register(Command{Path: []string{"mr", "diff"},
46 Summary: "show the diff",
47 Usage: "mr diff <owner/name> <n>", ReadOnly: true, Run: runMRDiff})
48 register(Command{Path: []string{"mr", "edit"},
49 Summary: "edit title or body",
50 Usage: "mr edit <owner/name> <n> [--title <t>] [--body <b> | --file -] [--format md|org]",
51 ReadsStdin: true, Run: runMREdit})
52 register(Command{Path: []string{"mr", "retarget"},
53 Summary: "retarget onto another branch",
54 Usage: "mr retarget <owner/name> <n> <branch>", Run: runMRRetarget})
55 register(Command{Path: []string{"mr", "comment"},
56 Summary: "comment",
57 Usage: "mr comment <owner/name> <n> [--message <m> | --file -] [--format md|org]",
58 ReadsStdin: true, Run: runMRComment})
59 register(Command{Path: []string{"mr", "review"},
60 Summary: "review",
61 Usage: "mr review <owner/name> <n> --approve|--request-changes|--comment", Run: runMRReview})
62 register(Command{Path: []string{"mr", "merge"},
63 Summary: "merge",
64 Usage: "mr merge <owner/name> <n> [--strategy ff|merge|squash|rebase]", Run: runMRMerge})
65 register(Command{Path: []string{"mr", "close"},
66 Summary: "close without merging",
67 Usage: "mr close <owner/name> <n>", Run: runMRClose})
68}
69
70func runRepoFork(c *Ctx, args []string) int {
71 var path, name string
72 for i := 0; i < len(args); i++ {
73 switch args[i] {
74 case "--name":
75 if i+1 >= len(args) {
76 return c.fail(protocol.ExitUsage, "--name requires a value")
77 }
78 name = args[i+1]
79 i++
80 default:
81 if path != "" {
82 return c.fail(protocol.ExitUsage, "usage: repo fork <owner/name> [--name <n>]")
83 }
84 path = args[i]
85 }
86 }
87 if path == "" {
88 return c.fail(protocol.ExitUsage, "usage: repo fork <owner/name> [--name <n>]")
89 }
90 src, code := resolveRepo(c, path, policy.CanRead)
91 if code >= 0 {
92 return code
93 }
94 if name == "" {
95 name = src.Name
96 }
97 if err := policy.ValidateName(name); err != nil {
98 return c.fail(protocol.ExitUsage, "%v", err)
99 }
100 if code := checkRepoQuota(c); code >= 0 {
101 return code
102 }
103 id, err := c.Store.CreateRepo("user", c.User.ID, name, src.Visibility)
104 if err != nil {
105 return c.fail(protocol.ExitFailure, "%v", err)
106 }
107 if err := c.Store.SetForkOf(id, src.ID); err != nil {
108 return c.fail(protocol.ExitFailure, "%v", err)
109 }
110 dstDir := RepoDir(c.Cfg.Server.Root, c.User.Username, name)
111 srcDir := RepoDir(c.Cfg.Server.Root, src.OwnerName, src.Name)
112 if err := gitutil.InitBare(dstDir, "main", HooksDir(c.Cfg.Server.Root)); err != nil {
113 c.Store.DeleteRepo(id)
114 return c.fail(protocol.ExitFailure, "%v", err)
115 }
116 if desc := gitutil.ReadDescription(srcDir); desc != "" {
117 gitutil.WriteDescription(dstDir, desc)
118 }
119 if err := gitutil.FetchInto(dstDir, srcDir, "refs/heads/*", "refs/heads/*"); err != nil {
120 // Empty source repos have nothing to fetch; that is fine.
121 if _, rerr := gitutil.ResolveRef(srcDir, src.DefaultBranch); rerr == nil {
122 c.Store.DeleteRepo(id)
123 return c.fail(protocol.ExitFailure, "copying refs: %v", err)
124 }
125 }
126 forkPath := c.User.Username + "/" + name
127 return c.emit(map[string]string{"path": forkPath, "fork_of": src.Path()}, func(w io.Writer) {
128 fmt.Fprintf(w, "forked %s to %s\n", src.Path(), forkPath)
129 })
130}
131
132func runRequireApprovals(c *Ctx, args []string) int {
133 if len(args) != 2 {
134 return c.fail(protocol.ExitUsage, "usage: repo settings require-approvals <owner/name> <n>")
135 }
136 n, err := strconv.Atoi(args[1])
137 if err != nil || n < 0 || n > 20 {
138 return c.fail(protocol.ExitUsage, "approvals must be 0..20")
139 }
140 repo, code := resolveRepo(c, args[0], policy.CanAdmin)
141 if code >= 0 {
142 return code
143 }
144 s := repo.Settings
145 s.RequireApprovals = n
146 if err := c.Store.SetRepoSettings(repo.ID, s); err != nil {
147 return c.fail(protocol.ExitFailure, "%v", err)
148 }
149 return c.emit(s, func(w io.Writer) {
150 fmt.Fprintf(w, "require_approvals %d on %s\n", n, repo.Path())
151 })
152}
153
154func runRequireResolved(c *Ctx, args []string) int {
155 if len(args) != 2 || (args[1] != "on" && args[1] != "off") {
156 return c.fail(protocol.ExitUsage, "usage: repo settings require-resolved <owner/name> on|off")
157 }
158 repo, code := resolveRepo(c, args[0], policy.CanAdmin)
159 if code >= 0 {
160 return code
161 }
162 s := repo.Settings
163 s.RequireResolved = args[1] == "on"
164 if err := c.Store.SetRepoSettings(repo.ID, s); err != nil {
165 return c.fail(protocol.ExitFailure, "%v", err)
166 }
167 return c.emit(s, func(w io.Writer) {
168 fmt.Fprintf(w, "require_resolved %s on %s\n", args[1], repo.Path())
169 })
170}
171
172func runRequireChecks(c *Ctx, args []string) int {
173 if len(args) != 2 || (args[1] != "on" && args[1] != "off") {
174 return c.fail(protocol.ExitUsage, "usage: repo settings require-checks <owner/name> on|off")
175 }
176 repo, code := resolveRepo(c, args[0], policy.CanAdmin)
177 if code >= 0 {
178 return code
179 }
180 s := repo.Settings
181 s.RequireChecks = args[1] == "on"
182 if err := c.Store.SetRepoSettings(repo.ID, s); err != nil {
183 return c.fail(protocol.ExitFailure, "%v", err)
184 }
185 return c.emit(s, func(w io.Writer) {
186 fmt.Fprintf(w, "require_checks %s on %s\n", args[1], repo.Path())
187 })
188}
189
190func runRequireSigned(c *Ctx, args []string) int {
191 if len(args) != 2 || (args[1] != "on" && args[1] != "off") {
192 return c.fail(protocol.ExitUsage, "usage: repo settings require-signed <owner/name> on|off")
193 }
194 repo, code := resolveRepo(c, args[0], policy.CanAdmin)
195 if code >= 0 {
196 return code
197 }
198 s := repo.Settings
199 s.RequireSignedCommits = args[1] == "on"
200 if err := c.Store.SetRepoSettings(repo.ID, s); err != nil {
201 return c.fail(protocol.ExitFailure, "%v", err)
202 }
203 return c.emit(s, func(w io.Writer) {
204 fmt.Fprintf(w, "require_signed_commits %s on %s\n", args[1], repo.Path())
205 })
206}
207
208// mrRef parses "<owner/name> <n>" and loads the MR.
209func mrRef(c *Ctx, args []string, perm func(store.User, store.Repo, string) bool) (store.Repo, store.MR, int) {
210 if len(args) < 2 {
211 return store.Repo{}, store.MR{}, c.fail(protocol.ExitUsage, "expected <owner/name> <number>")
212 }
213 repo, code := resolveRepo(c, args[0], perm)
214 if code >= 0 {
215 return repo, store.MR{}, code
216 }
217 n, err := strconv.ParseInt(args[1], 10, 64)
218 if err != nil {
219 return repo, store.MR{}, c.fail(protocol.ExitUsage, "bad MR number %q", args[1])
220 }
221 mr, err := c.Store.MRByNumber(repo.ID, n)
222 if errors.Is(err, store.ErrNotFound) {
223 return repo, mr, c.fail(protocol.ExitNotFound, "MR !%d not found in %s", n, repo.Path())
224 }
225 if err != nil {
226 return repo, mr, c.fail(protocol.ExitFailure, "%v", err)
227 }
228 return repo, mr, -1
229}
230
231func mrHeadRef(n int64) string { return fmt.Sprintf("refs/merge-requests/%d/head", n) }
232
233func runMRCreate(c *Ctx, args []string) int {
234 var path, source, target, title, body, file, format string
235 for i := 0; i < len(args); i++ {
236 switch args[i] {
237 case "--source", "--target", "--title", "--body", "--file", "--format":
238 if i+1 >= len(args) {
239 return c.fail(protocol.ExitUsage, "%s requires a value", args[i])
240 }
241 v := args[i+1]
242 switch args[i] {
243 case "--source":
244 source = v
245 case "--target":
246 target = v
247 case "--title":
248 title = v
249 case "--body":
250 body = v
251 case "--file":
252 file = v
253 case "--format":
254 format = v
255 }
256 i++
257 default:
258 if path != "" {
259 return c.fail(protocol.ExitUsage, "unexpected argument %q", args[i])
260 }
261 path = args[i]
262 }
263 }
264 if path == "" || source == "" || title == "" {
265 return c.fail(protocol.ExitUsage, "usage: mr create <target owner/name> --source [owner/name:]<branch> --target <branch> --title <t>")
266 }
267 fmtName, err := markupFormat(format)
268 if err != nil {
269 return c.fail(protocol.ExitUsage, "%v", err)
270 }
271 if fmtName == "" {
272 fmtName = "md"
273 }
274 repo, code := resolveRepo(c, path, policy.CanRead)
275 if code >= 0 {
276 return code
277 }
278 if code := refuseArchived(c, repo); code >= 0 {
279 return code
280 }
281 if target == "" {
282 target = repo.DefaultBranch
283 }
284
285 // Source is "branch" (same repo) or "owner/name:branch" (a fork).
286 srcRepo := repo
287 srcBranch := source
288 if sp, br, ok := strings.Cut(source, ":"); ok {
289 srcBranch = br
290 var scode int
291 srcRepo, scode = resolveRepo(c, sp, policy.CanRead)
292 if scode >= 0 {
293 return scode
294 }
295 if srcRepo.ForkOf != repo.ID && srcRepo.ID != repo.ID {
296 return c.fail(protocol.ExitUsage, "%s is not a fork of %s", srcRepo.Path(), repo.Path())
297 }
298 }
299 srcDir := RepoDir(c.Cfg.Server.Root, srcRepo.OwnerName, srcRepo.Name)
300 headSHA, err := gitutil.ResolveRef(srcDir, "refs/heads/"+srcBranch)
301 if err != nil {
302 return c.fail(protocol.ExitNotFound, "branch %s not found in %s", srcBranch, srcRepo.Path())
303 }
304 b, err := bodyFrom(c, body, file)
305 if err != nil {
306 return c.fail(protocol.ExitUsage, "%v", err)
307 }
308 n, err := c.Store.CreateMR(repo.ID, c.User.ID, srcRepo.ID, srcBranch, target, title, b, headSHA, fmtName)
309 if err != nil {
310 return c.fail(protocol.ExitFailure, "%v", err)
311 }
312 // Fetch the head into the target so the target owns the objects.
313 dstDir := RepoDir(c.Cfg.Server.Root, repo.OwnerName, repo.Name)
314 if err := gitutil.FetchInto(dstDir, srcDir, headSHA, mrHeadRef(n)); err != nil {
315 return c.fail(protocol.ExitFailure, "recording MR head: %v", err)
316 }
317 c.Store.RecordEvent(repo.ID, c.User.ID, "mr.created", fmt.Sprintf(`{"number":%d}`, n))
318 if targets, err := c.Store.RepoNotifyTargets(repo); err == nil {
319 notifyUsers(c, targets, mrSubject(repo, n, title),
320 notifyBody(c, fmt.Sprintf("opened merge request !%d (%s -> %s)", n, source, target), b, fmt.Sprintf("%s/mrs/%d", repo.Path(), n)))
321 }
322 out := map[string]any{"number": n, "head_sha": headSHA}
323 var parent *stackRef
324 if p, ok, err := c.Store.OpenMRBySource(repo.ID, target); err == nil && ok {
325 parent = &stackRef{p.Number, p.Title}
326 out["stacked_on"] = parent
327 }
328 return c.emit(out, func(w io.Writer) {
329 fmt.Fprintf(w, "created %s!%d (%s -> %s)\n", repo.Path(), n, source, target)
330 if parent != nil {
331 fmt.Fprintf(w, "stacked on !%d %s\n", parent.Number, parent.Title)
332 }
333 })
334}
335
336type mrOut struct {
337 Number int64 `json:"number"`
338 Title string `json:"title"`
339 State string `json:"state"`
340 Author string `json:"author"`
341 Source string `json:"source"` // owner/name:branch, or branch, "" if gone
342 TargetRef string `json:"target_ref"`
343 HeadSHA string `json:"head_sha"`
344 Body string `json:"body,omitempty"`
345 BodyFormat string `json:"body_format,omitempty"`
346 Milestone string `json:"milestone,omitempty"`
347 // StackedOn is the open merge request whose source branch this one
348 // targets; Stacked are the open ones targeting this one's source.
349 StackedOn *stackRef `json:"stacked_on,omitempty"`
350 Stacked []stackRef `json:"stacked,omitempty"`
351 CreatedAt string `json:"created_at"`
352 MergedAt string `json:"merged_at,omitempty"`
353 MergedBy string `json:"merged_by,omitempty"`
354 ClosedAt string `json:"closed_at,omitempty"`
355 ClosedBy string `json:"closed_by,omitempty"`
356}
357
358type stackRef struct {
359 Number int64 `json:"number"`
360 Title string `json:"title"`
361}
362
363// stackOf derives the stack around m: the open merge request whose source
364// branch m targets, and the open ones targeting m's source. Both only
365// within m's repository; a fork's branch is not a target anything can
366// stack on.
367func stackOf(c *Ctx, repo store.Repo, m store.MR) (*stackRef, []stackRef) {
368 if m.State != "open" {
369 return nil, nil
370 }
371 var parent *stackRef
372 if p, ok, err := c.Store.OpenMRBySource(repo.ID, m.TargetRef); err == nil && ok && p.ID != m.ID {
373 parent = &stackRef{p.Number, p.Title}
374 }
375 var children []stackRef
376 if m.SourceRepoID == repo.ID {
377 if kids, err := c.Store.OpenMRsByTarget(repo.ID, m.SourceRef); err == nil {
378 for _, k := range kids {
379 if k.ID != m.ID {
380 children = append(children, stackRef{k.Number, k.Title})
381 }
382 }
383 }
384 }
385 return parent, children
386}
387
388func mrToOut(repo store.Repo, m store.MR, withBody bool) mrOut {
389 src := ""
390 if m.SourcePath != "" {
391 if m.SourceRepoID == repo.ID {
392 src = m.SourceRef
393 } else {
394 src = m.SourcePath + ":" + m.SourceRef
395 }
396 }
397 o := mrOut{Number: m.Number, Title: m.Title, State: m.State, Author: m.Author,
398 Source: src, TargetRef: m.TargetRef, HeadSHA: m.HeadSHA, Milestone: m.Milestone,
399 CreatedAt: m.CreatedAt, MergedAt: m.MergedAt, MergedBy: m.MergedBy,
400 ClosedAt: m.ClosedAt, ClosedBy: m.ClosedBy}
401 if withBody {
402 o.Body = m.Body
403 o.BodyFormat = m.BodyFormat
404 }
405 return o
406}
407
408func runMRList(c *Ctx, args []string) int {
409 args, p, code := parsePageFlags(c, args, "mr", true)
410 if code >= 0 {
411 return code
412 }
413 const usage = "usage: mr list <owner/name> [--state open|merged|closed|source_gone|all] [--author <user>] [--milestone <title>|none] [--limit <n>] [--cursor <c>]"
414 f := store.MRFilter{State: "open"}
415 var path string
416 for i := 0; i < len(args); i++ {
417 var target *string
418 switch args[i] {
419 case "--state":
420 target = &f.State
421 case "--author":
422 target = &f.Author
423 case "--milestone":
424 target = &f.Milestone
425 default:
426 if path != "" || strings.HasPrefix(args[i], "--") {
427 return c.fail(protocol.ExitUsage, "unexpected argument %q\n%s", args[i], usage)
428 }
429 path = args[i]
430 continue
431 }
432 if i+1 >= len(args) {
433 return c.fail(protocol.ExitUsage, "%s requires a value", args[i])
434 }
435 *target = args[i+1]
436 i++
437 }
438 valid := map[string]bool{"open": true, "merged": true, "closed": true, "source_gone": true, "all": true}
439 if path == "" || !valid[f.State] {
440 return c.fail(protocol.ExitUsage, usage)
441 }
442 repo, code := resolveRepo(c, path, policy.CanRead)
443 if code >= 0 {
444 return code
445 }
446 f.Limit, f.Before = p.queryLimit(), p.keyInt()
447 mrs, err := c.Store.QueryMRs(repo.ID, f)
448 if err != nil {
449 return c.fail(protocol.ExitFailure, "%v", err)
450 }
451 mrs, next := trimPage(p, mrs, "mr", func(m store.MR) string {
452 return strconv.FormatInt(m.Number, 10)
453 })
454 var ds []mrOut
455 for _, m := range mrs {
456 o := mrToOut(repo, m, false)
457 o.StackedOn, _ = stackOf(c, repo, m)
458 ds = append(ds, o)
459 }
460 return c.emitPage(p, ds, next, func(w io.Writer) {
461 for _, d := range ds {
462 stacked := ""
463 if d.StackedOn != nil {
464 stacked = fmt.Sprintf("\tstacked on !%d", d.StackedOn.Number)
465 }
466 fmt.Fprintf(w, "!%d\t%s\t%s\t%s -> %s%s\n", d.Number, d.State, d.Title, d.Source, d.TargetRef, stacked)
467 }
468 })
469}
470
471// byWhom renders " by <user>", or nothing when the actor is unknown — an
472// imported merge request carries a time but no local account.
473func byWhom(user string) string {
474 if user == "" {
475 return ""
476 }
477 return " by " + user
478}
479
480func runMRShow(c *Ctx, args []string) int {
481 repo, mr, code := mrRef(c, args, policy.CanRead)
482 if code >= 0 {
483 return code
484 }
485 if len(args) != 2 {
486 return c.fail(protocol.ExitUsage, "usage: mr show <owner/name> <n>")
487 }
488 comments, err := c.Store.ListMRComments(mr.ID)
489 if err != nil {
490 return c.fail(protocol.ExitFailure, "%v", err)
491 }
492 reviews, err := c.Store.ListMRReviews(mr.ID)
493 if err != nil {
494 return c.fail(protocol.ExitFailure, "%v", err)
495 }
496 statuses, combined, err := c.Store.ChecksForCommit(repo.ID, mr.HeadSHA)
497 if err != nil {
498 return c.fail(protocol.ExitFailure, "%v", err)
499 }
500 unresolved, err := c.Store.UnresolvedThreadCount(mr.ID)
501 if err != nil {
502 return c.fail(protocol.ExitFailure, "%v", err)
503 }
504 type commentOut struct {
505 Author string `json:"author"`
506 Body string `json:"body"`
507 BodyFormat string `json:"body_format,omitempty"`
508 CreatedAt string `json:"created_at"`
509 }
510 type reviewOut struct {
511 Reviewer string `json:"reviewer"`
512 Verdict string `json:"verdict"`
513 Stale bool `json:"stale"`
514 CreatedAt string `json:"created_at"`
515 }
516 type checkOut struct {
517 Context string `json:"context"`
518 State string `json:"state"`
519 URL string `json:"url,omitempty"`
520 UpdatedAt string `json:"updated_at"`
521 Duration string `json:"duration,omitempty"` // CI checks only, once finished
522 }
523 var checks []checkOut
524 for _, st := range statuses {
525 out := checkOut{Context: st.Context, State: st.State, URL: st.TargetURL, UpdatedAt: st.UpdatedAt}
526 if st.Duration > 0 {
527 out.Duration = st.Duration.String()
528 }
529 checks = append(checks, out)
530 }
531 var cs []commentOut
532 for _, cm := range comments {
533 cs = append(cs, commentOut{cm.Author, cm.Body, cm.BodyFormat, cm.CreatedAt})
534 }
535 var rs []reviewOut
536 for _, r := range reviews {
537 rs = append(rs, reviewOut{r.Reviewer, r.Verdict, r.Stale, r.CreatedAt})
538 }
539 // The commits this MR carries: base..head, the diff's range.
540 type commitOut struct {
541 SHA string `json:"sha"`
542 Subject string `json:"subject"`
543 }
544 var commits []commitOut
545 dir := RepoDir(c.Cfg.Server.Root, repo.OwnerName, repo.Name)
546 base := mr.MergedBase
547 if base == "" {
548 if b, err := gitutil.MergeBase(dir, "refs/heads/"+mr.TargetRef, mrHeadRef(mr.Number)); err == nil {
549 base = b
550 }
551 }
552 if base != "" {
553 if shas, err := gitutil.RevListRange(dir, base, mrHeadRef(mr.Number)); err == nil {
554 for _, sha := range shas {
555 subject := ""
556 if raw, err := gitutil.ReadCommit(dir, sha); err == nil {
557 if parsed, err := sig.ParseCommit(raw); err == nil {
558 subject = parsed.Subject
559 }
560 }
561 commits = append(commits, commitOut{sha, subject})
562 }
563 }
564 }
565 d := struct {
566 mrOut
567 Checks []checkOut `json:"checks,omitempty"`
568 Combined string `json:"checks_combined,omitempty"`
569 UnresolvedThreads int `json:"unresolved_threads,omitempty"`
570 Commits []commitOut `json:"commits,omitempty"`
571 Comments []commentOut `json:"comments,omitempty"`
572 Reviews []reviewOut `json:"reviews,omitempty"`
573 }{mrToOut(repo, mr, true), checks, combined, unresolved, commits, cs, rs}
574 d.StackedOn, d.Stacked = stackOf(c, repo, mr)
575 return c.emit(d, func(w io.Writer) {
576 fmt.Fprintf(w, "!%d %s [%s] by %s\n%s -> %s @ %.10s\n", d.Number, d.Title, d.State, d.Author, d.Source, d.TargetRef, d.HeadSHA)
577 if d.StackedOn != nil {
578 fmt.Fprintf(w, "stacked on !%d %s\n", d.StackedOn.Number, d.StackedOn.Title)
579 }
580 for _, k := range d.Stacked {
581 fmt.Fprintf(w, "stacked: !%d %s\n", k.Number, k.Title)
582 }
583 if d.MergedAt != "" {
584 fmt.Fprintf(w, "merged %s%s\n", d.MergedAt, byWhom(d.MergedBy))
585 }
586 if d.ClosedAt != "" {
587 fmt.Fprintf(w, "closed %s%s\n", d.ClosedAt, byWhom(d.ClosedBy))
588 }
589 if d.Body != "" {
590 fmt.Fprintf(w, "\n%s\n", d.Body)
591 }
592 for _, cm := range commits {
593 fmt.Fprintf(w, "commit: %.10s %s\n", cm.SHA, cm.Subject)
594 }
595 for _, x := range checks {
596 dur := ""
597 if x.Duration != "" {
598 dur = " in " + x.Duration
599 }
600 fmt.Fprintf(w, "check: %s %s at %s%s\n", x.Context, x.State, x.UpdatedAt, dur)
601 }
602 if d.UnresolvedThreads > 0 {
603 fmt.Fprintf(w, "unresolved threads: %d\n", d.UnresolvedThreads)
604 }
605 for _, r := range rs {
606 stale := ""
607 if r.Stale {
608 stale = " (stale)"
609 }
610 fmt.Fprintf(w, "review: %s %s%s at %s\n", r.Reviewer, r.Verdict, stale, r.CreatedAt)
611 }
612 for _, cm := range cs {
613 fmt.Fprintf(w, "\n--- %s at %s\n%s\n", cm.Author, cm.CreatedAt, cm.Body)
614 }
615 })
616}
617
618func runMRDiff(c *Ctx, args []string) int {
619 repo, mr, code := mrRef(c, args, policy.CanRead)
620 if code >= 0 {
621 return code
622 }
623 dir := RepoDir(c.Cfg.Server.Root, repo.OwnerName, repo.Name)
624 head := mrHeadRef(mr.Number)
625 // After a merge (especially fast-forward) the live merge-base equals
626 // the head and the diff would vanish; use the recorded base instead.
627 base := mr.MergedBase
628 if base == "" {
629 b, err := gitutil.MergeBase(dir, "refs/heads/"+mr.TargetRef, head)
630 if err != nil {
631 return c.fail(protocol.ExitFailure, "%v", err)
632 }
633 base = b
634 }
635 patch, err := gitutil.Diff(dir, base, head, 4<<20)
636 if err != nil {
637 return c.fail(protocol.ExitFailure, "%v", err)
638 }
639 fmt.Fprint(c.Stdout, patch)
640 return protocol.ExitOK
641}
642
643func runMREdit(c *Ctx, args []string) int {
644 rest, title, body, format, code := editText(c, args, "mr")
645 if code >= 0 {
646 return code
647 }
648 repo, mr, code := mrRef(c, rest, policy.CanRead)
649 if code >= 0 {
650 return code
651 }
652 if code := refuseArchived(c, repo); code >= 0 {
653 return code
654 }
655 grant, err := c.Store.AccessRole(repo.ID, c.User.ID)
656 if err != nil {
657 return c.fail(protocol.ExitFailure, "%v", err)
658 }
659 if mr.Author != c.User.Username && !policy.CanWrite(c.User, repo, grant) {
660 return c.fail(protocol.ExitDenied, "only the author or users with write access can edit this merge request")
661 }
662 if err := c.Store.UpdateMRText(mr.ID, title, body, format); err != nil {
663 return c.fail(protocol.ExitFailure, "%v", err)
664 }
665 return c.emit(map[string]any{"number": mr.Number}, func(w io.Writer) {
666 fmt.Fprintf(w, "edited %s!%d\n", repo.Path(), mr.Number)
667 })
668}
669
670// runMRRetarget moves an open merge request onto another branch of the
671// same repository.
672func runMRRetarget(c *Ctx, args []string) int {
673 if len(args) != 3 {
674 return c.fail(protocol.ExitUsage, "usage: mr retarget <owner/name> <n> <branch>")
675 }
676 repo, mr, code := mrRef(c, args[:2], policy.CanRead)
677 if code >= 0 {
678 return code
679 }
680 if code := refuseArchived(c, repo); code >= 0 {
681 return code
682 }
683 grant, err := c.Store.AccessRole(repo.ID, c.User.ID)
684 if err != nil {
685 return c.fail(protocol.ExitFailure, "%v", err)
686 }
687 if mr.Author != c.User.Username && !policy.CanWrite(c.User, repo, grant) {
688 return c.fail(protocol.ExitDenied, "only the author or users with write access can retarget this merge request")
689 }
690 if mr.State == "merged" || mr.State == "closed" {
691 return c.fail(protocol.ExitUsage, "!%d is %s; only an open merge request can be retargeted", mr.Number, mr.State)
692 }
693 target := args[2]
694 if target == mr.TargetRef {
695 return c.fail(protocol.ExitUsage, "!%d already targets %s", mr.Number, target)
696 }
697 if mr.SourceRepoID == repo.ID && target == mr.SourceRef {
698 return c.fail(protocol.ExitUsage, "%s is the source branch of !%d", target, mr.Number)
699 }
700 dir := RepoDir(c.Cfg.Server.Root, repo.OwnerName, repo.Name)
701 if _, err := gitutil.ResolveRef(dir, "refs/heads/"+target); err != nil {
702 return c.fail(protocol.ExitNotFound, "branch %s not found in %s", target, repo.Path())
703 }
704 // The diff, the commit list and the merge gates all derive their base
705 // from the target on every read, so the only thing to check here is
706 // that a base exists at all: without one there is nothing to show and
707 // nothing to merge.
708 base, err := gitutil.MergeBase(dir, "refs/heads/"+target, mrHeadRef(mr.Number))
709 if err != nil || base == "" {
710 return c.fail(protocol.ExitUsage, "%s shares no history with the head of !%d", target, mr.Number)
711 }
712 old := mr.TargetRef
713 if err := c.Store.SetMRTarget(mr.ID, target); err != nil {
714 return c.fail(protocol.ExitFailure, "%v", err)
715 }
716 c.Store.AddMRSystemComment(mr.ID, c.User.ID, fmt.Sprintf("retargeted from %s to %s", old, target))
717 if parts, err := c.Store.MRParticipants(mr.ID); err == nil {
718 notifyUsers(c, parts, mrSubject(repo, mr.Number, mr.Title),
719 notifyBody(c, fmt.Sprintf("retargeted !%d from %s to %s", mr.Number, old, target), "",
720 fmt.Sprintf("%s/mrs/%d", repo.Path(), mr.Number)))
721 }
722 return c.emit(map[string]any{"number": mr.Number, "target_ref": target, "merge_base": base}, func(w io.Writer) {
723 fmt.Fprintf(w, "retargeted %s!%d from %s to %s (base %.10s)\n", repo.Path(), mr.Number, old, target, base)
724 })
725}
726
727func runMRComment(c *Ctx, args []string) int {
728 var rest []string
729 var message, file, format string
730 for i := 0; i < len(args); i++ {
731 switch args[i] {
732 case "--message", "--file", "--format":
733 if i+1 >= len(args) {
734 return c.fail(protocol.ExitUsage, "%s requires a value", args[i])
735 }
736 switch args[i] {
737 case "--message":
738 message = args[i+1]
739 case "--file":
740 file = args[i+1]
741 case "--format":
742 format = args[i+1]
743 }
744 i++
745 default:
746 rest = append(rest, args[i])
747 }
748 }
749 fmtName, err := markupFormat(format)
750 if err != nil {
751 return c.fail(protocol.ExitUsage, "%v", err)
752 }
753 if fmtName == "" {
754 fmtName = "md"
755 }
756 repo, mr, code := mrRef(c, rest, policy.CanRead)
757 if code >= 0 {
758 return code
759 }
760 if code := refuseArchived(c, repo); code >= 0 {
761 return code
762 }
763 body, err := bodyFrom(c, message, file)
764 if err != nil {
765 return c.fail(protocol.ExitUsage, "%v", err)
766 }
767 if strings.TrimSpace(body) == "" {
768 return c.fail(protocol.ExitUsage, "empty comment; use --message or --file -")
769 }
770 if err := c.Store.AddMRComment(mr.ID, c.User.ID, body, fmtName); err != nil {
771 return c.fail(protocol.ExitFailure, "%v", err)
772 }
773 c.Store.RecordEvent(repo.ID, c.User.ID, "mr.commented", fmt.Sprintf(`{"number":%d}`, mr.Number))
774 if parts, err := c.Store.MRParticipants(mr.ID); err == nil {
775 notifyUsers(c, parts, mrSubject(repo, mr.Number, mr.Title),
776 notifyBody(c, fmt.Sprintf("commented on !%d", mr.Number), body, fmt.Sprintf("%s/mrs/%d", repo.Path(), mr.Number)))
777 }
778 return c.emit(map[string]any{"number": mr.Number}, func(w io.Writer) {
779 fmt.Fprintf(w, "commented on %s!%d\n", repo.Path(), mr.Number)
780 })
781}
782
783func runMRReview(c *Ctx, args []string) int {
784 verdict := ""
785 var rest []string
786 for _, a := range args {
787 switch a {
788 case "--approve":
789 verdict = "approve"
790 case "--request-changes":
791 verdict = "request_changes"
792 case "--comment":
793 verdict = "comment"
794 default:
795 rest = append(rest, a)
796 }
797 }
798 if verdict == "" {
799 return c.fail(protocol.ExitUsage, "usage: mr review <owner/name> <n> --approve|--request-changes|--comment")
800 }
801 repo, mr, code := mrRef(c, rest, policy.CanRead)
802 if code >= 0 {
803 return code
804 }
805 if code := refuseArchived(c, repo); code >= 0 {
806 return code
807 }
808 if mr.State != "open" {
809 return c.fail(protocol.ExitUsage, "MR !%d is %s", mr.Number, mr.State)
810 }
811 if err := c.Store.AddMRReview(mr.ID, c.User.ID, verdict, mr.HeadSHA); err != nil {
812 return c.fail(protocol.ExitFailure, "%v", err)
813 }
814 if parts, err := c.Store.MRParticipants(mr.ID); err == nil {
815 notifyUsers(c, parts, mrSubject(repo, mr.Number, mr.Title),
816 notifyBody(c, fmt.Sprintf("reviewed !%d: %s", mr.Number, verdict), "", fmt.Sprintf("%s/mrs/%d", repo.Path(), mr.Number)))
817 }
818 return c.emit(map[string]any{"number": mr.Number, "verdict": verdict}, func(w io.Writer) {
819 fmt.Fprintf(w, "reviewed %s!%d: %s\n", repo.Path(), mr.Number, verdict)
820 })
821}
822
823func runMRMerge(c *Ctx, args []string) int {
824 strategy := ""
825 var rest []string
826 for i := 0; i < len(args); i++ {
827 if args[i] == "--strategy" {
828 if i+1 >= len(args) {
829 return c.fail(protocol.ExitUsage, "--strategy requires ff|merge|squash|rebase")
830 }
831 strategy = args[i+1]
832 i++
833 continue
834 }
835 rest = append(rest, args[i])
836 }
837 valid := map[string]bool{"": true, "ff": true, "merge": true, "squash": true, "rebase": true}
838 if !valid[strategy] {
839 return c.fail(protocol.ExitUsage, "--strategy must be ff, merge, squash, or rebase")
840 }
841 repo, mr, code := mrRef(c, rest, policy.CanWrite)
842 if code >= 0 {
843 return code
844 }
845 if code := refuseArchived(c, repo); code >= 0 {
846 return code
847 }
848 if mr.State != "open" && mr.State != "source_gone" {
849 return c.fail(protocol.ExitUsage, "MR !%d is %s", mr.Number, mr.State)
850 }
851
852 dir := RepoDir(c.Cfg.Server.Root, repo.OwnerName, repo.Name)
853 targetRef := "refs/heads/" + mr.TargetRef
854 targetSHA, err := gitutil.ResolveRef(dir, targetRef)
855 if err != nil {
856 return c.fail(protocol.ExitFailure, "target branch %s: %v", mr.TargetRef, err)
857 }
858 headSHA, err := gitutil.ResolveRef(dir, mrHeadRef(mr.Number))
859 if err != nil {
860 return c.fail(protocol.ExitFailure, "MR head ref: %v", err)
861 }
862
863 // Check gate: with require_checks, the MR head must carry statuses
864 // and every one of them must be green.
865 if repo.Settings.RequireChecks {
866 statuses, err := c.Store.ListCommitStatuses(repo.ID, headSHA)
867 if err != nil {
868 return c.fail(protocol.ExitFailure, "%v", err)
869 }
870 switch store.CombinedStatus(statuses) {
871 case "success":
872 case "":
873 return c.fail(protocol.ExitDenied,
874 "%s requires green checks and none were reported on %.10s", repo.Path(), headSHA)
875 default:
876 var bad []string
877 for _, st := range statuses {
878 if st.State != "success" {
879 bad = append(bad, st.Context+"="+st.State)
880 }
881 }
882 return c.fail(protocol.ExitDenied,
883 "%s requires green checks; %.10s has %s", repo.Path(), headSHA, strings.Join(bad, ", "))
884 }
885 }
886
887 // Review gates: approvals, CODEOWNERS, resolved threads.
888 if code := c.reviewGates(repo, mr, dir, targetSHA, headSHA); code >= 0 {
889 return code
890 }
891
892 upToDate, err := gitutil.IsAncestor(dir, headSHA, targetSHA)
893 if err != nil {
894 return c.fail(protocol.ExitFailure, "%v", err)
895 }
896 if upToDate {
897 return c.fail(protocol.ExitUsage, "target already contains the MR head")
898 }
899 ffPossible, err := gitutil.IsAncestor(dir, targetSHA, headSHA)
900 if err != nil {
901 return c.fail(protocol.ExitFailure, "%v", err)
902 }
903
904 // Signature policy matrix: with require_signed_commits, only
905 // fast-forward is allowed — squash, rebase-replay, and merge commits
906 // are all server-created and unsigned, violating the branch's own
907 // policy — and every landed commit must be verified. An explicit
908 // rebase when fast-forward is already possible IS a fast-forward
909 // (nothing is rewritten), so it stays legal.
910 if repo.Settings.RequireSignedCommits {
911 if strategy == "merge" || strategy == "squash" || !ffPossible {
912 return c.fail(protocol.ExitDenied,
913 "%s requires signed commits, so only fast-forward merges are allowed; rebase %s onto %s locally, re-push, and merge again",
914 repo.Path(), mr.SourceRef, mr.TargetRef)
915 }
916 strategy = "ff"
917 commits, err := gitutil.RevListRange(dir, targetSHA, headSHA)
918 if err != nil {
919 return c.fail(protocol.ExitFailure, "%v", err)
920 }
921 for _, sha := range commits {
922 raw, err := gitutil.ReadCommit(dir, sha)
923 if err != nil {
924 return c.fail(protocol.ExitFailure, "%v", err)
925 }
926 parsed, err := sigParse(raw)
927 if err != nil {
928 return c.fail(protocol.ExitFailure, "%v", err)
929 }
930 res, err := VerifyCommitCached(c.Store, repo, parsed, sha)
931 if err != nil {
932 return c.fail(protocol.ExitFailure, "%v", err)
933 }
934 if res.State != "verified" {
935 return c.fail(protocol.ExitDenied,
936 "%s requires signed commits: %.10s is %s", repo.Path(), sha, res.State)
937 }
938 }
939 }
940 if strategy == "" {
941 if ffPossible {
942 strategy = "ff"
943 } else {
944 strategy = "merge"
945 }
946 }
947 if strategy == "rebase" && ffPossible {
948 // Nothing to rewrite: a rebase onto an ancestor is a fast-forward,
949 // and taking it keeps the original commits and their signatures.
950 strategy = "ff"
951 }
952
953 // Every server-created commit needs the merger's verified identity.
954 mergerEmail := ""
955 if strategy != "ff" {
956 email, err := c.Store.PrimaryVerifiedEmail(c.User.ID)
957 if err != nil {
958 return c.fail(protocol.ExitFailure, "%v", err)
959 }
960 if email == "" {
961 return c.fail(protocol.ExitDenied,
962 "%s merges create commits carrying your identity: verify a primary email first (or use a fast-forward merge)", strategy)
963 }
964 mergerEmail = email
965 }
966
967 var newSHA string
968 switch strategy {
969 case "ff":
970 if !ffPossible {
971 return c.fail(protocol.ExitUsage,
972 "fast-forward not possible: %s has diverged from the MR head; use --strategy merge or rebase and re-push", mr.TargetRef)
973 }
974 newSHA = headSHA
975
976 case "merge":
977 tree, conflict, err := gitutil.MergeTree(dir, targetSHA, headSHA)
978 if err != nil {
979 return c.fail(protocol.ExitFailure, "%v", err)
980 }
981 if conflict {
982 return c.fail(protocol.ExitUsage,
983 "merge conflicts between %s and the MR head; resolve locally and re-push", mr.TargetRef)
984 }
985 msg := fmt.Sprintf("Merge request !%d: %s\n\nMerged %s into %s", mr.Number, mr.Title, mr.SourceRef, mr.TargetRef)
986 newSHA, err = gitutil.CommitTree(dir, tree, []string{targetSHA, headSHA}, c.User.Username, mergerEmail, msg)
987 if err != nil {
988 return c.fail(protocol.ExitFailure, "%v", err)
989 }
990
991 case "squash":
992 // One new commit with the merged tree. Authorship credit goes to
993 // the MR author (their verified identity when they have one); the
994 // committer is the merger.
995 tree := ""
996 if ffPossible {
997 t, err := gitutil.ResolveTree(dir, headSHA)
998 if err != nil {
999 return c.fail(protocol.ExitFailure, "%v", err)
1000 }
1001 tree = t
1002 } else {
1003 t, conflict, err := gitutil.MergeTree(dir, targetSHA, headSHA)
1004 if err != nil {
1005 return c.fail(protocol.ExitFailure, "%v", err)
1006 }
1007 if conflict {
1008 return c.fail(protocol.ExitUsage,
1009 "merge conflicts between %s and the MR head; resolve locally and re-push", mr.TargetRef)
1010 }
1011 tree = t
1012 }
1013 authorName, authorEmail := c.User.Username, mergerEmail
1014 if author, err := c.Store.UserByUsername(mr.Author); err == nil {
1015 if ae, err := c.Store.PrimaryVerifiedEmail(author.ID); err == nil && ae != "" {
1016 authorName, authorEmail = author.Username, ae
1017 }
1018 }
1019 msg := fmt.Sprintf("%s (!%d)", mr.Title, mr.Number)
1020 if mr.Body != "" {
1021 msg += "\n\n" + mr.Body
1022 }
1023 var err error
1024 newSHA, err = gitutil.CommitTreeIdent(dir, tree, []string{targetSHA},
1025 authorName, authorEmail, "", c.User.Username, mergerEmail, msg)
1026 if err != nil {
1027 return c.fail(protocol.ExitFailure, "%v", err)
1028 }
1029
1030 case "rebase":
1031 commits, err := gitutil.RevListRange(dir, targetSHA, headSHA)
1032 if err != nil {
1033 return c.fail(protocol.ExitFailure, "%v", err)
1034 }
1035 // Oldest first.
1036 for i, j := 0, len(commits)-1; i < j; i, j = i+1, j-1 {
1037 commits[i], commits[j] = commits[j], commits[i]
1038 }
1039 onto := targetSHA
1040 for _, sha := range commits {
1041 parents, err := gitutil.CommitParents(dir, sha)
1042 if err != nil {
1043 return c.fail(protocol.ExitFailure, "%v", err)
1044 }
1045 if len(parents) > 1 {
1046 return c.fail(protocol.ExitUsage,
1047 "the MR contains merge commit %.10s; a rebase merge needs linear history — use --strategy merge or squash", sha)
1048 }
1049 base := onto // root commit: replay against the new tip itself
1050 if len(parents) == 1 {
1051 base = parents[0]
1052 }
1053 tree, conflict, err := gitutil.MergeTreeOnto(dir, base, onto, sha)
1054 if err != nil {
1055 return c.fail(protocol.ExitFailure, "%v", err)
1056 }
1057 if conflict {
1058 return c.fail(protocol.ExitUsage,
1059 "commit %.10s does not apply cleanly onto %s; rebase locally and re-push", sha, mr.TargetRef)
1060 }
1061 aName, aEmail, aDate, err := gitutil.AuthorIdent(dir, sha)
1062 if err != nil {
1063 return c.fail(protocol.ExitFailure, "%v", err)
1064 }
1065 msg, err := gitutil.CommitMessage(dir, sha)
1066 if err != nil {
1067 return c.fail(protocol.ExitFailure, "%v", err)
1068 }
1069 onto, err = gitutil.CommitTreeIdent(dir, tree, []string{onto},
1070 aName, aEmail, aDate, c.User.Username, mergerEmail, msg)
1071 if err != nil {
1072 return c.fail(protocol.ExitFailure, "%v", err)
1073 }
1074 }
1075 newSHA = onto
1076 }
1077
1078 // A stacked merge request's diff is against this branch. After a
1079 // fast-forward or merge commit the same commits are on the target and
1080 // its diff is unchanged there; after a squash or rebase they are not,
1081 // and the stack would carry this merge request's changes a second
1082 // time. Refuse rather than leave the stack wrong.
1083 var stack []store.MR
1084 if mr.SourceRepoID == repo.ID {
1085 stack, _ = c.Store.OpenMRsByTarget(repo.ID, mr.SourceRef)
1086 }
1087 if len(stack) > 0 && (strategy == "squash" || strategy == "rebase") {
1088 var nums []string
1089 for _, k := range stack {
1090 nums = append(nums, fmt.Sprintf("!%d", k.Number))
1091 }
1092 return c.fail(protocol.ExitUsage,
1093 "%s is stacked on by %s; a %s merge rewrites the commits they build on. Merge with --strategy ff or merge, or merge the stack into %s first",
1094 fmt.Sprintf("!%d", mr.Number), strings.Join(nums, ", "), strategy, mr.SourceRef)
1095 }
1096
1097 // CAS so a concurrent push between our read and this write fails the
1098 // merge instead of silently discarding the push.
1099 if err := gitutil.UpdateRefCAS(dir, targetRef, newSHA, targetSHA); err != nil {
1100 return c.fail(protocol.ExitFailure, "target branch moved during merge; retry: %v", err)
1101 }
1102 if err := c.Store.MarkMerged(mr.ID, targetSHA, c.User.ID, ""); err != nil {
1103 return c.fail(protocol.ExitFailure, "%v", err)
1104 }
1105 c.Store.RecordEvent(repo.ID, c.User.ID, "mr.merged", fmt.Sprintf(`{"number":%d,"sha":%q}`, mr.Number, newSHA))
1106 // The stack moves up: whatever targeted this branch now targets what
1107 // it merged into, reviews intact, since that diff is the one they
1108 // were of.
1109 for _, k := range stack {
1110 if err := c.Store.RetargetKeepingReviews(k.ID, mr.TargetRef); err != nil {
1111 continue
1112 }
1113 c.Store.AddMRSystemComment(k.ID, c.User.ID, fmt.Sprintf("retargeted from %s to %s: !%d merged", mr.SourceRef, mr.TargetRef, mr.Number))
1114 if parts, err := c.Store.MRParticipants(k.ID); err == nil {
1115 notifyUsers(c, parts, mrSubject(repo, k.Number, k.Title),
1116 notifyBody(c, fmt.Sprintf("retargeted !%d from %s to %s: !%d merged", k.Number, mr.SourceRef, mr.TargetRef, mr.Number), "",
1117 fmt.Sprintf("%s/mrs/%d", repo.Path(), k.Number)))
1118 }
1119 }
1120 // Merges bypass receive-pack, so the commit-message issue actions
1121 // (closes #N, references) run here for the newly landed commits. The
1122 // description is scanned after them, so a commit wins the attribution
1123 // when both name the same issue.
1124 if mr.TargetRef == repo.DefaultBranch {
1125 ProcessCommitMessages(c.Store, dir, repo, c.User.ID, targetSHA, newSHA)
1126 ProcessMRDescription(c.Store, repo, mr, c.User.ID)
1127 RecordLandedCommits(c.Store, dir, repo, targetSHA, newSHA)
1128 }
1129 // A merge moves the ref directly, so it never reaches post-receive and
1130 // none of the ref-update work fires on its own. The event webhooks
1131 // subscribe to, and the branch's CI jobs, happen here instead.
1132 c.Store.RecordEvent(repo.ID, c.User.ID, "push", fmt.Sprintf(
1133 `{"ref":%q,"old":%q,"new":%q,"forced":false,"deleted":false}`,
1134 targetRef, targetSHA, newSHA))
1135 QueueBranchBuilds(c.Store, c.Cfg.Server.Root, c.Cfg.Server.SiteURL,
1136 repo, c.User.ID, mr.TargetRef, newSHA, time.Now())
1137 c.Store.MarkMirrorsDirty(repo.ID, "push")
1138 if parts, err := c.Store.MRParticipants(mr.ID); err == nil {
1139 notifyUsers(c, parts, mrSubject(repo, mr.Number, mr.Title),
1140 notifyBody(c, fmt.Sprintf("merged !%d into %s (%s)", mr.Number, mr.TargetRef, strategy), "", fmt.Sprintf("%s/mrs/%d", repo.Path(), mr.Number)))
1141 }
1142 return c.emit(map[string]any{"number": mr.Number, "strategy": strategy, "sha": newSHA}, func(w io.Writer) {
1143 fmt.Fprintf(w, "merged %s!%d into %s (%s) at %.10s\n", repo.Path(), mr.Number, mr.TargetRef, strategy, newSHA)
1144 })
1145}
1146
1147// reviewGates enforces require_approvals (fresh, non-author, latest review
1148// per reviewer; a fresh request-changes blocks), CODEOWNERS coverage, and
1149// require_resolved. Returns -1 to proceed.
1150func (c *Ctx) reviewGates(repo store.Repo, mr store.MR, dir, targetSHA, headSHA string) int {
1151 set := repo.Settings
1152 if set.RequireApprovals == 0 && !set.RequireResolved {
1153 return -1
1154 }
1155
1156 if set.RequireApprovals > 0 {
1157 reviews, err := c.Store.ListMRReviews(mr.ID)
1158 if err != nil {
1159 return c.fail(protocol.ExitFailure, "%v", err)
1160 }
1161 // Latest fresh review per reviewer decides their stance.
1162 latest := map[string]string{}
1163 for _, r := range reviews {
1164 if r.Stale || r.Reviewer == mr.Author {
1165 continue
1166 }
1167 latest[r.Reviewer] = r.Verdict
1168 }
1169 var approvers []string
1170 var blockers []string
1171 for who, verdict := range latest {
1172 switch verdict {
1173 case "approve":
1174 approvers = append(approvers, who)
1175 case "request_changes":
1176 blockers = append(blockers, who)
1177 }
1178 }
1179 if len(blockers) > 0 {
1180 slices.Sort(blockers)
1181 return c.fail(protocol.ExitDenied,
1182 "%s requested changes on !%d; resolve their review before merging", strings.Join(blockers, ", "), mr.Number)
1183 }
1184 if len(approvers) < set.RequireApprovals {
1185 return c.fail(protocol.ExitDenied,
1186 "%s requires %d fresh approval(s); !%d has %d", repo.Path(), set.RequireApprovals, mr.Number, len(approvers))
1187 }
1188
1189 // CODEOWNERS: every owned changed file needs an approval from one
1190 // of its owners.
1191 content, err := gitutil.ReadBlob(dir, "refs/heads/"+mr.TargetRef, "CODEOWNERS", 1<<20)
1192 if err != nil {
1193 content, err = gitutil.ReadBlob(dir, "refs/heads/"+mr.TargetRef, ".gitbay/CODEOWNERS", 1<<20)
1194 }
1195 if err == nil && len(content) > 0 {
1196 rules := policy.ParseCodeowners(string(content))
1197 base, err := gitutil.MergeBase(dir, targetSHA, headSHA)
1198 if err != nil {
1199 return c.fail(protocol.ExitFailure, "%v", err)
1200 }
1201 files, err := gitutil.DiffFiles(dir, base, headSHA)
1202 if err != nil {
1203 return c.fail(protocol.ExitFailure, "%v", err)
1204 }
1205 approved := map[string]bool{}
1206 for _, a := range approvers {
1207 approved[a] = true
1208 }
1209 missing := map[string][]string{} // owner-set key -> example paths
1210 for _, f := range files {
1211 owners := policy.OwnersFor(rules, f)
1212 if owners == nil {
1213 continue
1214 }
1215 ok := false
1216 for _, o := range owners {
1217 if approved[o] {
1218 ok = true
1219 break
1220 }
1221 }
1222 if !ok {
1223 key := strings.Join(owners, ",")
1224 if len(missing[key]) < 3 {
1225 missing[key] = append(missing[key], f)
1226 }
1227 }
1228 }
1229 if len(missing) > 0 {
1230 var parts []string
1231 for owners, paths := range missing {
1232 parts = append(parts, fmt.Sprintf("%s (owned by %s)", strings.Join(paths, ", "), owners))
1233 }
1234 slices.Sort(parts)
1235 return c.fail(protocol.ExitDenied,
1236 "CODEOWNERS approval missing for: %s", strings.Join(parts, "; "))
1237 }
1238 }
1239 }
1240
1241 if set.RequireResolved {
1242 n, err := c.Store.UnresolvedThreadCount(mr.ID)
1243 if err != nil {
1244 return c.fail(protocol.ExitFailure, "%v", err)
1245 }
1246 if n > 0 {
1247 return c.fail(protocol.ExitDenied,
1248 "%s requires review threads resolved; !%d has %d open (mr threads %s %d)", repo.Path(), mr.Number, n, repo.Path(), mr.Number)
1249 }
1250 }
1251 return -1
1252}
1253
1254func runMRClose(c *Ctx, args []string) int {
1255 repo, mr, code := mrRef(c, args, policy.CanRead)
1256 if code >= 0 {
1257 return code
1258 }
1259 if code := refuseArchived(c, repo); code >= 0 {
1260 return code
1261 }
1262 if len(args) != 2 {
1263 return c.fail(protocol.ExitUsage, "usage: mr close <owner/name> <n>")
1264 }
1265 grant, err := c.Store.AccessRole(repo.ID, c.User.ID)
1266 if err != nil {
1267 return c.fail(protocol.ExitFailure, "%v", err)
1268 }
1269 if mr.Author != c.User.Username && !policy.CanWrite(c.User, repo, grant) {
1270 return c.fail(protocol.ExitDenied, "only the author or users with write access can close this MR")
1271 }
1272 if mr.State == "merged" || mr.State == "closed" {
1273 return c.fail(protocol.ExitUsage, "MR !%d is already %s", mr.Number, mr.State)
1274 }
1275 if err := c.Store.MarkClosed(mr.ID, c.User.ID, ""); err != nil {
1276 return c.fail(protocol.ExitFailure, "%v", err)
1277 }
1278 return c.emit(map[string]any{"number": mr.Number, "state": "closed"}, func(w io.Writer) {
1279 fmt.Fprintf(w, "closed %s!%d\n", repo.Path(), mr.Number)
1280 })
1281}