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