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