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