julien.rbrt.fr
forked from
tangled.org/core
Monorepo for Tangled — https://tangled.org
1package pulls
2
3import (
4 "context"
5 "database/sql"
6 "encoding/json"
7 "errors"
8 "fmt"
9 "log"
10 "log/slog"
11 "net/http"
12 "slices"
13 "sort"
14 "strconv"
15 "strings"
16 "time"
17
18 "tangled.org/core/api/tangled"
19 "tangled.org/core/appview/config"
20 "tangled.org/core/appview/db"
21 pulls_indexer "tangled.org/core/appview/indexer/pulls"
22 "tangled.org/core/appview/mentions"
23 "tangled.org/core/appview/models"
24 "tangled.org/core/appview/notify"
25 "tangled.org/core/appview/oauth"
26 "tangled.org/core/appview/pages"
27 "tangled.org/core/appview/pages/markup"
28 "tangled.org/core/appview/pages/repoinfo"
29 "tangled.org/core/appview/reporesolver"
30 "tangled.org/core/appview/validator"
31 "tangled.org/core/appview/xrpcclient"
32 "tangled.org/core/idresolver"
33 "tangled.org/core/orm"
34 "tangled.org/core/patchutil"
35 "tangled.org/core/rbac"
36 "tangled.org/core/tid"
37 "tangled.org/core/types"
38
39 comatproto "github.com/bluesky-social/indigo/api/atproto"
40 "github.com/bluesky-social/indigo/atproto/syntax"
41 lexutil "github.com/bluesky-social/indigo/lex/util"
42 indigoxrpc "github.com/bluesky-social/indigo/xrpc"
43 "github.com/go-chi/chi/v5"
44 "github.com/google/uuid"
45)
46
47type Pulls struct {
48 oauth *oauth.OAuth
49 repoResolver *reporesolver.RepoResolver
50 pages *pages.Pages
51 idResolver *idresolver.Resolver
52 mentionsResolver *mentions.Resolver
53 db *db.DB
54 config *config.Config
55 notifier notify.Notifier
56 enforcer *rbac.Enforcer
57 logger *slog.Logger
58 validator *validator.Validator
59 indexer *pulls_indexer.Indexer
60}
61
62func New(
63 oauth *oauth.OAuth,
64 repoResolver *reporesolver.RepoResolver,
65 pages *pages.Pages,
66 resolver *idresolver.Resolver,
67 mentionsResolver *mentions.Resolver,
68 db *db.DB,
69 config *config.Config,
70 notifier notify.Notifier,
71 enforcer *rbac.Enforcer,
72 validator *validator.Validator,
73 indexer *pulls_indexer.Indexer,
74 logger *slog.Logger,
75) *Pulls {
76 return &Pulls{
77 oauth: oauth,
78 repoResolver: repoResolver,
79 pages: pages,
80 idResolver: resolver,
81 mentionsResolver: mentionsResolver,
82 db: db,
83 config: config,
84 notifier: notifier,
85 enforcer: enforcer,
86 logger: logger,
87 validator: validator,
88 indexer: indexer,
89 }
90}
91
92// htmx fragment
93func (s *Pulls) PullActions(w http.ResponseWriter, r *http.Request) {
94 switch r.Method {
95 case http.MethodGet:
96 user := s.oauth.GetUser(r)
97 f, err := s.repoResolver.Resolve(r)
98 if err != nil {
99 log.Println("failed to get repo and knot", err)
100 return
101 }
102
103 pull, ok := r.Context().Value("pull").(*models.Pull)
104 if !ok {
105 log.Println("failed to get pull")
106 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
107 return
108 }
109
110 // can be nil if this pull is not stacked
111 stack, _ := r.Context().Value("stack").(models.Stack)
112
113 roundNumberStr := chi.URLParam(r, "round")
114 roundNumber, err := strconv.Atoi(roundNumberStr)
115 if err != nil {
116 roundNumber = pull.LastRoundNumber()
117 }
118 if roundNumber >= len(pull.Submissions) {
119 http.Error(w, "bad round id", http.StatusBadRequest)
120 log.Println("failed to parse round id", err)
121 return
122 }
123
124 mergeCheckResponse := s.mergeCheck(r, f, pull, stack)
125 branchDeleteStatus := s.branchDeleteStatus(r, f, pull)
126 resubmitResult := pages.Unknown
127 if user.Did == pull.OwnerDid {
128 resubmitResult = s.resubmitCheck(r, f, pull, stack)
129 }
130
131 s.pages.PullActionsFragment(w, pages.PullActionsParams{
132 LoggedInUser: user,
133 RepoInfo: s.repoResolver.GetRepoInfo(r, user),
134 Pull: pull,
135 RoundNumber: roundNumber,
136 MergeCheck: mergeCheckResponse,
137 ResubmitCheck: resubmitResult,
138 BranchDeleteStatus: branchDeleteStatus,
139 Stack: stack,
140 })
141 return
142 }
143}
144
145func (s *Pulls) RepoSinglePull(w http.ResponseWriter, r *http.Request) {
146 user := s.oauth.GetUser(r)
147 f, err := s.repoResolver.Resolve(r)
148 if err != nil {
149 log.Println("failed to get repo and knot", err)
150 return
151 }
152
153 pull, ok := r.Context().Value("pull").(*models.Pull)
154 if !ok {
155 log.Println("failed to get pull")
156 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
157 return
158 }
159
160 backlinks, err := db.GetBacklinks(s.db, pull.AtUri())
161 if err != nil {
162 log.Println("failed to get pull backlinks", err)
163 s.pages.Notice(w, "pull-error", "Failed to get pull. Try again later.")
164 return
165 }
166
167 // can be nil if this pull is not stacked
168 stack, _ := r.Context().Value("stack").(models.Stack)
169 abandonedPulls, _ := r.Context().Value("abandonedPulls").([]*models.Pull)
170
171 mergeCheckResponse := s.mergeCheck(r, f, pull, stack)
172 branchDeleteStatus := s.branchDeleteStatus(r, f, pull)
173 resubmitResult := pages.Unknown
174 if user != nil && user.Did == pull.OwnerDid {
175 resubmitResult = s.resubmitCheck(r, f, pull, stack)
176 }
177
178 m := make(map[string]models.Pipeline)
179
180 var shas []string
181 for _, s := range pull.Submissions {
182 shas = append(shas, s.SourceRev)
183 }
184 for _, p := range stack {
185 shas = append(shas, p.LatestSha())
186 }
187 for _, p := range abandonedPulls {
188 shas = append(shas, p.LatestSha())
189 }
190
191 ps, err := db.GetPipelineStatuses(
192 s.db,
193 len(shas),
194 orm.FilterEq("repo_owner", f.Did),
195 orm.FilterEq("repo_name", f.Name),
196 orm.FilterEq("knot", f.Knot),
197 orm.FilterIn("sha", shas),
198 )
199 if err != nil {
200 log.Printf("failed to fetch pipeline statuses: %s", err)
201 // non-fatal
202 }
203
204 for _, p := range ps {
205 m[p.Sha] = p
206 }
207
208 reactionMap, err := db.GetReactionMap(s.db, 20, pull.AtUri())
209 if err != nil {
210 log.Println("failed to get pull reactions")
211 s.pages.Notice(w, "pulls", "Failed to load pull. Try again later.")
212 }
213
214 userReactions := map[models.ReactionKind]bool{}
215 if user != nil {
216 userReactions = db.GetReactionStatusMap(s.db, user.Did, pull.AtUri())
217 }
218
219 labelDefs, err := db.GetLabelDefinitions(
220 s.db,
221 orm.FilterIn("at_uri", f.Labels),
222 orm.FilterContains("scope", tangled.RepoPullNSID),
223 )
224 if err != nil {
225 log.Println("failed to fetch labels", err)
226 s.pages.Error503(w)
227 return
228 }
229
230 defs := make(map[string]*models.LabelDefinition)
231 for _, l := range labelDefs {
232 defs[l.AtUri().String()] = &l
233 }
234
235 s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{
236 LoggedInUser: user,
237 RepoInfo: s.repoResolver.GetRepoInfo(r, user),
238 Pull: pull,
239 Stack: stack,
240 AbandonedPulls: abandonedPulls,
241 Backlinks: backlinks,
242 BranchDeleteStatus: branchDeleteStatus,
243 MergeCheck: mergeCheckResponse,
244 ResubmitCheck: resubmitResult,
245 Pipelines: m,
246
247 OrderedReactionKinds: models.OrderedReactionKinds,
248 Reactions: reactionMap,
249 UserReacted: userReactions,
250
251 LabelDefs: defs,
252 })
253}
254
255func (s *Pulls) mergeCheck(r *http.Request, f *models.Repo, pull *models.Pull, stack models.Stack) types.MergeCheckResponse {
256 if pull.State == models.PullMerged {
257 return types.MergeCheckResponse{}
258 }
259
260 scheme := "https"
261 if s.config.Core.Dev {
262 scheme = "http"
263 }
264 host := fmt.Sprintf("%s://%s", scheme, f.Knot)
265
266 xrpcc := indigoxrpc.Client{
267 Host: host,
268 }
269
270 patch := pull.LatestPatch()
271 if pull.IsStacked() {
272 // combine patches of substack
273 subStack := stack.Below(pull)
274 // collect the portion of the stack that is mergeable
275 mergeable := subStack.Mergeable()
276 // combine each patch
277 patch = mergeable.CombinedPatch()
278 }
279
280 resp, xe := tangled.RepoMergeCheck(
281 r.Context(),
282 &xrpcc,
283 &tangled.RepoMergeCheck_Input{
284 Did: f.Did,
285 Name: f.Name,
286 Branch: pull.TargetBranch,
287 Patch: patch,
288 },
289 )
290 if err := xrpcclient.HandleXrpcErr(xe); err != nil {
291 log.Println("failed to check for mergeability", "err", err)
292 return types.MergeCheckResponse{
293 Error: fmt.Sprintf("failed to check merge status: %s", err.Error()),
294 }
295 }
296
297 // convert xrpc response to internal types
298 conflicts := make([]types.ConflictInfo, len(resp.Conflicts))
299 for i, conflict := range resp.Conflicts {
300 conflicts[i] = types.ConflictInfo{
301 Filename: conflict.Filename,
302 Reason: conflict.Reason,
303 }
304 }
305
306 result := types.MergeCheckResponse{
307 IsConflicted: resp.Is_conflicted,
308 Conflicts: conflicts,
309 }
310
311 if resp.Message != nil {
312 result.Message = *resp.Message
313 }
314
315 if resp.Error != nil {
316 result.Error = *resp.Error
317 }
318
319 return result
320}
321
322func (s *Pulls) branchDeleteStatus(r *http.Request, repo *models.Repo, pull *models.Pull) *models.BranchDeleteStatus {
323 if pull.State != models.PullMerged {
324 return nil
325 }
326
327 user := s.oauth.GetUser(r)
328 if user == nil {
329 return nil
330 }
331
332 var branch string
333 // check if the branch exists
334 // NOTE: appview could cache branches/tags etc. for every repo by listening for gitRefUpdates
335 if pull.IsBranchBased() {
336 branch = pull.PullSource.Branch
337 } else if pull.IsForkBased() {
338 branch = pull.PullSource.Branch
339 repo = pull.PullSource.Repo
340 } else {
341 return nil
342 }
343
344 // deleted fork
345 if repo == nil {
346 return nil
347 }
348
349 // user can only delete branch if they are a collaborator in the repo that the branch belongs to
350 perms := s.enforcer.GetPermissionsInRepo(user.Did, repo.Knot, repo.DidSlashRepo())
351 if !slices.Contains(perms, "repo:push") {
352 return nil
353 }
354
355 scheme := "http"
356 if !s.config.Core.Dev {
357 scheme = "https"
358 }
359 host := fmt.Sprintf("%s://%s", scheme, repo.Knot)
360 xrpcc := &indigoxrpc.Client{
361 Host: host,
362 }
363
364 resp, err := tangled.RepoBranch(r.Context(), xrpcc, branch, fmt.Sprintf("%s/%s", repo.Did, repo.Name))
365 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {
366 return nil
367 }
368
369 return &models.BranchDeleteStatus{
370 Repo: repo,
371 Branch: resp.Name,
372 }
373}
374
375func (s *Pulls) resubmitCheck(r *http.Request, repo *models.Repo, pull *models.Pull, stack models.Stack) pages.ResubmitResult {
376 if pull.State == models.PullMerged || pull.State == models.PullDeleted || pull.PullSource == nil {
377 return pages.Unknown
378 }
379
380 var knot, ownerDid, repoName string
381
382 if pull.PullSource.RepoAt != nil {
383 // fork-based pulls
384 sourceRepo, err := db.GetRepoByAtUri(s.db, pull.PullSource.RepoAt.String())
385 if err != nil {
386 log.Println("failed to get source repo", err)
387 return pages.Unknown
388 }
389
390 knot = sourceRepo.Knot
391 ownerDid = sourceRepo.Did
392 repoName = sourceRepo.Name
393 } else {
394 // pulls within the same repo
395 knot = repo.Knot
396 ownerDid = repo.Did
397 repoName = repo.Name
398 }
399
400 scheme := "http"
401 if !s.config.Core.Dev {
402 scheme = "https"
403 }
404 host := fmt.Sprintf("%s://%s", scheme, knot)
405 xrpcc := &indigoxrpc.Client{
406 Host: host,
407 }
408
409 didSlashName := fmt.Sprintf("%s/%s", ownerDid, repoName)
410 branchResp, err := tangled.RepoBranch(r.Context(), xrpcc, pull.PullSource.Branch, didSlashName)
411 if err != nil {
412 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {
413 log.Println("failed to call XRPC repo.branches", xrpcerr)
414 return pages.Unknown
415 }
416 log.Println("failed to reach knotserver", err)
417 return pages.Unknown
418 }
419
420 targetBranch := branchResp
421
422 latestSourceRev := pull.LatestSha()
423
424 if pull.IsStacked() && stack != nil {
425 top := stack[0]
426 latestSourceRev = top.LatestSha()
427 }
428
429 if latestSourceRev != targetBranch.Hash {
430 return pages.ShouldResubmit
431 }
432
433 return pages.ShouldNotResubmit
434}
435
436func (s *Pulls) RepoPullPatch(w http.ResponseWriter, r *http.Request) {
437 user := s.oauth.GetUser(r)
438
439 var diffOpts types.DiffOpts
440 if d := r.URL.Query().Get("diff"); d == "split" {
441 diffOpts.Split = true
442 }
443
444 pull, ok := r.Context().Value("pull").(*models.Pull)
445 if !ok {
446 log.Println("failed to get pull")
447 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
448 return
449 }
450
451 stack, _ := r.Context().Value("stack").(models.Stack)
452
453 roundId := chi.URLParam(r, "round")
454 roundIdInt, err := strconv.Atoi(roundId)
455 if err != nil || roundIdInt >= len(pull.Submissions) {
456 http.Error(w, "bad round id", http.StatusBadRequest)
457 log.Println("failed to parse round id", err)
458 return
459 }
460
461 patch := pull.Submissions[roundIdInt].CombinedPatch()
462 diff := patchutil.AsNiceDiff(patch, pull.TargetBranch)
463
464 s.pages.RepoPullPatchPage(w, pages.RepoPullPatchParams{
465 LoggedInUser: user,
466 RepoInfo: s.repoResolver.GetRepoInfo(r, user),
467 Pull: pull,
468 Stack: stack,
469 Round: roundIdInt,
470 Submission: pull.Submissions[roundIdInt],
471 Diff: &diff,
472 DiffOpts: diffOpts,
473 })
474
475}
476
477func (s *Pulls) RepoPullInterdiff(w http.ResponseWriter, r *http.Request) {
478 user := s.oauth.GetUser(r)
479
480 var diffOpts types.DiffOpts
481 if d := r.URL.Query().Get("diff"); d == "split" {
482 diffOpts.Split = true
483 }
484
485 pull, ok := r.Context().Value("pull").(*models.Pull)
486 if !ok {
487 log.Println("failed to get pull")
488 s.pages.Notice(w, "pull-error", "Failed to get pull.")
489 return
490 }
491
492 roundId := chi.URLParam(r, "round")
493 roundIdInt, err := strconv.Atoi(roundId)
494 if err != nil || roundIdInt >= len(pull.Submissions) {
495 http.Error(w, "bad round id", http.StatusBadRequest)
496 log.Println("failed to parse round id", err)
497 return
498 }
499
500 if roundIdInt == 0 {
501 http.Error(w, "bad round id", http.StatusBadRequest)
502 log.Println("cannot interdiff initial submission")
503 return
504 }
505
506 currentPatch, err := patchutil.AsDiff(pull.Submissions[roundIdInt].CombinedPatch())
507 if err != nil {
508 log.Println("failed to interdiff; current patch malformed")
509 s.pages.Notice(w, fmt.Sprintf("interdiff-error-%d", roundIdInt), "Failed to calculate interdiff; current patch is invalid.")
510 return
511 }
512
513 previousPatch, err := patchutil.AsDiff(pull.Submissions[roundIdInt-1].CombinedPatch())
514 if err != nil {
515 log.Println("failed to interdiff; previous patch malformed")
516 s.pages.Notice(w, fmt.Sprintf("interdiff-error-%d", roundIdInt), "Failed to calculate interdiff; previous patch is invalid.")
517 return
518 }
519
520 interdiff := patchutil.Interdiff(previousPatch, currentPatch)
521
522 s.pages.RepoPullInterdiffPage(w, pages.RepoPullInterdiffParams{
523 LoggedInUser: s.oauth.GetUser(r),
524 RepoInfo: s.repoResolver.GetRepoInfo(r, user),
525 Pull: pull,
526 Round: roundIdInt,
527 Interdiff: interdiff,
528 DiffOpts: diffOpts,
529 })
530}
531
532func (s *Pulls) RepoPullPatchRaw(w http.ResponseWriter, r *http.Request) {
533 pull, ok := r.Context().Value("pull").(*models.Pull)
534 if !ok {
535 log.Println("failed to get pull")
536 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
537 return
538 }
539
540 roundId := chi.URLParam(r, "round")
541 roundIdInt, err := strconv.Atoi(roundId)
542 if err != nil || roundIdInt >= len(pull.Submissions) {
543 http.Error(w, "bad round id", http.StatusBadRequest)
544 log.Println("failed to parse round id", err)
545 return
546 }
547
548 w.Header().Set("Content-Type", "text/plain; charset=utf-8")
549 w.Write([]byte(pull.Submissions[roundIdInt].Patch))
550}
551
552func (s *Pulls) RepoPulls(w http.ResponseWriter, r *http.Request) {
553 l := s.logger.With("handler", "RepoPulls")
554
555 user := s.oauth.GetUser(r)
556 params := r.URL.Query()
557
558 state := models.PullOpen
559 switch params.Get("state") {
560 case "closed":
561 state = models.PullClosed
562 case "merged":
563 state = models.PullMerged
564 }
565
566 f, err := s.repoResolver.Resolve(r)
567 if err != nil {
568 log.Println("failed to get repo and knot", err)
569 return
570 }
571
572 keyword := params.Get("q")
573
574 var ids []int64
575 searchOpts := models.PullSearchOptions{
576 Keyword: keyword,
577 RepoAt: f.RepoAt().String(),
578 State: state,
579 // Page: page,
580 }
581 l.Debug("searching with", "searchOpts", searchOpts)
582 if keyword != "" {
583 res, err := s.indexer.Search(r.Context(), searchOpts)
584 if err != nil {
585 l.Error("failed to search for pulls", "err", err)
586 return
587 }
588 ids = res.Hits
589 l.Debug("searched pulls with indexer", "count", len(ids))
590 } else {
591 ids, err = db.GetPullIDs(s.db, searchOpts)
592 if err != nil {
593 l.Error("failed to get all pull ids", "err", err)
594 return
595 }
596 l.Debug("indexed all pulls from the db", "count", len(ids))
597 }
598
599 pulls, err := db.GetPulls(
600 s.db,
601 orm.FilterIn("id", ids),
602 )
603 if err != nil {
604 log.Println("failed to get pulls", err)
605 s.pages.Notice(w, "pulls", "Failed to load pulls. Try again later.")
606 return
607 }
608
609 for _, p := range pulls {
610 var pullSourceRepo *models.Repo
611 if p.PullSource != nil {
612 if p.PullSource.RepoAt != nil {
613 pullSourceRepo, err = db.GetRepoByAtUri(s.db, p.PullSource.RepoAt.String())
614 if err != nil {
615 log.Printf("failed to get repo by at uri: %v", err)
616 continue
617 } else {
618 p.PullSource.Repo = pullSourceRepo
619 }
620 }
621 }
622 }
623
624 // we want to group all stacked PRs into just one list
625 stacks := make(map[string]models.Stack)
626 var shas []string
627 n := 0
628 for _, p := range pulls {
629 // store the sha for later
630 shas = append(shas, p.LatestSha())
631 // this PR is stacked
632 if p.StackId != "" {
633 // we have already seen this PR stack
634 if _, seen := stacks[p.StackId]; seen {
635 stacks[p.StackId] = append(stacks[p.StackId], p)
636 // skip this PR
637 } else {
638 stacks[p.StackId] = nil
639 pulls[n] = p
640 n++
641 }
642 } else {
643 pulls[n] = p
644 n++
645 }
646 }
647 pulls = pulls[:n]
648
649 ps, err := db.GetPipelineStatuses(
650 s.db,
651 len(shas),
652 orm.FilterEq("repo_owner", f.Did),
653 orm.FilterEq("repo_name", f.Name),
654 orm.FilterEq("knot", f.Knot),
655 orm.FilterIn("sha", shas),
656 )
657 if err != nil {
658 log.Printf("failed to fetch pipeline statuses: %s", err)
659 // non-fatal
660 }
661 m := make(map[string]models.Pipeline)
662 for _, p := range ps {
663 m[p.Sha] = p
664 }
665
666 labelDefs, err := db.GetLabelDefinitions(
667 s.db,
668 orm.FilterIn("at_uri", f.Labels),
669 orm.FilterContains("scope", tangled.RepoPullNSID),
670 )
671 if err != nil {
672 log.Println("failed to fetch labels", err)
673 s.pages.Error503(w)
674 return
675 }
676
677 defs := make(map[string]*models.LabelDefinition)
678 for _, l := range labelDefs {
679 defs[l.AtUri().String()] = &l
680 }
681
682 s.pages.RepoPulls(w, pages.RepoPullsParams{
683 LoggedInUser: s.oauth.GetUser(r),
684 RepoInfo: s.repoResolver.GetRepoInfo(r, user),
685 Pulls: pulls,
686 LabelDefs: defs,
687 FilteringBy: state,
688 FilterQuery: keyword,
689 Stacks: stacks,
690 Pipelines: m,
691 })
692}
693
694func (s *Pulls) PullComment(w http.ResponseWriter, r *http.Request) {
695 user := s.oauth.GetUser(r)
696 f, err := s.repoResolver.Resolve(r)
697 if err != nil {
698 log.Println("failed to get repo and knot", err)
699 return
700 }
701
702 pull, ok := r.Context().Value("pull").(*models.Pull)
703 if !ok {
704 log.Println("failed to get pull")
705 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
706 return
707 }
708
709 roundNumberStr := chi.URLParam(r, "round")
710 roundNumber, err := strconv.Atoi(roundNumberStr)
711 if err != nil || roundNumber >= len(pull.Submissions) {
712 http.Error(w, "bad round id", http.StatusBadRequest)
713 log.Println("failed to parse round id", err)
714 return
715 }
716
717 switch r.Method {
718 case http.MethodGet:
719 s.pages.PullNewCommentFragment(w, pages.PullNewCommentParams{
720 LoggedInUser: user,
721 RepoInfo: s.repoResolver.GetRepoInfo(r, user),
722 Pull: pull,
723 RoundNumber: roundNumber,
724 })
725 return
726 case http.MethodPost:
727 body := r.FormValue("body")
728 if body == "" {
729 s.pages.Notice(w, "pull", "Comment body is required")
730 return
731 }
732
733 mentions, references := s.mentionsResolver.Resolve(r.Context(), body)
734
735 // Start a transaction
736 tx, err := s.db.BeginTx(r.Context(), nil)
737 if err != nil {
738 log.Println("failed to start transaction", err)
739 s.pages.Notice(w, "pull-comment", "Failed to create comment.")
740 return
741 }
742 defer tx.Rollback()
743
744 createdAt := time.Now().Format(time.RFC3339)
745
746 client, err := s.oauth.AuthorizedClient(r)
747 if err != nil {
748 log.Println("failed to get authorized client", err)
749 s.pages.Notice(w, "pull-comment", "Failed to create comment.")
750 return
751 }
752 atResp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{
753 Collection: tangled.RepoPullCommentNSID,
754 Repo: user.Did,
755 Rkey: tid.TID(),
756 Record: &lexutil.LexiconTypeDecoder{
757 Val: &tangled.RepoPullComment{
758 Pull: pull.AtUri().String(),
759 Body: body,
760 CreatedAt: createdAt,
761 },
762 },
763 })
764 if err != nil {
765 log.Println("failed to create pull comment", err)
766 s.pages.Notice(w, "pull-comment", "Failed to create comment.")
767 return
768 }
769
770 comment := &models.PullComment{
771 OwnerDid: user.Did,
772 RepoAt: f.RepoAt().String(),
773 PullId: pull.PullId,
774 Body: body,
775 CommentAt: atResp.Uri,
776 SubmissionId: pull.Submissions[roundNumber].ID,
777 Mentions: mentions,
778 References: references,
779 }
780
781 // Create the pull comment in the database with the commentAt field
782 commentId, err := db.NewPullComment(tx, comment)
783 if err != nil {
784 log.Println("failed to create pull comment", err)
785 s.pages.Notice(w, "pull-comment", "Failed to create comment.")
786 return
787 }
788
789 // Commit the transaction
790 if err = tx.Commit(); err != nil {
791 log.Println("failed to commit transaction", err)
792 s.pages.Notice(w, "pull-comment", "Failed to create comment.")
793 return
794 }
795
796 s.notifier.NewPullComment(r.Context(), comment, mentions)
797
798 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f)
799 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d#comment-%d", ownerSlashRepo, pull.PullId, commentId))
800 return
801 }
802}
803
804func (s *Pulls) NewPull(w http.ResponseWriter, r *http.Request) {
805 user := s.oauth.GetUser(r)
806 f, err := s.repoResolver.Resolve(r)
807 if err != nil {
808 log.Println("failed to get repo and knot", err)
809 return
810 }
811
812 switch r.Method {
813 case http.MethodGet:
814 scheme := "http"
815 if !s.config.Core.Dev {
816 scheme = "https"
817 }
818 host := fmt.Sprintf("%s://%s", scheme, f.Knot)
819 xrpcc := &indigoxrpc.Client{
820 Host: host,
821 }
822
823 repo := fmt.Sprintf("%s/%s", f.Did, f.Name)
824 xrpcBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo)
825 if err != nil {
826 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {
827 log.Println("failed to call XRPC repo.branches", xrpcerr)
828 s.pages.Error503(w)
829 return
830 }
831 log.Println("failed to fetch branches", err)
832 return
833 }
834
835 var result types.RepoBranchesResponse
836 if err := json.Unmarshal(xrpcBytes, &result); err != nil {
837 log.Println("failed to decode XRPC response", err)
838 s.pages.Error503(w)
839 return
840 }
841
842 // can be one of "patch", "branch" or "fork"
843 strategy := r.URL.Query().Get("strategy")
844 // ignored if strategy is "patch"
845 sourceBranch := r.URL.Query().Get("sourceBranch")
846 targetBranch := r.URL.Query().Get("targetBranch")
847
848 s.pages.RepoNewPull(w, pages.RepoNewPullParams{
849 LoggedInUser: user,
850 RepoInfo: s.repoResolver.GetRepoInfo(r, user),
851 Branches: result.Branches,
852 Strategy: strategy,
853 SourceBranch: sourceBranch,
854 TargetBranch: targetBranch,
855 Title: r.URL.Query().Get("title"),
856 Body: r.URL.Query().Get("body"),
857 })
858
859 case http.MethodPost:
860 title := r.FormValue("title")
861 body := r.FormValue("body")
862 targetBranch := r.FormValue("targetBranch")
863 fromFork := r.FormValue("fork")
864 sourceBranch := r.FormValue("sourceBranch")
865 patch := r.FormValue("patch")
866
867 if targetBranch == "" {
868 s.pages.Notice(w, "pull", "Target branch is required.")
869 return
870 }
871
872 // Determine PR type based on input parameters
873 roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())}
874 isPushAllowed := roles.IsPushAllowed()
875 isBranchBased := isPushAllowed && sourceBranch != "" && fromFork == ""
876 isForkBased := fromFork != "" && sourceBranch != ""
877 isPatchBased := patch != "" && !isBranchBased && !isForkBased
878 isStacked := r.FormValue("isStacked") == "on"
879
880 if isPatchBased && !patchutil.IsFormatPatch(patch) {
881 if title == "" {
882 s.pages.Notice(w, "pull", "Title is required for git-diff patches.")
883 return
884 }
885 sanitizer := markup.NewSanitizer()
886 if st := strings.TrimSpace(sanitizer.SanitizeDescription(title)); (st) == "" {
887 s.pages.Notice(w, "pull", "Title is empty after HTML sanitization")
888 return
889 }
890 }
891
892 // Validate we have at least one valid PR creation method
893 if !isBranchBased && !isPatchBased && !isForkBased {
894 s.pages.Notice(w, "pull", "Neither source branch nor patch supplied.")
895 return
896 }
897
898 // Can't mix branch-based and patch-based approaches
899 if isBranchBased && patch != "" {
900 s.pages.Notice(w, "pull", "Cannot select both patch and source branch.")
901 return
902 }
903
904 // us, err := knotclient.NewUnsignedClient(f.Knot, s.config.Core.Dev)
905 // if err != nil {
906 // log.Printf("failed to create unsigned client to %s: %v", f.Knot, err)
907 // s.pages.Notice(w, "pull", "Failed to create a pull request. Try again later.")
908 // return
909 // }
910
911 // TODO: make capabilities an xrpc call
912 caps := struct {
913 PullRequests struct {
914 FormatPatch bool
915 BranchSubmissions bool
916 ForkSubmissions bool
917 PatchSubmissions bool
918 }
919 }{
920 PullRequests: struct {
921 FormatPatch bool
922 BranchSubmissions bool
923 ForkSubmissions bool
924 PatchSubmissions bool
925 }{
926 FormatPatch: true,
927 BranchSubmissions: true,
928 ForkSubmissions: true,
929 PatchSubmissions: true,
930 },
931 }
932
933 // caps, err := us.Capabilities()
934 // if err != nil {
935 // log.Println("error fetching knot caps", f.Knot, err)
936 // s.pages.Notice(w, "pull", "Failed to create a pull request. Try again later.")
937 // return
938 // }
939
940 if !caps.PullRequests.FormatPatch {
941 s.pages.Notice(w, "pull", "This knot doesn't support format-patch. Unfortunately, there is no fallback for now.")
942 return
943 }
944
945 // Handle the PR creation based on the type
946 if isBranchBased {
947 if !caps.PullRequests.BranchSubmissions {
948 s.pages.Notice(w, "pull", "This knot doesn't support branch-based pull requests. Try another way?")
949 return
950 }
951 s.handleBranchBasedPull(w, r, f, user, title, body, targetBranch, sourceBranch, isStacked)
952 } else if isForkBased {
953 if !caps.PullRequests.ForkSubmissions {
954 s.pages.Notice(w, "pull", "This knot doesn't support fork-based pull requests. Try another way?")
955 return
956 }
957 s.handleForkBasedPull(w, r, f, user, fromFork, title, body, targetBranch, sourceBranch, isStacked)
958 } else if isPatchBased {
959 if !caps.PullRequests.PatchSubmissions {
960 s.pages.Notice(w, "pull", "This knot doesn't support patch-based pull requests. Send your patch over email.")
961 return
962 }
963 s.handlePatchBasedPull(w, r, f, user, title, body, targetBranch, patch, isStacked)
964 }
965 return
966 }
967}
968
969func (s *Pulls) handleBranchBasedPull(
970 w http.ResponseWriter,
971 r *http.Request,
972 repo *models.Repo,
973 user *oauth.User,
974 title,
975 body,
976 targetBranch,
977 sourceBranch string,
978 isStacked bool,
979) {
980 scheme := "http"
981 if !s.config.Core.Dev {
982 scheme = "https"
983 }
984 host := fmt.Sprintf("%s://%s", scheme, repo.Knot)
985 xrpcc := &indigoxrpc.Client{
986 Host: host,
987 }
988
989 didSlashRepo := fmt.Sprintf("%s/%s", repo.Did, repo.Name)
990 xrpcBytes, err := tangled.RepoCompare(r.Context(), xrpcc, didSlashRepo, targetBranch, sourceBranch)
991 if err != nil {
992 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {
993 log.Println("failed to call XRPC repo.compare", xrpcerr)
994 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
995 return
996 }
997 log.Println("failed to compare", err)
998 s.pages.Notice(w, "pull", err.Error())
999 return
1000 }
1001
1002 var comparison types.RepoFormatPatchResponse
1003 if err := json.Unmarshal(xrpcBytes, &comparison); err != nil {
1004 log.Println("failed to decode XRPC compare response", err)
1005 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
1006 return
1007 }
1008
1009 sourceRev := comparison.Rev2
1010 patch := comparison.FormatPatchRaw
1011 combined := comparison.CombinedPatchRaw
1012
1013 if err := s.validator.ValidatePatch(&patch); err != nil {
1014 s.logger.Error("failed to validate patch", "err", err)
1015 s.pages.Notice(w, "pull", "Invalid patch format. Please provide a valid diff.")
1016 return
1017 }
1018
1019 pullSource := &models.PullSource{
1020 Branch: sourceBranch,
1021 }
1022 recordPullSource := &tangled.RepoPull_Source{
1023 Branch: sourceBranch,
1024 Sha: comparison.Rev2,
1025 }
1026
1027 s.createPullRequest(w, r, repo, user, title, body, targetBranch, patch, combined, sourceRev, pullSource, recordPullSource, isStacked)
1028}
1029
1030func (s *Pulls) handlePatchBasedPull(w http.ResponseWriter, r *http.Request, repo *models.Repo, user *oauth.User, title, body, targetBranch, patch string, isStacked bool) {
1031 if err := s.validator.ValidatePatch(&patch); err != nil {
1032 s.logger.Error("patch validation failed", "err", err)
1033 s.pages.Notice(w, "pull", "Invalid patch format. Please provide a valid diff.")
1034 return
1035 }
1036
1037 s.createPullRequest(w, r, repo, user, title, body, targetBranch, patch, "", "", nil, nil, isStacked)
1038}
1039
1040func (s *Pulls) handleForkBasedPull(w http.ResponseWriter, r *http.Request, repo *models.Repo, user *oauth.User, forkRepo string, title, body, targetBranch, sourceBranch string, isStacked bool) {
1041 repoString := strings.SplitN(forkRepo, "/", 2)
1042 forkOwnerDid := repoString[0]
1043 repoName := repoString[1]
1044 fork, err := db.GetForkByDid(s.db, forkOwnerDid, repoName)
1045 if errors.Is(err, sql.ErrNoRows) {
1046 s.pages.Notice(w, "pull", "No such fork.")
1047 return
1048 } else if err != nil {
1049 log.Println("failed to fetch fork:", err)
1050 s.pages.Notice(w, "pull", "Failed to fetch fork.")
1051 return
1052 }
1053
1054 client, err := s.oauth.ServiceClient(
1055 r,
1056 oauth.WithService(fork.Knot),
1057 oauth.WithLxm(tangled.RepoHiddenRefNSID),
1058 oauth.WithDev(s.config.Core.Dev),
1059 )
1060
1061 resp, err := tangled.RepoHiddenRef(
1062 r.Context(),
1063 client,
1064 &tangled.RepoHiddenRef_Input{
1065 ForkRef: sourceBranch,
1066 RemoteRef: targetBranch,
1067 Repo: fork.RepoAt().String(),
1068 },
1069 )
1070 if err := xrpcclient.HandleXrpcErr(err); err != nil {
1071 s.pages.Notice(w, "pull", err.Error())
1072 return
1073 }
1074
1075 if !resp.Success {
1076 errorMsg := "Failed to create pull request"
1077 if resp.Error != nil {
1078 errorMsg = fmt.Sprintf("Failed to create pull request: %s", *resp.Error)
1079 }
1080 s.pages.Notice(w, "pull", errorMsg)
1081 return
1082 }
1083
1084 hiddenRef := fmt.Sprintf("hidden/%s/%s", sourceBranch, targetBranch)
1085 // We're now comparing the sourceBranch (on the fork) against the hiddenRef which is tracking
1086 // the targetBranch on the target repository. This code is a bit confusing, but here's an example:
1087 // hiddenRef: hidden/feature-1/main (on repo-fork)
1088 // targetBranch: main (on repo-1)
1089 // sourceBranch: feature-1 (on repo-fork)
1090 forkScheme := "http"
1091 if !s.config.Core.Dev {
1092 forkScheme = "https"
1093 }
1094 forkHost := fmt.Sprintf("%s://%s", forkScheme, fork.Knot)
1095 forkXrpcc := &indigoxrpc.Client{
1096 Host: forkHost,
1097 }
1098
1099 forkRepoId := fmt.Sprintf("%s/%s", fork.Did, fork.Name)
1100 forkXrpcBytes, err := tangled.RepoCompare(r.Context(), forkXrpcc, forkRepoId, hiddenRef, sourceBranch)
1101 if err != nil {
1102 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {
1103 log.Println("failed to call XRPC repo.compare for fork", xrpcerr)
1104 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
1105 return
1106 }
1107 log.Println("failed to compare across branches", err)
1108 s.pages.Notice(w, "pull", err.Error())
1109 return
1110 }
1111
1112 var comparison types.RepoFormatPatchResponse
1113 if err := json.Unmarshal(forkXrpcBytes, &comparison); err != nil {
1114 log.Println("failed to decode XRPC compare response for fork", err)
1115 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
1116 return
1117 }
1118
1119 sourceRev := comparison.Rev2
1120 patch := comparison.FormatPatchRaw
1121 combined := comparison.CombinedPatchRaw
1122
1123 if err := s.validator.ValidatePatch(&patch); err != nil {
1124 s.logger.Error("failed to validate patch", "err", err)
1125 s.pages.Notice(w, "pull", "Invalid patch format. Please provide a valid diff.")
1126 return
1127 }
1128
1129 forkAtUri := fork.RepoAt()
1130 forkAtUriStr := forkAtUri.String()
1131
1132 pullSource := &models.PullSource{
1133 Branch: sourceBranch,
1134 RepoAt: &forkAtUri,
1135 }
1136 recordPullSource := &tangled.RepoPull_Source{
1137 Branch: sourceBranch,
1138 Repo: &forkAtUriStr,
1139 Sha: sourceRev,
1140 }
1141
1142 s.createPullRequest(w, r, repo, user, title, body, targetBranch, patch, combined, sourceRev, pullSource, recordPullSource, isStacked)
1143}
1144
1145func (s *Pulls) createPullRequest(
1146 w http.ResponseWriter,
1147 r *http.Request,
1148 repo *models.Repo,
1149 user *oauth.User,
1150 title, body, targetBranch string,
1151 patch string,
1152 combined string,
1153 sourceRev string,
1154 pullSource *models.PullSource,
1155 recordPullSource *tangled.RepoPull_Source,
1156 isStacked bool,
1157) {
1158 if isStacked {
1159 // creates a series of PRs, each linking to the previous, identified by jj's change-id
1160 s.createStackedPullRequest(
1161 w,
1162 r,
1163 repo,
1164 user,
1165 targetBranch,
1166 patch,
1167 sourceRev,
1168 pullSource,
1169 )
1170 return
1171 }
1172
1173 client, err := s.oauth.AuthorizedClient(r)
1174 if err != nil {
1175 log.Println("failed to get authorized client", err)
1176 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
1177 return
1178 }
1179
1180 tx, err := s.db.BeginTx(r.Context(), nil)
1181 if err != nil {
1182 log.Println("failed to start tx")
1183 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
1184 return
1185 }
1186 defer tx.Rollback()
1187
1188 // We've already checked earlier if it's diff-based and title is empty,
1189 // so if it's still empty now, it's intentionally skipped owing to format-patch.
1190 if title == "" || body == "" {
1191 formatPatches, err := patchutil.ExtractPatches(patch)
1192 if err != nil {
1193 s.pages.Notice(w, "pull", fmt.Sprintf("Failed to extract patches: %v", err))
1194 return
1195 }
1196 if len(formatPatches) == 0 {
1197 s.pages.Notice(w, "pull", "No patches found in the supplied format-patch.")
1198 return
1199 }
1200
1201 if title == "" {
1202 title = formatPatches[0].Title
1203 }
1204 if body == "" {
1205 body = formatPatches[0].Body
1206 }
1207 }
1208
1209 mentions, references := s.mentionsResolver.Resolve(r.Context(), body)
1210
1211 rkey := tid.TID()
1212 initialSubmission := models.PullSubmission{
1213 Patch: patch,
1214 Combined: combined,
1215 SourceRev: sourceRev,
1216 }
1217 pull := &models.Pull{
1218 Title: title,
1219 Body: body,
1220 TargetBranch: targetBranch,
1221 OwnerDid: user.Did,
1222 RepoAt: repo.RepoAt(),
1223 Rkey: rkey,
1224 Mentions: mentions,
1225 References: references,
1226 Submissions: []*models.PullSubmission{
1227 &initialSubmission,
1228 },
1229 PullSource: pullSource,
1230 }
1231 err = db.NewPull(tx, pull)
1232 if err != nil {
1233 log.Println("failed to create pull request", err)
1234 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
1235 return
1236 }
1237 pullId, err := db.NextPullId(tx, repo.RepoAt())
1238 if err != nil {
1239 log.Println("failed to get pull id", err)
1240 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
1241 return
1242 }
1243
1244 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{
1245 Collection: tangled.RepoPullNSID,
1246 Repo: user.Did,
1247 Rkey: rkey,
1248 Record: &lexutil.LexiconTypeDecoder{
1249 Val: &tangled.RepoPull{
1250 Title: title,
1251 Target: &tangled.RepoPull_Target{
1252 Repo: string(repo.RepoAt()),
1253 Branch: targetBranch,
1254 },
1255 Patch: patch,
1256 Source: recordPullSource,
1257 CreatedAt: time.Now().Format(time.RFC3339),
1258 },
1259 },
1260 })
1261 if err != nil {
1262 log.Println("failed to create pull request", err)
1263 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
1264 return
1265 }
1266
1267 if err = tx.Commit(); err != nil {
1268 log.Println("failed to create pull request", err)
1269 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
1270 return
1271 }
1272
1273 s.notifier.NewPull(r.Context(), pull)
1274
1275 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, repo)
1276 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", ownerSlashRepo, pullId))
1277}
1278
1279func (s *Pulls) createStackedPullRequest(
1280 w http.ResponseWriter,
1281 r *http.Request,
1282 repo *models.Repo,
1283 user *oauth.User,
1284 targetBranch string,
1285 patch string,
1286 sourceRev string,
1287 pullSource *models.PullSource,
1288) {
1289 // run some necessary checks for stacked-prs first
1290
1291 // must be branch or fork based
1292 if sourceRev == "" {
1293 log.Println("stacked PR from patch-based pull")
1294 s.pages.Notice(w, "pull", "Stacking is only supported on branch and fork based pull-requests.")
1295 return
1296 }
1297
1298 formatPatches, err := patchutil.ExtractPatches(patch)
1299 if err != nil {
1300 log.Println("failed to extract patches", err)
1301 s.pages.Notice(w, "pull", fmt.Sprintf("Failed to extract patches: %v", err))
1302 return
1303 }
1304
1305 // must have atleast 1 patch to begin with
1306 if len(formatPatches) == 0 {
1307 log.Println("empty patches")
1308 s.pages.Notice(w, "pull", "No patches found in the generated format-patch.")
1309 return
1310 }
1311
1312 // build a stack out of this patch
1313 stackId := uuid.New()
1314 stack, err := s.newStack(r.Context(), repo, user, targetBranch, patch, pullSource, stackId.String())
1315 if err != nil {
1316 log.Println("failed to create stack", err)
1317 s.pages.Notice(w, "pull", fmt.Sprintf("Failed to create stack: %v", err))
1318 return
1319 }
1320
1321 client, err := s.oauth.AuthorizedClient(r)
1322 if err != nil {
1323 log.Println("failed to get authorized client", err)
1324 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
1325 return
1326 }
1327
1328 // apply all record creations at once
1329 var writes []*comatproto.RepoApplyWrites_Input_Writes_Elem
1330 for _, p := range stack {
1331 record := p.AsRecord()
1332 write := comatproto.RepoApplyWrites_Input_Writes_Elem{
1333 RepoApplyWrites_Create: &comatproto.RepoApplyWrites_Create{
1334 Collection: tangled.RepoPullNSID,
1335 Rkey: &p.Rkey,
1336 Value: &lexutil.LexiconTypeDecoder{
1337 Val: &record,
1338 },
1339 },
1340 }
1341 writes = append(writes, &write)
1342 }
1343 _, err = comatproto.RepoApplyWrites(r.Context(), client, &comatproto.RepoApplyWrites_Input{
1344 Repo: user.Did,
1345 Writes: writes,
1346 })
1347 if err != nil {
1348 log.Println("failed to create stacked pull request", err)
1349 s.pages.Notice(w, "pull", "Failed to create stacked pull request. Try again later.")
1350 return
1351 }
1352
1353 // create all pulls at once
1354 tx, err := s.db.BeginTx(r.Context(), nil)
1355 if err != nil {
1356 log.Println("failed to start tx")
1357 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
1358 return
1359 }
1360 defer tx.Rollback()
1361
1362 for _, p := range stack {
1363 err = db.NewPull(tx, p)
1364 if err != nil {
1365 log.Println("failed to create pull request", err)
1366 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
1367 return
1368 }
1369 }
1370
1371 if err = tx.Commit(); err != nil {
1372 log.Println("failed to create pull request", err)
1373 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
1374 return
1375 }
1376
1377 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, repo)
1378 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls", ownerSlashRepo))
1379}
1380
1381func (s *Pulls) ValidatePatch(w http.ResponseWriter, r *http.Request) {
1382 _, err := s.repoResolver.Resolve(r)
1383 if err != nil {
1384 log.Println("failed to get repo and knot", err)
1385 return
1386 }
1387
1388 patch := r.FormValue("patch")
1389 if patch == "" {
1390 s.pages.Notice(w, "patch-error", "Patch is required.")
1391 return
1392 }
1393
1394 if err := s.validator.ValidatePatch(&patch); err != nil {
1395 s.logger.Error("faield to validate patch", "err", err)
1396 s.pages.Notice(w, "patch-error", "Invalid patch format. Please provide a valid git diff or format-patch.")
1397 return
1398 }
1399
1400 if patchutil.IsFormatPatch(patch) {
1401 s.pages.Notice(w, "patch-preview", "git-format-patch detected. Title and description are optional; if left out, they will be extracted from the first commit.")
1402 } else {
1403 s.pages.Notice(w, "patch-preview", "Regular git-diff detected. Please provide a title and description.")
1404 }
1405}
1406
1407func (s *Pulls) PatchUploadFragment(w http.ResponseWriter, r *http.Request) {
1408 user := s.oauth.GetUser(r)
1409
1410 s.pages.PullPatchUploadFragment(w, pages.PullPatchUploadParams{
1411 RepoInfo: s.repoResolver.GetRepoInfo(r, user),
1412 })
1413}
1414
1415func (s *Pulls) CompareBranchesFragment(w http.ResponseWriter, r *http.Request) {
1416 user := s.oauth.GetUser(r)
1417 f, err := s.repoResolver.Resolve(r)
1418 if err != nil {
1419 log.Println("failed to get repo and knot", err)
1420 return
1421 }
1422
1423 scheme := "http"
1424 if !s.config.Core.Dev {
1425 scheme = "https"
1426 }
1427 host := fmt.Sprintf("%s://%s", scheme, f.Knot)
1428 xrpcc := &indigoxrpc.Client{
1429 Host: host,
1430 }
1431
1432 repo := fmt.Sprintf("%s/%s", f.Did, f.Name)
1433 xrpcBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo)
1434 if err != nil {
1435 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {
1436 log.Println("failed to call XRPC repo.branches", xrpcerr)
1437 s.pages.Error503(w)
1438 return
1439 }
1440 log.Println("failed to fetch branches", err)
1441 return
1442 }
1443
1444 var result types.RepoBranchesResponse
1445 if err := json.Unmarshal(xrpcBytes, &result); err != nil {
1446 log.Println("failed to decode XRPC response", err)
1447 s.pages.Error503(w)
1448 return
1449 }
1450
1451 branches := result.Branches
1452 sort.Slice(branches, func(i int, j int) bool {
1453 return branches[i].Commit.Committer.When.After(branches[j].Commit.Committer.When)
1454 })
1455
1456 withoutDefault := []types.Branch{}
1457 for _, b := range branches {
1458 if b.IsDefault {
1459 continue
1460 }
1461 withoutDefault = append(withoutDefault, b)
1462 }
1463
1464 s.pages.PullCompareBranchesFragment(w, pages.PullCompareBranchesParams{
1465 RepoInfo: s.repoResolver.GetRepoInfo(r, user),
1466 Branches: withoutDefault,
1467 })
1468}
1469
1470func (s *Pulls) CompareForksFragment(w http.ResponseWriter, r *http.Request) {
1471 user := s.oauth.GetUser(r)
1472
1473 forks, err := db.GetForksByDid(s.db, user.Did)
1474 if err != nil {
1475 log.Println("failed to get forks", err)
1476 return
1477 }
1478
1479 s.pages.PullCompareForkFragment(w, pages.PullCompareForkParams{
1480 RepoInfo: s.repoResolver.GetRepoInfo(r, user),
1481 Forks: forks,
1482 Selected: r.URL.Query().Get("fork"),
1483 })
1484}
1485
1486func (s *Pulls) CompareForksBranchesFragment(w http.ResponseWriter, r *http.Request) {
1487 user := s.oauth.GetUser(r)
1488
1489 f, err := s.repoResolver.Resolve(r)
1490 if err != nil {
1491 log.Println("failed to get repo and knot", err)
1492 return
1493 }
1494
1495 forkVal := r.URL.Query().Get("fork")
1496 repoString := strings.SplitN(forkVal, "/", 2)
1497 forkOwnerDid := repoString[0]
1498 forkName := repoString[1]
1499 // fork repo
1500 repo, err := db.GetRepo(
1501 s.db,
1502 orm.FilterEq("did", forkOwnerDid),
1503 orm.FilterEq("name", forkName),
1504 )
1505 if err != nil {
1506 log.Println("failed to get repo", "did", forkOwnerDid, "name", forkName, "err", err)
1507 return
1508 }
1509
1510 sourceScheme := "http"
1511 if !s.config.Core.Dev {
1512 sourceScheme = "https"
1513 }
1514 sourceHost := fmt.Sprintf("%s://%s", sourceScheme, repo.Knot)
1515 sourceXrpcc := &indigoxrpc.Client{
1516 Host: sourceHost,
1517 }
1518
1519 sourceRepo := fmt.Sprintf("%s/%s", forkOwnerDid, repo.Name)
1520 sourceXrpcBytes, err := tangled.RepoBranches(r.Context(), sourceXrpcc, "", 0, sourceRepo)
1521 if err != nil {
1522 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {
1523 log.Println("failed to call XRPC repo.branches for source", xrpcerr)
1524 s.pages.Error503(w)
1525 return
1526 }
1527 log.Println("failed to fetch source branches", err)
1528 return
1529 }
1530
1531 // Decode source branches
1532 var sourceBranches types.RepoBranchesResponse
1533 if err := json.Unmarshal(sourceXrpcBytes, &sourceBranches); err != nil {
1534 log.Println("failed to decode source branches XRPC response", err)
1535 s.pages.Error503(w)
1536 return
1537 }
1538
1539 targetScheme := "http"
1540 if !s.config.Core.Dev {
1541 targetScheme = "https"
1542 }
1543 targetHost := fmt.Sprintf("%s://%s", targetScheme, f.Knot)
1544 targetXrpcc := &indigoxrpc.Client{
1545 Host: targetHost,
1546 }
1547
1548 targetRepo := fmt.Sprintf("%s/%s", f.Did, f.Name)
1549 targetXrpcBytes, err := tangled.RepoBranches(r.Context(), targetXrpcc, "", 0, targetRepo)
1550 if err != nil {
1551 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {
1552 log.Println("failed to call XRPC repo.branches for target", xrpcerr)
1553 s.pages.Error503(w)
1554 return
1555 }
1556 log.Println("failed to fetch target branches", err)
1557 return
1558 }
1559
1560 // Decode target branches
1561 var targetBranches types.RepoBranchesResponse
1562 if err := json.Unmarshal(targetXrpcBytes, &targetBranches); err != nil {
1563 log.Println("failed to decode target branches XRPC response", err)
1564 s.pages.Error503(w)
1565 return
1566 }
1567
1568 sort.Slice(sourceBranches.Branches, func(i int, j int) bool {
1569 return sourceBranches.Branches[i].Commit.Committer.When.After(sourceBranches.Branches[j].Commit.Committer.When)
1570 })
1571
1572 s.pages.PullCompareForkBranchesFragment(w, pages.PullCompareForkBranchesParams{
1573 RepoInfo: s.repoResolver.GetRepoInfo(r, user),
1574 SourceBranches: sourceBranches.Branches,
1575 TargetBranches: targetBranches.Branches,
1576 })
1577}
1578
1579func (s *Pulls) ResubmitPull(w http.ResponseWriter, r *http.Request) {
1580 user := s.oauth.GetUser(r)
1581
1582 pull, ok := r.Context().Value("pull").(*models.Pull)
1583 if !ok {
1584 log.Println("failed to get pull")
1585 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
1586 return
1587 }
1588
1589 switch r.Method {
1590 case http.MethodGet:
1591 s.pages.PullResubmitFragment(w, pages.PullResubmitParams{
1592 RepoInfo: s.repoResolver.GetRepoInfo(r, user),
1593 Pull: pull,
1594 })
1595 return
1596 case http.MethodPost:
1597 if pull.IsPatchBased() {
1598 s.resubmitPatch(w, r)
1599 return
1600 } else if pull.IsBranchBased() {
1601 s.resubmitBranch(w, r)
1602 return
1603 } else if pull.IsForkBased() {
1604 s.resubmitFork(w, r)
1605 return
1606 }
1607 }
1608}
1609
1610func (s *Pulls) resubmitPatch(w http.ResponseWriter, r *http.Request) {
1611 user := s.oauth.GetUser(r)
1612
1613 pull, ok := r.Context().Value("pull").(*models.Pull)
1614 if !ok {
1615 log.Println("failed to get pull")
1616 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
1617 return
1618 }
1619
1620 f, err := s.repoResolver.Resolve(r)
1621 if err != nil {
1622 log.Println("failed to get repo and knot", err)
1623 return
1624 }
1625
1626 if user.Did != pull.OwnerDid {
1627 log.Println("unauthorized user")
1628 w.WriteHeader(http.StatusUnauthorized)
1629 return
1630 }
1631
1632 patch := r.FormValue("patch")
1633
1634 s.resubmitPullHelper(w, r, f, user, pull, patch, "", "")
1635}
1636
1637func (s *Pulls) resubmitBranch(w http.ResponseWriter, r *http.Request) {
1638 user := s.oauth.GetUser(r)
1639
1640 pull, ok := r.Context().Value("pull").(*models.Pull)
1641 if !ok {
1642 log.Println("failed to get pull")
1643 s.pages.Notice(w, "resubmit-error", "Failed to edit patch. Try again later.")
1644 return
1645 }
1646
1647 f, err := s.repoResolver.Resolve(r)
1648 if err != nil {
1649 log.Println("failed to get repo and knot", err)
1650 return
1651 }
1652
1653 if user.Did != pull.OwnerDid {
1654 log.Println("unauthorized user")
1655 w.WriteHeader(http.StatusUnauthorized)
1656 return
1657 }
1658
1659 roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())}
1660 if !roles.IsPushAllowed() {
1661 log.Println("unauthorized user")
1662 w.WriteHeader(http.StatusUnauthorized)
1663 return
1664 }
1665
1666 scheme := "http"
1667 if !s.config.Core.Dev {
1668 scheme = "https"
1669 }
1670 host := fmt.Sprintf("%s://%s", scheme, f.Knot)
1671 xrpcc := &indigoxrpc.Client{
1672 Host: host,
1673 }
1674
1675 repo := fmt.Sprintf("%s/%s", f.Did, f.Name)
1676 xrpcBytes, err := tangled.RepoCompare(r.Context(), xrpcc, repo, pull.TargetBranch, pull.PullSource.Branch)
1677 if err != nil {
1678 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {
1679 log.Println("failed to call XRPC repo.compare", xrpcerr)
1680 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1681 return
1682 }
1683 log.Printf("compare request failed: %s", err)
1684 s.pages.Notice(w, "resubmit-error", err.Error())
1685 return
1686 }
1687
1688 var comparison types.RepoFormatPatchResponse
1689 if err := json.Unmarshal(xrpcBytes, &comparison); err != nil {
1690 log.Println("failed to decode XRPC compare response", err)
1691 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1692 return
1693 }
1694
1695 sourceRev := comparison.Rev2
1696 patch := comparison.FormatPatchRaw
1697 combined := comparison.CombinedPatchRaw
1698
1699 s.resubmitPullHelper(w, r, f, user, pull, patch, combined, sourceRev)
1700}
1701
1702func (s *Pulls) resubmitFork(w http.ResponseWriter, r *http.Request) {
1703 user := s.oauth.GetUser(r)
1704
1705 pull, ok := r.Context().Value("pull").(*models.Pull)
1706 if !ok {
1707 log.Println("failed to get pull")
1708 s.pages.Notice(w, "resubmit-error", "Failed to edit patch. Try again later.")
1709 return
1710 }
1711
1712 f, err := s.repoResolver.Resolve(r)
1713 if err != nil {
1714 log.Println("failed to get repo and knot", err)
1715 return
1716 }
1717
1718 if user.Did != pull.OwnerDid {
1719 log.Println("unauthorized user")
1720 w.WriteHeader(http.StatusUnauthorized)
1721 return
1722 }
1723
1724 forkRepo, err := db.GetRepoByAtUri(s.db, pull.PullSource.RepoAt.String())
1725 if err != nil {
1726 log.Println("failed to get source repo", err)
1727 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1728 return
1729 }
1730
1731 // update the hidden tracking branch to latest
1732 client, err := s.oauth.ServiceClient(
1733 r,
1734 oauth.WithService(forkRepo.Knot),
1735 oauth.WithLxm(tangled.RepoHiddenRefNSID),
1736 oauth.WithDev(s.config.Core.Dev),
1737 )
1738 if err != nil {
1739 log.Printf("failed to connect to knot server: %v", err)
1740 return
1741 }
1742
1743 resp, err := tangled.RepoHiddenRef(
1744 r.Context(),
1745 client,
1746 &tangled.RepoHiddenRef_Input{
1747 ForkRef: pull.PullSource.Branch,
1748 RemoteRef: pull.TargetBranch,
1749 Repo: forkRepo.RepoAt().String(),
1750 },
1751 )
1752 if err := xrpcclient.HandleXrpcErr(err); err != nil {
1753 s.pages.Notice(w, "resubmit-error", err.Error())
1754 return
1755 }
1756 if !resp.Success {
1757 log.Println("Failed to update tracking ref.", "err", resp.Error)
1758 s.pages.Notice(w, "resubmit-error", "Failed to update tracking ref.")
1759 return
1760 }
1761
1762 hiddenRef := fmt.Sprintf("hidden/%s/%s", pull.PullSource.Branch, pull.TargetBranch)
1763 // extract patch by performing compare
1764 forkScheme := "http"
1765 if !s.config.Core.Dev {
1766 forkScheme = "https"
1767 }
1768 forkHost := fmt.Sprintf("%s://%s", forkScheme, forkRepo.Knot)
1769 forkRepoId := fmt.Sprintf("%s/%s", forkRepo.Did, forkRepo.Name)
1770 forkXrpcBytes, err := tangled.RepoCompare(r.Context(), &indigoxrpc.Client{Host: forkHost}, forkRepoId, hiddenRef, pull.PullSource.Branch)
1771 if err != nil {
1772 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {
1773 log.Println("failed to call XRPC repo.compare for fork", xrpcerr)
1774 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1775 return
1776 }
1777 log.Printf("failed to compare branches: %s", err)
1778 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1779 return
1780 }
1781
1782 var forkComparison types.RepoFormatPatchResponse
1783 if err := json.Unmarshal(forkXrpcBytes, &forkComparison); err != nil {
1784 log.Println("failed to decode XRPC compare response for fork", err)
1785 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1786 return
1787 }
1788
1789 // Use the fork comparison we already made
1790 comparison := forkComparison
1791
1792 sourceRev := comparison.Rev2
1793 patch := comparison.FormatPatchRaw
1794 combined := comparison.CombinedPatchRaw
1795
1796 s.resubmitPullHelper(w, r, f, user, pull, patch, combined, sourceRev)
1797}
1798
1799func (s *Pulls) resubmitPullHelper(
1800 w http.ResponseWriter,
1801 r *http.Request,
1802 repo *models.Repo,
1803 user *oauth.User,
1804 pull *models.Pull,
1805 patch string,
1806 combined string,
1807 sourceRev string,
1808) {
1809 if pull.IsStacked() {
1810 log.Println("resubmitting stacked PR")
1811 s.resubmitStackedPullHelper(w, r, repo, user, pull, patch, pull.StackId)
1812 return
1813 }
1814
1815 if err := s.validator.ValidatePatch(&patch); err != nil {
1816 s.pages.Notice(w, "resubmit-error", err.Error())
1817 return
1818 }
1819
1820 if patch == pull.LatestPatch() {
1821 s.pages.Notice(w, "resubmit-error", "Patch is identical to previous submission.")
1822 return
1823 }
1824
1825 // validate sourceRev if branch/fork based
1826 if pull.IsBranchBased() || pull.IsForkBased() {
1827 if sourceRev == pull.LatestSha() {
1828 s.pages.Notice(w, "resubmit-error", "This branch has not changed since the last submission.")
1829 return
1830 }
1831 }
1832
1833 tx, err := s.db.BeginTx(r.Context(), nil)
1834 if err != nil {
1835 log.Println("failed to start tx")
1836 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1837 return
1838 }
1839 defer tx.Rollback()
1840
1841 pullAt := pull.AtUri()
1842 newRoundNumber := len(pull.Submissions)
1843 newPatch := patch
1844 newSourceRev := sourceRev
1845 combinedPatch := combined
1846 err = db.ResubmitPull(tx, pullAt, newRoundNumber, newPatch, combinedPatch, newSourceRev)
1847 if err != nil {
1848 log.Println("failed to create pull request", err)
1849 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1850 return
1851 }
1852 client, err := s.oauth.AuthorizedClient(r)
1853 if err != nil {
1854 log.Println("failed to authorize client")
1855 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1856 return
1857 }
1858
1859 ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey)
1860 if err != nil {
1861 // failed to get record
1862 s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.")
1863 return
1864 }
1865
1866 var recordPullSource *tangled.RepoPull_Source
1867 if pull.IsBranchBased() {
1868 recordPullSource = &tangled.RepoPull_Source{
1869 Branch: pull.PullSource.Branch,
1870 Sha: sourceRev,
1871 }
1872 }
1873 if pull.IsForkBased() {
1874 repoAt := pull.PullSource.RepoAt.String()
1875 recordPullSource = &tangled.RepoPull_Source{
1876 Branch: pull.PullSource.Branch,
1877 Repo: &repoAt,
1878 Sha: sourceRev,
1879 }
1880 }
1881
1882 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{
1883 Collection: tangled.RepoPullNSID,
1884 Repo: user.Did,
1885 Rkey: pull.Rkey,
1886 SwapRecord: ex.Cid,
1887 Record: &lexutil.LexiconTypeDecoder{
1888 Val: &tangled.RepoPull{
1889 Title: pull.Title,
1890 Target: &tangled.RepoPull_Target{
1891 Repo: string(repo.RepoAt()),
1892 Branch: pull.TargetBranch,
1893 },
1894 Patch: patch, // new patch
1895 Source: recordPullSource,
1896 CreatedAt: time.Now().Format(time.RFC3339),
1897 },
1898 },
1899 })
1900 if err != nil {
1901 log.Println("failed to update record", err)
1902 s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.")
1903 return
1904 }
1905
1906 if err = tx.Commit(); err != nil {
1907 log.Println("failed to commit transaction", err)
1908 s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull.")
1909 return
1910 }
1911
1912 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, repo)
1913 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", ownerSlashRepo, pull.PullId))
1914}
1915
1916func (s *Pulls) resubmitStackedPullHelper(
1917 w http.ResponseWriter,
1918 r *http.Request,
1919 repo *models.Repo,
1920 user *oauth.User,
1921 pull *models.Pull,
1922 patch string,
1923 stackId string,
1924) {
1925 targetBranch := pull.TargetBranch
1926
1927 origStack, _ := r.Context().Value("stack").(models.Stack)
1928 newStack, err := s.newStack(r.Context(), repo, user, targetBranch, patch, pull.PullSource, stackId)
1929 if err != nil {
1930 log.Println("failed to create resubmitted stack", err)
1931 s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.")
1932 return
1933 }
1934
1935 // find the diff between the stacks, first, map them by changeId
1936 origById := make(map[string]*models.Pull)
1937 newById := make(map[string]*models.Pull)
1938 for _, p := range origStack {
1939 origById[p.ChangeId] = p
1940 }
1941 for _, p := range newStack {
1942 newById[p.ChangeId] = p
1943 }
1944
1945 // commits that got deleted: corresponding pull is closed
1946 // commits that got added: new pull is created
1947 // commits that got updated: corresponding pull is resubmitted & new round begins
1948 additions := make(map[string]*models.Pull)
1949 deletions := make(map[string]*models.Pull)
1950 updated := make(map[string]struct{})
1951
1952 // pulls in orignal stack but not in new one
1953 for _, op := range origStack {
1954 if _, ok := newById[op.ChangeId]; !ok {
1955 deletions[op.ChangeId] = op
1956 }
1957 }
1958
1959 // pulls in new stack but not in original one
1960 for _, np := range newStack {
1961 if _, ok := origById[np.ChangeId]; !ok {
1962 additions[np.ChangeId] = np
1963 }
1964 }
1965
1966 // NOTE: this loop can be written in any of above blocks,
1967 // but is written separately in the interest of simpler code
1968 for _, np := range newStack {
1969 if op, ok := origById[np.ChangeId]; ok {
1970 // pull exists in both stacks
1971 updated[op.ChangeId] = struct{}{}
1972 }
1973 }
1974
1975 tx, err := s.db.Begin()
1976 if err != nil {
1977 log.Println("failed to start transaction", err)
1978 s.pages.Notice(w, "pull-resubmit-error", "Failed to resubmit pull request. Try again later.")
1979 return
1980 }
1981 defer tx.Rollback()
1982
1983 // pds updates to make
1984 var writes []*comatproto.RepoApplyWrites_Input_Writes_Elem
1985
1986 // deleted pulls are marked as deleted in the DB
1987 for _, p := range deletions {
1988 // do not do delete already merged PRs
1989 if p.State == models.PullMerged {
1990 continue
1991 }
1992
1993 err := db.DeletePull(tx, p.RepoAt, p.PullId)
1994 if err != nil {
1995 log.Println("failed to delete pull", err, p.PullId)
1996 s.pages.Notice(w, "pull-resubmit-error", "Failed to resubmit pull request. Try again later.")
1997 return
1998 }
1999 writes = append(writes, &comatproto.RepoApplyWrites_Input_Writes_Elem{
2000 RepoApplyWrites_Delete: &comatproto.RepoApplyWrites_Delete{
2001 Collection: tangled.RepoPullNSID,
2002 Rkey: p.Rkey,
2003 },
2004 })
2005 }
2006
2007 // new pulls are created
2008 for _, p := range additions {
2009 err := db.NewPull(tx, p)
2010 if err != nil {
2011 log.Println("failed to create pull", err, p.PullId)
2012 s.pages.Notice(w, "pull-resubmit-error", "Failed to resubmit pull request. Try again later.")
2013 return
2014 }
2015
2016 record := p.AsRecord()
2017 writes = append(writes, &comatproto.RepoApplyWrites_Input_Writes_Elem{
2018 RepoApplyWrites_Create: &comatproto.RepoApplyWrites_Create{
2019 Collection: tangled.RepoPullNSID,
2020 Rkey: &p.Rkey,
2021 Value: &lexutil.LexiconTypeDecoder{
2022 Val: &record,
2023 },
2024 },
2025 })
2026 }
2027
2028 // updated pulls are, well, updated; to start a new round
2029 for id := range updated {
2030 op, _ := origById[id]
2031 np, _ := newById[id]
2032
2033 // do not update already merged PRs
2034 if op.State == models.PullMerged {
2035 continue
2036 }
2037
2038 // resubmit the new pull
2039 pullAt := op.AtUri()
2040 newRoundNumber := len(op.Submissions)
2041 newPatch := np.LatestPatch()
2042 combinedPatch := np.LatestSubmission().Combined
2043 newSourceRev := np.LatestSha()
2044 err := db.ResubmitPull(tx, pullAt, newRoundNumber, newPatch, combinedPatch, newSourceRev)
2045 if err != nil {
2046 log.Println("failed to update pull", err, op.PullId)
2047 s.pages.Notice(w, "pull-resubmit-error", "Failed to resubmit pull request. Try again later.")
2048 return
2049 }
2050
2051 record := np.AsRecord()
2052
2053 writes = append(writes, &comatproto.RepoApplyWrites_Input_Writes_Elem{
2054 RepoApplyWrites_Update: &comatproto.RepoApplyWrites_Update{
2055 Collection: tangled.RepoPullNSID,
2056 Rkey: op.Rkey,
2057 Value: &lexutil.LexiconTypeDecoder{
2058 Val: &record,
2059 },
2060 },
2061 })
2062 }
2063
2064 // update parent-change-id relations for the entire stack
2065 for _, p := range newStack {
2066 err := db.SetPullParentChangeId(
2067 tx,
2068 p.ParentChangeId,
2069 // these should be enough filters to be unique per-stack
2070 orm.FilterEq("repo_at", p.RepoAt.String()),
2071 orm.FilterEq("owner_did", p.OwnerDid),
2072 orm.FilterEq("change_id", p.ChangeId),
2073 )
2074
2075 if err != nil {
2076 log.Println("failed to update pull", err, p.PullId)
2077 s.pages.Notice(w, "pull-resubmit-error", "Failed to resubmit pull request. Try again later.")
2078 return
2079 }
2080 }
2081
2082 err = tx.Commit()
2083 if err != nil {
2084 log.Println("failed to resubmit pull", err)
2085 s.pages.Notice(w, "pull-resubmit-error", "Failed to resubmit pull request. Try again later.")
2086 return
2087 }
2088
2089 client, err := s.oauth.AuthorizedClient(r)
2090 if err != nil {
2091 log.Println("failed to authorize client")
2092 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
2093 return
2094 }
2095
2096 _, err = comatproto.RepoApplyWrites(r.Context(), client, &comatproto.RepoApplyWrites_Input{
2097 Repo: user.Did,
2098 Writes: writes,
2099 })
2100 if err != nil {
2101 log.Println("failed to create stacked pull request", err)
2102 s.pages.Notice(w, "pull", "Failed to create stacked pull request. Try again later.")
2103 return
2104 }
2105
2106 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, repo)
2107 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", ownerSlashRepo, pull.PullId))
2108}
2109
2110func (s *Pulls) MergePull(w http.ResponseWriter, r *http.Request) {
2111 user := s.oauth.GetUser(r)
2112 f, err := s.repoResolver.Resolve(r)
2113 if err != nil {
2114 log.Println("failed to resolve repo:", err)
2115 s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.")
2116 return
2117 }
2118
2119 pull, ok := r.Context().Value("pull").(*models.Pull)
2120 if !ok {
2121 log.Println("failed to get pull")
2122 s.pages.Notice(w, "pull-merge-error", "Failed to merge patch. Try again later.")
2123 return
2124 }
2125
2126 var pullsToMerge models.Stack
2127 pullsToMerge = append(pullsToMerge, pull)
2128 if pull.IsStacked() {
2129 stack, ok := r.Context().Value("stack").(models.Stack)
2130 if !ok {
2131 log.Println("failed to get stack")
2132 s.pages.Notice(w, "pull-merge-error", "Failed to merge patch. Try again later.")
2133 return
2134 }
2135
2136 // combine patches of substack
2137 subStack := stack.StrictlyBelow(pull)
2138 // collect the portion of the stack that is mergeable
2139 mergeable := subStack.Mergeable()
2140 // add to total patch
2141 pullsToMerge = append(pullsToMerge, mergeable...)
2142 }
2143
2144 patch := pullsToMerge.CombinedPatch()
2145
2146 ident, err := s.idResolver.ResolveIdent(r.Context(), pull.OwnerDid)
2147 if err != nil {
2148 log.Printf("resolving identity: %s", err)
2149 w.WriteHeader(http.StatusNotFound)
2150 return
2151 }
2152
2153 email, err := db.GetPrimaryEmail(s.db, pull.OwnerDid)
2154 if err != nil {
2155 log.Printf("failed to get primary email: %s", err)
2156 }
2157
2158 authorName := ident.Handle.String()
2159 mergeInput := &tangled.RepoMerge_Input{
2160 Did: f.Did,
2161 Name: f.Name,
2162 Branch: pull.TargetBranch,
2163 Patch: patch,
2164 CommitMessage: &pull.Title,
2165 AuthorName: &authorName,
2166 }
2167
2168 if pull.Body != "" {
2169 mergeInput.CommitBody = &pull.Body
2170 }
2171
2172 if email.Address != "" {
2173 mergeInput.AuthorEmail = &email.Address
2174 }
2175
2176 client, err := s.oauth.ServiceClient(
2177 r,
2178 oauth.WithService(f.Knot),
2179 oauth.WithLxm(tangled.RepoMergeNSID),
2180 oauth.WithDev(s.config.Core.Dev),
2181 )
2182 if err != nil {
2183 log.Printf("failed to connect to knot server: %v", err)
2184 s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.")
2185 return
2186 }
2187
2188 err = tangled.RepoMerge(r.Context(), client, mergeInput)
2189 if err := xrpcclient.HandleXrpcErr(err); err != nil {
2190 s.pages.Notice(w, "pull-merge-error", err.Error())
2191 return
2192 }
2193
2194 tx, err := s.db.Begin()
2195 if err != nil {
2196 log.Println("failed to start transcation", err)
2197 s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.")
2198 return
2199 }
2200 defer tx.Rollback()
2201
2202 for _, p := range pullsToMerge {
2203 err := db.MergePull(tx, f.RepoAt(), p.PullId)
2204 if err != nil {
2205 log.Printf("failed to update pull request status in database: %s", err)
2206 s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.")
2207 return
2208 }
2209 p.State = models.PullMerged
2210 }
2211
2212 err = tx.Commit()
2213 if err != nil {
2214 // TODO: this is unsound, we should also revert the merge from the knotserver here
2215 log.Printf("failed to update pull request status in database: %s", err)
2216 s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.")
2217 return
2218 }
2219
2220 // notify about the pull merge
2221 for _, p := range pullsToMerge {
2222 s.notifier.NewPullState(r.Context(), syntax.DID(user.Did), p)
2223 }
2224
2225 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f)
2226 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", ownerSlashRepo, pull.PullId))
2227}
2228
2229func (s *Pulls) ClosePull(w http.ResponseWriter, r *http.Request) {
2230 user := s.oauth.GetUser(r)
2231
2232 f, err := s.repoResolver.Resolve(r)
2233 if err != nil {
2234 log.Println("malformed middleware")
2235 return
2236 }
2237
2238 pull, ok := r.Context().Value("pull").(*models.Pull)
2239 if !ok {
2240 log.Println("failed to get pull")
2241 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
2242 return
2243 }
2244
2245 // auth filter: only owner or collaborators can close
2246 roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())}
2247 isOwner := roles.IsOwner()
2248 isCollaborator := roles.IsCollaborator()
2249 isPullAuthor := user.Did == pull.OwnerDid
2250 isCloseAllowed := isOwner || isCollaborator || isPullAuthor
2251 if !isCloseAllowed {
2252 log.Println("failed to close pull")
2253 s.pages.Notice(w, "pull-close", "You are unauthorized to close this pull.")
2254 return
2255 }
2256
2257 // Start a transaction
2258 tx, err := s.db.BeginTx(r.Context(), nil)
2259 if err != nil {
2260 log.Println("failed to start transaction", err)
2261 s.pages.Notice(w, "pull-close", "Failed to close pull.")
2262 return
2263 }
2264 defer tx.Rollback()
2265
2266 var pullsToClose []*models.Pull
2267 pullsToClose = append(pullsToClose, pull)
2268
2269 // if this PR is stacked, then we want to close all PRs below this one on the stack
2270 if pull.IsStacked() {
2271 stack := r.Context().Value("stack").(models.Stack)
2272 subStack := stack.StrictlyBelow(pull)
2273 pullsToClose = append(pullsToClose, subStack...)
2274 }
2275
2276 for _, p := range pullsToClose {
2277 // Close the pull in the database
2278 err = db.ClosePull(tx, f.RepoAt(), p.PullId)
2279 if err != nil {
2280 log.Println("failed to close pull", err)
2281 s.pages.Notice(w, "pull-close", "Failed to close pull.")
2282 return
2283 }
2284 p.State = models.PullClosed
2285 }
2286
2287 // Commit the transaction
2288 if err = tx.Commit(); err != nil {
2289 log.Println("failed to commit transaction", err)
2290 s.pages.Notice(w, "pull-close", "Failed to close pull.")
2291 return
2292 }
2293
2294 for _, p := range pullsToClose {
2295 s.notifier.NewPullState(r.Context(), syntax.DID(user.Did), p)
2296 }
2297
2298 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f)
2299 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", ownerSlashRepo, pull.PullId))
2300}
2301
2302func (s *Pulls) ReopenPull(w http.ResponseWriter, r *http.Request) {
2303 user := s.oauth.GetUser(r)
2304
2305 f, err := s.repoResolver.Resolve(r)
2306 if err != nil {
2307 log.Println("failed to resolve repo", err)
2308 s.pages.Notice(w, "pull-reopen", "Failed to reopen pull.")
2309 return
2310 }
2311
2312 pull, ok := r.Context().Value("pull").(*models.Pull)
2313 if !ok {
2314 log.Println("failed to get pull")
2315 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
2316 return
2317 }
2318
2319 // auth filter: only owner or collaborators can close
2320 roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())}
2321 isOwner := roles.IsOwner()
2322 isCollaborator := roles.IsCollaborator()
2323 isPullAuthor := user.Did == pull.OwnerDid
2324 isCloseAllowed := isOwner || isCollaborator || isPullAuthor
2325 if !isCloseAllowed {
2326 log.Println("failed to close pull")
2327 s.pages.Notice(w, "pull-close", "You are unauthorized to close this pull.")
2328 return
2329 }
2330
2331 // Start a transaction
2332 tx, err := s.db.BeginTx(r.Context(), nil)
2333 if err != nil {
2334 log.Println("failed to start transaction", err)
2335 s.pages.Notice(w, "pull-reopen", "Failed to reopen pull.")
2336 return
2337 }
2338 defer tx.Rollback()
2339
2340 var pullsToReopen []*models.Pull
2341 pullsToReopen = append(pullsToReopen, pull)
2342
2343 // if this PR is stacked, then we want to reopen all PRs above this one on the stack
2344 if pull.IsStacked() {
2345 stack := r.Context().Value("stack").(models.Stack)
2346 subStack := stack.StrictlyAbove(pull)
2347 pullsToReopen = append(pullsToReopen, subStack...)
2348 }
2349
2350 for _, p := range pullsToReopen {
2351 // Close the pull in the database
2352 err = db.ReopenPull(tx, f.RepoAt(), p.PullId)
2353 if err != nil {
2354 log.Println("failed to close pull", err)
2355 s.pages.Notice(w, "pull-close", "Failed to close pull.")
2356 return
2357 }
2358 p.State = models.PullOpen
2359 }
2360
2361 // Commit the transaction
2362 if err = tx.Commit(); err != nil {
2363 log.Println("failed to commit transaction", err)
2364 s.pages.Notice(w, "pull-reopen", "Failed to reopen pull.")
2365 return
2366 }
2367
2368 for _, p := range pullsToReopen {
2369 s.notifier.NewPullState(r.Context(), syntax.DID(user.Did), p)
2370 }
2371
2372 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f)
2373 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", ownerSlashRepo, pull.PullId))
2374}
2375
2376func (s *Pulls) newStack(ctx context.Context, repo *models.Repo, user *oauth.User, targetBranch, patch string, pullSource *models.PullSource, stackId string) (models.Stack, error) {
2377 formatPatches, err := patchutil.ExtractPatches(patch)
2378 if err != nil {
2379 return nil, fmt.Errorf("Failed to extract patches: %v", err)
2380 }
2381
2382 // must have atleast 1 patch to begin with
2383 if len(formatPatches) == 0 {
2384 return nil, fmt.Errorf("No patches found in the generated format-patch.")
2385 }
2386
2387 // the stack is identified by a UUID
2388 var stack models.Stack
2389 parentChangeId := ""
2390 for _, fp := range formatPatches {
2391 // all patches must have a jj change-id
2392 changeId, err := fp.ChangeId()
2393 if err != nil {
2394 return nil, fmt.Errorf("Stacking is only supported if all patches contain a change-id commit header.")
2395 }
2396
2397 title := fp.Title
2398 body := fp.Body
2399 rkey := tid.TID()
2400
2401 mentions, references := s.mentionsResolver.Resolve(ctx, body)
2402
2403 initialSubmission := models.PullSubmission{
2404 Patch: fp.Raw,
2405 SourceRev: fp.SHA,
2406 Combined: fp.Raw,
2407 }
2408 pull := models.Pull{
2409 Title: title,
2410 Body: body,
2411 TargetBranch: targetBranch,
2412 OwnerDid: user.Did,
2413 RepoAt: repo.RepoAt(),
2414 Rkey: rkey,
2415 Mentions: mentions,
2416 References: references,
2417 Submissions: []*models.PullSubmission{
2418 &initialSubmission,
2419 },
2420 PullSource: pullSource,
2421 Created: time.Now(),
2422
2423 StackId: stackId,
2424 ChangeId: changeId,
2425 ParentChangeId: parentChangeId,
2426 }
2427
2428 stack = append(stack, &pull)
2429
2430 parentChangeId = changeId
2431 }
2432
2433 return stack, nil
2434}