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