Something went wrong. Try again.
Monorepo for Tangled forked from tangled.org/core
Something went wrong. Try again.
68 kB · 2433 lines
Go
1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798991001011021031041051061071081091101111121131141151161171181191201211221231241251261271281291301311321331341351361371381391401411421431441451461471481491501511521531541551561571581591601611621631641651661671681691701711721731741751761771781791801811821831841851861871881891901911921931941951961971981992002012022032042052062072082092102112122132142152162172182192202212222232242252262272282292302312322332342352362372382392402412422432442452462472482492502512522532542552562572582592602612622632642652662672682692702712722732742752762772782792802812822832842852862872882892902912922932942952962972982993003013023033043053063073083093103113123133143153163173183193203213223233243253263273283293303313323333343353363373383393403413423433443453463473483493503513523533543553563573583593603613623633643653663673683693703713723733743753763773783793803813823833843853863873883893903913923933943953963973983994004014024034044054064074084094104114124134144154164174184194204214224234244254264274284294304314324334344354364374384394404414424434444454464474484494504514524534544554564574584594604614624634644654664674684694704714724734744754764774784794804814824834844854864874884894904914924934944954964974984995005015025035045055065075085095105115125135145155165175185195205215225235245255265275285295305315325335345355365375385395405415425435445455465475485495505515525535545555565575585595605615625635645655665675685695705715725735745755765775785795805815825835845855865875885895905915925935945955965975985996006016026036046056066076086096106116126136146156166176186196206216226236246256266276286296306316326336346356366376386396406416426436446456466476486496506516526536546556566576586596606616626636646656666676686696706716726736746756766776786796806816826836846856866876886896906916926936946956966976986997007017027037047057067077087097107117127137147157167177187197207217227237247257267277287297307317327337347357367377387397407417427437447457467477487497507517527537547557567577587597607617627637647657667677687697707717727737747757767777787797807817827837847857867877887897907917927937947957967977987998008018028038048058068078088098108118128138148158168178188198208218228238248258268278288298308318328338348358368378388398408418428438448458468478488498508518528538548558568578588598608618628638648658668678688698708718728738748758768778788798808818828838848858868878888898908918928938948958968978988999009019029039049059069079089099109119129139149159169179189199209219229239249259269279289299309319329339349359369379389399409419429439449459469479489499509519529539549559569579589599609619629639649659669679689699709719729739749759769779789799809819829839849859869879889899909919929939949959969979989991000100110021003100410051006100710081009101010111012101310141015101610171018101910201021102210231024102510261027102810291030103110321033103410351036103710381039104010411042104310441045104610471048104910501051105210531054105510561057105810591060106110621063106410651066106710681069107010711072107310741075107610771078107910801081108210831084108510861087108810891090109110921093109410951096109710981099110011011102110311041105110611071108110911101111111211131114111511161117111811191120112111221123112411251126112711281129113011311132113311341135113611371138113911401141114211431144114511461147114811491150115111521153115411551156115711581159116011611162116311641165116611671168116911701171117211731174117511761177117811791180118111821183118411851186118711881189119011911192119311941195119611971198119912001201120212031204120512061207120812091210121112121213121412151216121712181219122012211222122312241225122612271228122912301231123212331234123512361237123812391240124112421243124412451246124712481249125012511252125312541255125612571258125912601261126212631264126512661267126812691270127112721273127412751276127712781279128012811282128312841285128612871288128912901291129212931294129512961297129812991300130113021303130413051306130713081309131013111312131313141315131613171318131913201321132213231324132513261327132813291330133113321333133413351336133713381339134013411342134313441345134613471348134913501351135213531354135513561357135813591360136113621363136413651366136713681369137013711372137313741375137613771378137913801381138213831384138513861387138813891390139113921393139413951396139713981399140014011402140314041405140614071408140914101411141214131414141514161417141814191420142114221423142414251426142714281429143014311432143314341435143614371438143914401441144214431444144514461447144814491450145114521453145414551456145714581459146014611462146314641465146614671468146914701471147214731474147514761477147814791480148114821483148414851486148714881489149014911492149314941495149614971498149915001501150215031504150515061507150815091510151115121513151415151516151715181519152015211522152315241525152615271528152915301531153215331534153515361537153815391540154115421543154415451546154715481549155015511552155315541555155615571558155915601561156215631564156515661567156815691570157115721573157415751576157715781579158015811582158315841585158615871588158915901591159215931594159515961597159815991600160116021603160416051606160716081609161016111612161316141615161616171618161916201621162216231624162516261627162816291630163116321633163416351636163716381639164016411642164316441645164616471648164916501651165216531654165516561657165816591660166116621663166416651666166716681669167016711672167316741675167616771678167916801681168216831684168516861687168816891690169116921693169416951696169716981699170017011702170317041705170617071708170917101711171217131714171517161717171817191720172117221723172417251726172717281729173017311732173317341735173617371738173917401741174217431744174517461747174817491750175117521753175417551756175717581759176017611762176317641765176617671768176917701771177217731774177517761777177817791780178117821783178417851786178717881789179017911792179317941795179617971798179918001801180218031804180518061807180818091810181118121813181418151816181718181819182018211822182318241825182618271828182918301831183218331834183518361837183818391840184118421843184418451846184718481849185018511852185318541855185618571858185918601861186218631864186518661867186818691870187118721873187418751876187718781879188018811882188318841885188618871888188918901891189218931894189518961897189818991900190119021903190419051906190719081909191019111912191319141915191619171918191919201921192219231924192519261927192819291930193119321933193419351936193719381939194019411942194319441945194619471948194919501951195219531954195519561957195819591960196119621963196419651966196719681969197019711972197319741975197619771978197919801981198219831984198519861987198819891990199119921993199419951996199719981999200020012002200320042005200620072008200920102011201220132014201520162017201820192020202120222023202420252026202720282029203020312032203320342035203620372038203920402041204220432044204520462047204820492050205120522053205420552056205720582059206020612062206320642065206620672068206920702071207220732074207520762077207820792080208120822083208420852086208720882089209020912092209320942095209620972098209921002101210221032104210521062107210821092110211121122113211421152116211721182119212021212122212321242125212621272128212921302131213221332134213521362137213821392140214121422143214421452146214721482149215021512152215321542155215621572158215921602161216221632164216521662167216821692170217121722173217421752176217721782179218021812182218321842185218621872188218921902191219221932194219521962197219821992200220122022203220422052206220722082209221022112212221322142215221622172218221922202221222222232224222522262227222822292230223122322233223422352236223722382239224022412242224322442245224622472248224922502251225222532254225522562257225822592260226122622263226422652266226722682269227022712272227322742275227622772278227922802281228222832284228522862287228822892290229122922293229422952296229722982299230023012302230323042305230623072308230923102311231223132314231523162317231823192320232123222323232423252326232723282329233023312332233323342335233623372338233923402341234223432344234523462347234823492350235123522353235423552356235723582359236023612362236323642365236623672368236923702371237223732374237523762377237823792380238123822383238423852386238723882389239023912392239323942395239623972398239924002401240224032404240524062407240824092410241124122413241424152416241724182419242024212422242324242425242624272428242924302431243224332434package pulls
import ( "context" "database/sql" "encoding/json" "errors" "fmt" "log" "log/slog" "net/http" "slices" "sort" "strconv" "strings" "time"
"tangled.org/core/api/tangled" "tangled.org/core/appview/config" "tangled.org/core/appview/db" pulls_indexer "tangled.org/core/appview/indexer/pulls" "tangled.org/core/appview/models" "tangled.org/core/appview/notify" "tangled.org/core/appview/oauth" "tangled.org/core/appview/pages" "tangled.org/core/appview/pages/markup" "tangled.org/core/appview/pages/repoinfo" "tangled.org/core/appview/refresolver" "tangled.org/core/appview/reporesolver" "tangled.org/core/appview/validator" "tangled.org/core/appview/xrpcclient" "tangled.org/core/idresolver" "tangled.org/core/patchutil" "tangled.org/core/rbac" "tangled.org/core/tid" "tangled.org/core/types"
comatproto "github.com/bluesky-social/indigo/api/atproto" "github.com/bluesky-social/indigo/atproto/syntax" lexutil "github.com/bluesky-social/indigo/lex/util" indigoxrpc "github.com/bluesky-social/indigo/xrpc" "github.com/go-chi/chi/v5" "github.com/google/uuid")
type Pulls struct { oauth *oauth.OAuth repoResolver *reporesolver.RepoResolver pages *pages.Pages idResolver *idresolver.Resolver refResolver *refresolver.Resolver db *db.DB config *config.Config notifier notify.Notifier enforcer *rbac.Enforcer logger *slog.Logger validator *validator.Validator indexer *pulls_indexer.Indexer}
func New( oauth *oauth.OAuth, repoResolver *reporesolver.RepoResolver, pages *pages.Pages, resolver *idresolver.Resolver, refResolver *refresolver.Resolver, db *db.DB, config *config.Config, notifier notify.Notifier, enforcer *rbac.Enforcer, validator *validator.Validator, indexer *pulls_indexer.Indexer, logger *slog.Logger,) *Pulls { return &Pulls{ oauth: oauth, repoResolver: repoResolver, pages: pages, idResolver: resolver, refResolver: refResolver, db: db, config: config, notifier: notifier, enforcer: enforcer, logger: logger, validator: validator, indexer: indexer, }}
// htmx fragmentfunc (s *Pulls) PullActions(w http.ResponseWriter, r *http.Request) { switch r.Method { case http.MethodGet: user := s.oauth.GetUser(r) f, err := s.repoResolver.Resolve(r) if err != nil { log.Println("failed to get repo and knot", err) return }
pull, ok := r.Context().Value("pull").(*models.Pull) if !ok { log.Println("failed to get pull") s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.") return }
// can be nil if this pull is not stacked stack, _ := r.Context().Value("stack").(models.Stack)
roundNumberStr := chi.URLParam(r, "round") roundNumber, err := strconv.Atoi(roundNumberStr) if err != nil { roundNumber = pull.LastRoundNumber() } if roundNumber >= len(pull.Submissions) { http.Error(w, "bad round id", http.StatusBadRequest) log.Println("failed to parse round id", err) return }
mergeCheckResponse := s.mergeCheck(r, f, pull, stack) branchDeleteStatus := s.branchDeleteStatus(r, f, pull) resubmitResult := pages.Unknown if user.Did == pull.OwnerDid { resubmitResult = s.resubmitCheck(r, f, pull, stack) }
s.pages.PullActionsFragment(w, pages.PullActionsParams{ LoggedInUser: user, RepoInfo: s.repoResolver.GetRepoInfo(r, user), Pull: pull, RoundNumber: roundNumber, MergeCheck: mergeCheckResponse, ResubmitCheck: resubmitResult, BranchDeleteStatus: branchDeleteStatus, Stack: stack, }) return }}
func (s *Pulls) RepoSinglePull(w http.ResponseWriter, r *http.Request) { user := s.oauth.GetUser(r) f, err := s.repoResolver.Resolve(r) if err != nil { log.Println("failed to get repo and knot", err) return }
pull, ok := r.Context().Value("pull").(*models.Pull) if !ok { log.Println("failed to get pull") s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.") return }
backlinks, err := db.GetBacklinks(s.db, pull.AtUri()) if err != nil { log.Println("failed to get pull backlinks", err) s.pages.Notice(w, "pull-error", "Failed to get pull. Try again later.") return }
// can be nil if this pull is not stacked stack, _ := r.Context().Value("stack").(models.Stack) abandonedPulls, _ := r.Context().Value("abandonedPulls").([]*models.Pull)
mergeCheckResponse := s.mergeCheck(r, f, pull, stack) branchDeleteStatus := s.branchDeleteStatus(r, f, pull) resubmitResult := pages.Unknown if user != nil && user.Did == pull.OwnerDid { resubmitResult = s.resubmitCheck(r, f, pull, stack) }
m := make(map[string]models.Pipeline)
var shas []string for _, s := range pull.Submissions { shas = append(shas, s.SourceRev) } for _, p := range stack { shas = append(shas, p.LatestSha()) } for _, p := range abandonedPulls { shas = append(shas, p.LatestSha()) }
ps, err := db.GetPipelineStatuses( s.db, len(shas), db.FilterEq("repo_owner", f.Did), db.FilterEq("repo_name", f.Name), db.FilterEq("knot", f.Knot), db.FilterIn("sha", shas), ) if err != nil { log.Printf("failed to fetch pipeline statuses: %s", err) // non-fatal }
for _, p := range ps { m[p.Sha] = p }
reactionMap, err := db.GetReactionMap(s.db, 20, pull.AtUri()) if err != nil { log.Println("failed to get pull reactions") s.pages.Notice(w, "pulls", "Failed to load pull. Try again later.") }
userReactions := map[models.ReactionKind]bool{} if user != nil { userReactions = db.GetReactionStatusMap(s.db, user.Did, pull.AtUri()) }
labelDefs, err := db.GetLabelDefinitions( s.db, db.FilterIn("at_uri", f.Labels), db.FilterContains("scope", tangled.RepoPullNSID), ) if err != nil { log.Println("failed to fetch labels", err) s.pages.Error503(w) return }
defs := make(map[string]*models.LabelDefinition) for _, l := range labelDefs { defs[l.AtUri().String()] = &l }
s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{ LoggedInUser: user, RepoInfo: s.repoResolver.GetRepoInfo(r, user), Pull: pull, Stack: stack, AbandonedPulls: abandonedPulls, Backlinks: backlinks, BranchDeleteStatus: branchDeleteStatus, MergeCheck: mergeCheckResponse, ResubmitCheck: resubmitResult, Pipelines: m,
OrderedReactionKinds: models.OrderedReactionKinds, Reactions: reactionMap, UserReacted: userReactions,
LabelDefs: defs, })}
func (s *Pulls) mergeCheck(r *http.Request, f *models.Repo, pull *models.Pull, stack models.Stack) types.MergeCheckResponse { if pull.State == models.PullMerged { return types.MergeCheckResponse{} }
scheme := "https" if s.config.Core.Dev { scheme = "http" } host := fmt.Sprintf("%s://%s", scheme, f.Knot)
xrpcc := indigoxrpc.Client{ Host: host, }
patch := pull.LatestPatch() if pull.IsStacked() { // combine patches of substack subStack := stack.Below(pull) // collect the portion of the stack that is mergeable mergeable := subStack.Mergeable() // combine each patch patch = mergeable.CombinedPatch() }
resp, xe := tangled.RepoMergeCheck( r.Context(), &xrpcc, &tangled.RepoMergeCheck_Input{ Did: f.Did, Name: f.Name, Branch: pull.TargetBranch, Patch: patch, }, ) if err := xrpcclient.HandleXrpcErr(xe); err != nil { log.Println("failed to check for mergeability", "err", err) return types.MergeCheckResponse{ Error: fmt.Sprintf("failed to check merge status: %s", err.Error()), } }
// convert xrpc response to internal types conflicts := make([]types.ConflictInfo, len(resp.Conflicts)) for i, conflict := range resp.Conflicts { conflicts[i] = types.ConflictInfo{ Filename: conflict.Filename, Reason: conflict.Reason, } }
result := types.MergeCheckResponse{ IsConflicted: resp.Is_conflicted, Conflicts: conflicts, }
if resp.Message != nil { result.Message = *resp.Message }
if resp.Error != nil { result.Error = *resp.Error }
return result}
func (s *Pulls) branchDeleteStatus(r *http.Request, repo *models.Repo, pull *models.Pull) *models.BranchDeleteStatus { if pull.State != models.PullMerged { return nil }
user := s.oauth.GetUser(r) if user == nil { return nil }
var branch string // check if the branch exists // NOTE: appview could cache branches/tags etc. for every repo by listening for gitRefUpdates if pull.IsBranchBased() { branch = pull.PullSource.Branch } else if pull.IsForkBased() { branch = pull.PullSource.Branch repo = pull.PullSource.Repo } else { return nil }
// deleted fork if repo == nil { return nil }
// user can only delete branch if they are a collaborator in the repo that the branch belongs to perms := s.enforcer.GetPermissionsInRepo(user.Did, repo.Knot, repo.DidSlashRepo()) if !slices.Contains(perms, "repo:push") { return nil }
scheme := "http" if !s.config.Core.Dev { scheme = "https" } host := fmt.Sprintf("%s://%s", scheme, repo.Knot) xrpcc := &indigoxrpc.Client{ Host: host, }
resp, err := tangled.RepoBranch(r.Context(), xrpcc, branch, fmt.Sprintf("%s/%s", repo.Did, repo.Name)) if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { return nil }
return &models.BranchDeleteStatus{ Repo: repo, Branch: resp.Name, }}
func (s *Pulls) resubmitCheck(r *http.Request, repo *models.Repo, pull *models.Pull, stack models.Stack) pages.ResubmitResult { if pull.State == models.PullMerged || pull.State == models.PullDeleted || pull.PullSource == nil { return pages.Unknown }
var knot, ownerDid, repoName string
if pull.PullSource.RepoAt != nil { // fork-based pulls sourceRepo, err := db.GetRepoByAtUri(s.db, pull.PullSource.RepoAt.String()) if err != nil { log.Println("failed to get source repo", err) return pages.Unknown }
knot = sourceRepo.Knot ownerDid = sourceRepo.Did repoName = sourceRepo.Name } else { // pulls within the same repo knot = repo.Knot ownerDid = repo.Did repoName = repo.Name }
scheme := "http" if !s.config.Core.Dev { scheme = "https" } host := fmt.Sprintf("%s://%s", scheme, knot) xrpcc := &indigoxrpc.Client{ Host: host, }
didSlashName := fmt.Sprintf("%s/%s", ownerDid, repoName) branchResp, err := tangled.RepoBranch(r.Context(), xrpcc, pull.PullSource.Branch, didSlashName) if err != nil { if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { log.Println("failed to call XRPC repo.branches", xrpcerr) return pages.Unknown } log.Println("failed to reach knotserver", err) return pages.Unknown }
targetBranch := branchResp
latestSourceRev := pull.LatestSha()
if pull.IsStacked() && stack != nil { top := stack[0] latestSourceRev = top.LatestSha() }
if latestSourceRev != targetBranch.Hash { return pages.ShouldResubmit }
return pages.ShouldNotResubmit}
func (s *Pulls) RepoPullPatch(w http.ResponseWriter, r *http.Request) { user := s.oauth.GetUser(r)
var diffOpts types.DiffOpts if d := r.URL.Query().Get("diff"); d == "split" { diffOpts.Split = true }
pull, ok := r.Context().Value("pull").(*models.Pull) if !ok { log.Println("failed to get pull") s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.") return }
stack, _ := r.Context().Value("stack").(models.Stack)
roundId := chi.URLParam(r, "round") roundIdInt, err := strconv.Atoi(roundId) if err != nil || roundIdInt >= len(pull.Submissions) { http.Error(w, "bad round id", http.StatusBadRequest) log.Println("failed to parse round id", err) return }
patch := pull.Submissions[roundIdInt].CombinedPatch() diff := patchutil.AsNiceDiff(patch, pull.TargetBranch)
s.pages.RepoPullPatchPage(w, pages.RepoPullPatchParams{ LoggedInUser: user, RepoInfo: s.repoResolver.GetRepoInfo(r, user), Pull: pull, Stack: stack, Round: roundIdInt, Submission: pull.Submissions[roundIdInt], Diff: &diff, DiffOpts: diffOpts, })
}
func (s *Pulls) RepoPullInterdiff(w http.ResponseWriter, r *http.Request) { user := s.oauth.GetUser(r)
var diffOpts types.DiffOpts if d := r.URL.Query().Get("diff"); d == "split" { diffOpts.Split = true }
pull, ok := r.Context().Value("pull").(*models.Pull) if !ok { log.Println("failed to get pull") s.pages.Notice(w, "pull-error", "Failed to get pull.") return }
roundId := chi.URLParam(r, "round") roundIdInt, err := strconv.Atoi(roundId) if err != nil || roundIdInt >= len(pull.Submissions) { http.Error(w, "bad round id", http.StatusBadRequest) log.Println("failed to parse round id", err) return }
if roundIdInt == 0 { http.Error(w, "bad round id", http.StatusBadRequest) log.Println("cannot interdiff initial submission") return }
currentPatch, err := patchutil.AsDiff(pull.Submissions[roundIdInt].CombinedPatch()) if err != nil { log.Println("failed to interdiff; current patch malformed") s.pages.Notice(w, fmt.Sprintf("interdiff-error-%d", roundIdInt), "Failed to calculate interdiff; current patch is invalid.") return }
previousPatch, err := patchutil.AsDiff(pull.Submissions[roundIdInt-1].CombinedPatch()) if err != nil { log.Println("failed to interdiff; previous patch malformed") s.pages.Notice(w, fmt.Sprintf("interdiff-error-%d", roundIdInt), "Failed to calculate interdiff; previous patch is invalid.") return }
interdiff := patchutil.Interdiff(previousPatch, currentPatch)
s.pages.RepoPullInterdiffPage(w, pages.RepoPullInterdiffParams{ LoggedInUser: s.oauth.GetUser(r), RepoInfo: s.repoResolver.GetRepoInfo(r, user), Pull: pull, Round: roundIdInt, Interdiff: interdiff, DiffOpts: diffOpts, })}
func (s *Pulls) RepoPullPatchRaw(w http.ResponseWriter, r *http.Request) { pull, ok := r.Context().Value("pull").(*models.Pull) if !ok { log.Println("failed to get pull") s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.") return }
roundId := chi.URLParam(r, "round") roundIdInt, err := strconv.Atoi(roundId) if err != nil || roundIdInt >= len(pull.Submissions) { http.Error(w, "bad round id", http.StatusBadRequest) log.Println("failed to parse round id", err) return }
w.Header().Set("Content-Type", "text/plain; charset=utf-8") w.Write([]byte(pull.Submissions[roundIdInt].Patch))}
func (s *Pulls) RepoPulls(w http.ResponseWriter, r *http.Request) { l := s.logger.With("handler", "RepoPulls")
user := s.oauth.GetUser(r) params := r.URL.Query()
state := models.PullOpen switch params.Get("state") { case "closed": state = models.PullClosed case "merged": state = models.PullMerged }
f, err := s.repoResolver.Resolve(r) if err != nil { log.Println("failed to get repo and knot", err) return }
keyword := params.Get("q")
var ids []int64 searchOpts := models.PullSearchOptions{ Keyword: keyword, RepoAt: f.RepoAt().String(), State: state, // Page: page, } l.Debug("searching with", "searchOpts", searchOpts) if keyword != "" { res, err := s.indexer.Search(r.Context(), searchOpts) if err != nil { l.Error("failed to search for pulls", "err", err) return } ids = res.Hits l.Debug("searched pulls with indexer", "count", len(ids)) } else { ids, err = db.GetPullIDs(s.db, searchOpts) if err != nil { l.Error("failed to get all pull ids", "err", err) return } l.Debug("indexed all pulls from the db", "count", len(ids)) }
pulls, err := db.GetPulls( s.db, db.FilterIn("id", ids), ) if err != nil { log.Println("failed to get pulls", err) s.pages.Notice(w, "pulls", "Failed to load pulls. Try again later.") return }
for _, p := range pulls { var pullSourceRepo *models.Repo if p.PullSource != nil { if p.PullSource.RepoAt != nil { pullSourceRepo, err = db.GetRepoByAtUri(s.db, p.PullSource.RepoAt.String()) if err != nil { log.Printf("failed to get repo by at uri: %v", err) continue } else { p.PullSource.Repo = pullSourceRepo } } } }
// we want to group all stacked PRs into just one list stacks := make(map[string]models.Stack) var shas []string n := 0 for _, p := range pulls { // store the sha for later shas = append(shas, p.LatestSha()) // this PR is stacked if p.StackId != "" { // we have already seen this PR stack if _, seen := stacks[p.StackId]; seen { stacks[p.StackId] = append(stacks[p.StackId], p) // skip this PR } else { stacks[p.StackId] = nil pulls[n] = p n++ } } else { pulls[n] = p n++ } } pulls = pulls[:n]
ps, err := db.GetPipelineStatuses( s.db, len(shas), db.FilterEq("repo_owner", f.Did), db.FilterEq("repo_name", f.Name), db.FilterEq("knot", f.Knot), db.FilterIn("sha", shas), ) if err != nil { log.Printf("failed to fetch pipeline statuses: %s", err) // non-fatal } m := make(map[string]models.Pipeline) for _, p := range ps { m[p.Sha] = p }
labelDefs, err := db.GetLabelDefinitions( s.db, db.FilterIn("at_uri", f.Labels), db.FilterContains("scope", tangled.RepoPullNSID), ) if err != nil { log.Println("failed to fetch labels", err) s.pages.Error503(w) return }
defs := make(map[string]*models.LabelDefinition) for _, l := range labelDefs { defs[l.AtUri().String()] = &l }
s.pages.RepoPulls(w, pages.RepoPullsParams{ LoggedInUser: s.oauth.GetUser(r), RepoInfo: s.repoResolver.GetRepoInfo(r, user), Pulls: pulls, LabelDefs: defs, FilteringBy: state, FilterQuery: keyword, Stacks: stacks, Pipelines: m, })}
func (s *Pulls) PullComment(w http.ResponseWriter, r *http.Request) { user := s.oauth.GetUser(r) f, err := s.repoResolver.Resolve(r) if err != nil { log.Println("failed to get repo and knot", err) return }
pull, ok := r.Context().Value("pull").(*models.Pull) if !ok { log.Println("failed to get pull") s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.") return }
roundNumberStr := chi.URLParam(r, "round") roundNumber, err := strconv.Atoi(roundNumberStr) if err != nil || roundNumber >= len(pull.Submissions) { http.Error(w, "bad round id", http.StatusBadRequest) log.Println("failed to parse round id", err) return }
switch r.Method { case http.MethodGet: s.pages.PullNewCommentFragment(w, pages.PullNewCommentParams{ LoggedInUser: user, RepoInfo: s.repoResolver.GetRepoInfo(r, user), Pull: pull, RoundNumber: roundNumber, }) return case http.MethodPost: body := r.FormValue("body") if body == "" { s.pages.Notice(w, "pull", "Comment body is required") return }
mentions, references := s.refResolver.Resolve(r.Context(), body)
// Start a transaction tx, err := s.db.BeginTx(r.Context(), nil) if err != nil { log.Println("failed to start transaction", err) s.pages.Notice(w, "pull-comment", "Failed to create comment.") return } defer tx.Rollback()
createdAt := time.Now().Format(time.RFC3339)
client, err := s.oauth.AuthorizedClient(r) if err != nil { log.Println("failed to get authorized client", err) s.pages.Notice(w, "pull-comment", "Failed to create comment.") return } atResp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ Collection: tangled.RepoPullCommentNSID, Repo: user.Did, Rkey: tid.TID(), Record: &lexutil.LexiconTypeDecoder{ Val: &tangled.RepoPullComment{ Pull: pull.AtUri().String(), Body: body, CreatedAt: createdAt, }, }, }) if err != nil { log.Println("failed to create pull comment", err) s.pages.Notice(w, "pull-comment", "Failed to create comment.") return }
comment := &models.PullComment{ OwnerDid: user.Did, RepoAt: f.RepoAt().String(), PullId: pull.PullId, Body: body, CommentAt: atResp.Uri, SubmissionId: pull.Submissions[roundNumber].ID, Mentions: mentions, References: references, }
// Create the pull comment in the database with the commentAt field commentId, err := db.NewPullComment(tx, comment) if err != nil { log.Println("failed to create pull comment", err) s.pages.Notice(w, "pull-comment", "Failed to create comment.") return }
// Commit the transaction if err = tx.Commit(); err != nil { log.Println("failed to commit transaction", err) s.pages.Notice(w, "pull-comment", "Failed to create comment.") return }
s.notifier.NewPullComment(r.Context(), comment, mentions)
ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f) s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d#comment-%d", ownerSlashRepo, pull.PullId, commentId)) return }}
func (s *Pulls) NewPull(w http.ResponseWriter, r *http.Request) { user := s.oauth.GetUser(r) f, err := s.repoResolver.Resolve(r) if err != nil { log.Println("failed to get repo and knot", err) return }
switch r.Method { case http.MethodGet: scheme := "http" if !s.config.Core.Dev { scheme = "https" } host := fmt.Sprintf("%s://%s", scheme, f.Knot) xrpcc := &indigoxrpc.Client{ Host: host, }
repo := fmt.Sprintf("%s/%s", f.Did, f.Name) xrpcBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo) if err != nil { if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { log.Println("failed to call XRPC repo.branches", xrpcerr) s.pages.Error503(w) return } log.Println("failed to fetch branches", err) return }
var result types.RepoBranchesResponse if err := json.Unmarshal(xrpcBytes, &result); err != nil { log.Println("failed to decode XRPC response", err) s.pages.Error503(w) return }
// can be one of "patch", "branch" or "fork" strategy := r.URL.Query().Get("strategy") // ignored if strategy is "patch" sourceBranch := r.URL.Query().Get("sourceBranch") targetBranch := r.URL.Query().Get("targetBranch")
s.pages.RepoNewPull(w, pages.RepoNewPullParams{ LoggedInUser: user, RepoInfo: s.repoResolver.GetRepoInfo(r, user), Branches: result.Branches, Strategy: strategy, SourceBranch: sourceBranch, TargetBranch: targetBranch, Title: r.URL.Query().Get("title"), Body: r.URL.Query().Get("body"), })
case http.MethodPost: title := r.FormValue("title") body := r.FormValue("body") targetBranch := r.FormValue("targetBranch") fromFork := r.FormValue("fork") sourceBranch := r.FormValue("sourceBranch") patch := r.FormValue("patch")
if targetBranch == "" { s.pages.Notice(w, "pull", "Target branch is required.") return }
// Determine PR type based on input parameters roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())} isPushAllowed := roles.IsPushAllowed() isBranchBased := isPushAllowed && sourceBranch != "" && fromFork == "" isForkBased := fromFork != "" && sourceBranch != "" isPatchBased := patch != "" && !isBranchBased && !isForkBased isStacked := r.FormValue("isStacked") == "on"
if isPatchBased && !patchutil.IsFormatPatch(patch) { if title == "" { s.pages.Notice(w, "pull", "Title is required for git-diff patches.") return } sanitizer := markup.NewSanitizer() if st := strings.TrimSpace(sanitizer.SanitizeDescription(title)); (st) == "" { s.pages.Notice(w, "pull", "Title is empty after HTML sanitization") return } }
// Validate we have at least one valid PR creation method if !isBranchBased && !isPatchBased && !isForkBased { s.pages.Notice(w, "pull", "Neither source branch nor patch supplied.") return }
// Can't mix branch-based and patch-based approaches if isBranchBased && patch != "" { s.pages.Notice(w, "pull", "Cannot select both patch and source branch.") return }
// us, err := knotclient.NewUnsignedClient(f.Knot, s.config.Core.Dev) // if err != nil { // log.Printf("failed to create unsigned client to %s: %v", f.Knot, err) // s.pages.Notice(w, "pull", "Failed to create a pull request. Try again later.") // return // }
// TODO: make capabilities an xrpc call caps := struct { PullRequests struct { FormatPatch bool BranchSubmissions bool ForkSubmissions bool PatchSubmissions bool } }{ PullRequests: struct { FormatPatch bool BranchSubmissions bool ForkSubmissions bool PatchSubmissions bool }{ FormatPatch: true, BranchSubmissions: true, ForkSubmissions: true, PatchSubmissions: true, }, }
// caps, err := us.Capabilities() // if err != nil { // log.Println("error fetching knot caps", f.Knot, err) // s.pages.Notice(w, "pull", "Failed to create a pull request. Try again later.") // return // }
if !caps.PullRequests.FormatPatch { s.pages.Notice(w, "pull", "This knot doesn't support format-patch. Unfortunately, there is no fallback for now.") return }
// Handle the PR creation based on the type if isBranchBased { if !caps.PullRequests.BranchSubmissions { s.pages.Notice(w, "pull", "This knot doesn't support branch-based pull requests. Try another way?") return } s.handleBranchBasedPull(w, r, f, user, title, body, targetBranch, sourceBranch, isStacked) } else if isForkBased { if !caps.PullRequests.ForkSubmissions { s.pages.Notice(w, "pull", "This knot doesn't support fork-based pull requests. Try another way?") return } s.handleForkBasedPull(w, r, f, user, fromFork, title, body, targetBranch, sourceBranch, isStacked) } else if isPatchBased { if !caps.PullRequests.PatchSubmissions { s.pages.Notice(w, "pull", "This knot doesn't support patch-based pull requests. Send your patch over email.") return } s.handlePatchBasedPull(w, r, f, user, title, body, targetBranch, patch, isStacked) } return }}
func (s *Pulls) handleBranchBasedPull( w http.ResponseWriter, r *http.Request, repo *models.Repo, user *oauth.User, title, body, targetBranch, sourceBranch string, isStacked bool,) { scheme := "http" if !s.config.Core.Dev { scheme = "https" } host := fmt.Sprintf("%s://%s", scheme, repo.Knot) xrpcc := &indigoxrpc.Client{ Host: host, }
didSlashRepo := fmt.Sprintf("%s/%s", repo.Did, repo.Name) xrpcBytes, err := tangled.RepoCompare(r.Context(), xrpcc, didSlashRepo, targetBranch, sourceBranch) if err != nil { if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { log.Println("failed to call XRPC repo.compare", xrpcerr) s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") return } log.Println("failed to compare", err) s.pages.Notice(w, "pull", err.Error()) return }
var comparison types.RepoFormatPatchResponse if err := json.Unmarshal(xrpcBytes, &comparison); err != nil { log.Println("failed to decode XRPC compare response", err) s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") return }
sourceRev := comparison.Rev2 patch := comparison.FormatPatchRaw combined := comparison.CombinedPatchRaw
if err := s.validator.ValidatePatch(&patch); err != nil { s.logger.Error("failed to validate patch", "err", err) s.pages.Notice(w, "pull", "Invalid patch format. Please provide a valid diff.") return }
pullSource := &models.PullSource{ Branch: sourceBranch, } recordPullSource := &tangled.RepoPull_Source{ Branch: sourceBranch, Sha: comparison.Rev2, }
s.createPullRequest(w, r, repo, user, title, body, targetBranch, patch, combined, sourceRev, pullSource, recordPullSource, isStacked)}
func (s *Pulls) handlePatchBasedPull(w http.ResponseWriter, r *http.Request, repo *models.Repo, user *oauth.User, title, body, targetBranch, patch string, isStacked bool) { if err := s.validator.ValidatePatch(&patch); err != nil { s.logger.Error("patch validation failed", "err", err) s.pages.Notice(w, "pull", "Invalid patch format. Please provide a valid diff.") return }
s.createPullRequest(w, r, repo, user, title, body, targetBranch, patch, "", "", nil, nil, isStacked)}
func (s *Pulls) handleForkBasedPull(w http.ResponseWriter, r *http.Request, repo *models.Repo, user *oauth.User, forkRepo string, title, body, targetBranch, sourceBranch string, isStacked bool) { repoString := strings.SplitN(forkRepo, "/", 2) forkOwnerDid := repoString[0] repoName := repoString[1] fork, err := db.GetForkByDid(s.db, forkOwnerDid, repoName) if errors.Is(err, sql.ErrNoRows) { s.pages.Notice(w, "pull", "No such fork.") return } else if err != nil { log.Println("failed to fetch fork:", err) s.pages.Notice(w, "pull", "Failed to fetch fork.") return }
client, err := s.oauth.ServiceClient( r, oauth.WithService(fork.Knot), oauth.WithLxm(tangled.RepoHiddenRefNSID), oauth.WithDev(s.config.Core.Dev), )
resp, err := tangled.RepoHiddenRef( r.Context(), client, &tangled.RepoHiddenRef_Input{ ForkRef: sourceBranch, RemoteRef: targetBranch, Repo: fork.RepoAt().String(), }, ) if err := xrpcclient.HandleXrpcErr(err); err != nil { s.pages.Notice(w, "pull", err.Error()) return }
if !resp.Success { errorMsg := "Failed to create pull request" if resp.Error != nil { errorMsg = fmt.Sprintf("Failed to create pull request: %s", *resp.Error) } s.pages.Notice(w, "pull", errorMsg) return }
hiddenRef := fmt.Sprintf("hidden/%s/%s", sourceBranch, targetBranch) // We're now comparing the sourceBranch (on the fork) against the hiddenRef which is tracking // the targetBranch on the target repository. This code is a bit confusing, but here's an example: // hiddenRef: hidden/feature-1/main (on repo-fork) // targetBranch: main (on repo-1) // sourceBranch: feature-1 (on repo-fork) forkScheme := "http" if !s.config.Core.Dev { forkScheme = "https" } forkHost := fmt.Sprintf("%s://%s", forkScheme, fork.Knot) forkXrpcc := &indigoxrpc.Client{ Host: forkHost, }
forkRepoId := fmt.Sprintf("%s/%s", fork.Did, fork.Name) forkXrpcBytes, err := tangled.RepoCompare(r.Context(), forkXrpcc, forkRepoId, hiddenRef, sourceBranch) if err != nil { if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { log.Println("failed to call XRPC repo.compare for fork", xrpcerr) s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") return } log.Println("failed to compare across branches", err) s.pages.Notice(w, "pull", err.Error()) return }
var comparison types.RepoFormatPatchResponse if err := json.Unmarshal(forkXrpcBytes, &comparison); err != nil { log.Println("failed to decode XRPC compare response for fork", err) s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") return }
sourceRev := comparison.Rev2 patch := comparison.FormatPatchRaw combined := comparison.CombinedPatchRaw
if err := s.validator.ValidatePatch(&patch); err != nil { s.logger.Error("failed to validate patch", "err", err) s.pages.Notice(w, "pull", "Invalid patch format. Please provide a valid diff.") return }
forkAtUri := fork.RepoAt() forkAtUriStr := forkAtUri.String()
pullSource := &models.PullSource{ Branch: sourceBranch, RepoAt: &forkAtUri, } recordPullSource := &tangled.RepoPull_Source{ Branch: sourceBranch, Repo: &forkAtUriStr, Sha: sourceRev, }
s.createPullRequest(w, r, repo, user, title, body, targetBranch, patch, combined, sourceRev, pullSource, recordPullSource, isStacked)}
func (s *Pulls) createPullRequest( w http.ResponseWriter, r *http.Request, repo *models.Repo, user *oauth.User, title, body, targetBranch string, patch string, combined string, sourceRev string, pullSource *models.PullSource, recordPullSource *tangled.RepoPull_Source, isStacked bool,) { if isStacked { // creates a series of PRs, each linking to the previous, identified by jj's change-id s.createStackedPullRequest( w, r, repo, user, targetBranch, patch, sourceRev, pullSource, ) return }
client, err := s.oauth.AuthorizedClient(r) if err != nil { log.Println("failed to get authorized client", err) s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") return }
tx, err := s.db.BeginTx(r.Context(), nil) if err != nil { log.Println("failed to start tx") s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") return } defer tx.Rollback()
// We've already checked earlier if it's diff-based and title is empty, // so if it's still empty now, it's intentionally skipped owing to format-patch. if title == "" || body == "" { formatPatches, err := patchutil.ExtractPatches(patch) if err != nil { s.pages.Notice(w, "pull", fmt.Sprintf("Failed to extract patches: %v", err)) return } if len(formatPatches) == 0 { s.pages.Notice(w, "pull", "No patches found in the supplied format-patch.") return }
if title == "" { title = formatPatches[0].Title } if body == "" { body = formatPatches[0].Body } }
mentions, references := s.refResolver.Resolve(r.Context(), body)
rkey := tid.TID() initialSubmission := models.PullSubmission{ Patch: patch, Combined: combined, SourceRev: sourceRev, } pull := &models.Pull{ Title: title, Body: body, TargetBranch: targetBranch, OwnerDid: user.Did, RepoAt: repo.RepoAt(), Rkey: rkey, Mentions: mentions, References: references, Submissions: []*models.PullSubmission{ &initialSubmission, }, PullSource: pullSource, } err = db.NewPull(tx, pull) if err != nil { log.Println("failed to create pull request", err) s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") return } pullId, err := db.NextPullId(tx, repo.RepoAt()) if err != nil { log.Println("failed to get pull id", err) s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") return }
_, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ Collection: tangled.RepoPullNSID, Repo: user.Did, Rkey: rkey, Record: &lexutil.LexiconTypeDecoder{ Val: &tangled.RepoPull{ Title: title, Target: &tangled.RepoPull_Target{ Repo: string(repo.RepoAt()), Branch: targetBranch, }, Patch: patch, Source: recordPullSource, CreatedAt: time.Now().Format(time.RFC3339), }, }, }) if err != nil { log.Println("failed to create pull request", err) s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") return }
if err = tx.Commit(); err != nil { log.Println("failed to create pull request", err) s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") return }
s.notifier.NewPull(r.Context(), pull)
ownerSlashRepo := reporesolver.GetBaseRepoPath(r, repo) s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", ownerSlashRepo, pullId))}
func (s *Pulls) createStackedPullRequest( w http.ResponseWriter, r *http.Request, repo *models.Repo, user *oauth.User, targetBranch string, patch string, sourceRev string, pullSource *models.PullSource,) { // run some necessary checks for stacked-prs first
// must be branch or fork based if sourceRev == "" { log.Println("stacked PR from patch-based pull") s.pages.Notice(w, "pull", "Stacking is only supported on branch and fork based pull-requests.") return }
formatPatches, err := patchutil.ExtractPatches(patch) if err != nil { log.Println("failed to extract patches", err) s.pages.Notice(w, "pull", fmt.Sprintf("Failed to extract patches: %v", err)) return }
// must have atleast 1 patch to begin with if len(formatPatches) == 0 { log.Println("empty patches") s.pages.Notice(w, "pull", "No patches found in the generated format-patch.") return }
// build a stack out of this patch stackId := uuid.New() stack, err := s.newStack(r.Context(), repo, user, targetBranch, patch, pullSource, stackId.String()) if err != nil { log.Println("failed to create stack", err) s.pages.Notice(w, "pull", fmt.Sprintf("Failed to create stack: %v", err)) return }
client, err := s.oauth.AuthorizedClient(r) if err != nil { log.Println("failed to get authorized client", err) s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") return }
// apply all record creations at once var writes []*comatproto.RepoApplyWrites_Input_Writes_Elem for _, p := range stack { record := p.AsRecord() write := comatproto.RepoApplyWrites_Input_Writes_Elem{ RepoApplyWrites_Create: &comatproto.RepoApplyWrites_Create{ Collection: tangled.RepoPullNSID, Rkey: &p.Rkey, Value: &lexutil.LexiconTypeDecoder{ Val: &record, }, }, } writes = append(writes, &write) } _, err = comatproto.RepoApplyWrites(r.Context(), client, &comatproto.RepoApplyWrites_Input{ Repo: user.Did, Writes: writes, }) if err != nil { log.Println("failed to create stacked pull request", err) s.pages.Notice(w, "pull", "Failed to create stacked pull request. Try again later.") return }
// create all pulls at once tx, err := s.db.BeginTx(r.Context(), nil) if err != nil { log.Println("failed to start tx") s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") return } defer tx.Rollback()
for _, p := range stack { err = db.NewPull(tx, p) if err != nil { log.Println("failed to create pull request", err) s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") return } }
if err = tx.Commit(); err != nil { log.Println("failed to create pull request", err) s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") return }
ownerSlashRepo := reporesolver.GetBaseRepoPath(r, repo) s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls", ownerSlashRepo))}
func (s *Pulls) ValidatePatch(w http.ResponseWriter, r *http.Request) { _, err := s.repoResolver.Resolve(r) if err != nil { log.Println("failed to get repo and knot", err) return }
patch := r.FormValue("patch") if patch == "" { s.pages.Notice(w, "patch-error", "Patch is required.") return }
if err := s.validator.ValidatePatch(&patch); err != nil { s.logger.Error("faield to validate patch", "err", err) s.pages.Notice(w, "patch-error", "Invalid patch format. Please provide a valid git diff or format-patch.") return }
if patchutil.IsFormatPatch(patch) { 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.") } else { s.pages.Notice(w, "patch-preview", "Regular git-diff detected. Please provide a title and description.") }}
func (s *Pulls) PatchUploadFragment(w http.ResponseWriter, r *http.Request) { user := s.oauth.GetUser(r)
s.pages.PullPatchUploadFragment(w, pages.PullPatchUploadParams{ RepoInfo: s.repoResolver.GetRepoInfo(r, user), })}
func (s *Pulls) CompareBranchesFragment(w http.ResponseWriter, r *http.Request) { user := s.oauth.GetUser(r) f, err := s.repoResolver.Resolve(r) if err != nil { log.Println("failed to get repo and knot", err) return }
scheme := "http" if !s.config.Core.Dev { scheme = "https" } host := fmt.Sprintf("%s://%s", scheme, f.Knot) xrpcc := &indigoxrpc.Client{ Host: host, }
repo := fmt.Sprintf("%s/%s", f.Did, f.Name) xrpcBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo) if err != nil { if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { log.Println("failed to call XRPC repo.branches", xrpcerr) s.pages.Error503(w) return } log.Println("failed to fetch branches", err) return }
var result types.RepoBranchesResponse if err := json.Unmarshal(xrpcBytes, &result); err != nil { log.Println("failed to decode XRPC response", err) s.pages.Error503(w) return }
branches := result.Branches sort.Slice(branches, func(i int, j int) bool { return branches[i].Commit.Committer.When.After(branches[j].Commit.Committer.When) })
withoutDefault := []types.Branch{} for _, b := range branches { if b.IsDefault { continue } withoutDefault = append(withoutDefault, b) }
s.pages.PullCompareBranchesFragment(w, pages.PullCompareBranchesParams{ RepoInfo: s.repoResolver.GetRepoInfo(r, user), Branches: withoutDefault, })}
func (s *Pulls) CompareForksFragment(w http.ResponseWriter, r *http.Request) { user := s.oauth.GetUser(r)
forks, err := db.GetForksByDid(s.db, user.Did) if err != nil { log.Println("failed to get forks", err) return }
s.pages.PullCompareForkFragment(w, pages.PullCompareForkParams{ RepoInfo: s.repoResolver.GetRepoInfo(r, user), Forks: forks, Selected: r.URL.Query().Get("fork"), })}
func (s *Pulls) CompareForksBranchesFragment(w http.ResponseWriter, r *http.Request) { user := s.oauth.GetUser(r)
f, err := s.repoResolver.Resolve(r) if err != nil { log.Println("failed to get repo and knot", err) return }
forkVal := r.URL.Query().Get("fork") repoString := strings.SplitN(forkVal, "/", 2) forkOwnerDid := repoString[0] forkName := repoString[1] // fork repo repo, err := db.GetRepo( s.db, db.FilterEq("did", forkOwnerDid), db.FilterEq("name", forkName), ) if err != nil { log.Println("failed to get repo", "did", forkOwnerDid, "name", forkName, "err", err) return }
sourceScheme := "http" if !s.config.Core.Dev { sourceScheme = "https" } sourceHost := fmt.Sprintf("%s://%s", sourceScheme, repo.Knot) sourceXrpcc := &indigoxrpc.Client{ Host: sourceHost, }
sourceRepo := fmt.Sprintf("%s/%s", forkOwnerDid, repo.Name) sourceXrpcBytes, err := tangled.RepoBranches(r.Context(), sourceXrpcc, "", 0, sourceRepo) if err != nil { if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { log.Println("failed to call XRPC repo.branches for source", xrpcerr) s.pages.Error503(w) return } log.Println("failed to fetch source branches", err) return }
// Decode source branches var sourceBranches types.RepoBranchesResponse if err := json.Unmarshal(sourceXrpcBytes, &sourceBranches); err != nil { log.Println("failed to decode source branches XRPC response", err) s.pages.Error503(w) return }
targetScheme := "http" if !s.config.Core.Dev { targetScheme = "https" } targetHost := fmt.Sprintf("%s://%s", targetScheme, f.Knot) targetXrpcc := &indigoxrpc.Client{ Host: targetHost, }
targetRepo := fmt.Sprintf("%s/%s", f.Did, f.Name) targetXrpcBytes, err := tangled.RepoBranches(r.Context(), targetXrpcc, "", 0, targetRepo) if err != nil { if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { log.Println("failed to call XRPC repo.branches for target", xrpcerr) s.pages.Error503(w) return } log.Println("failed to fetch target branches", err) return }
// Decode target branches var targetBranches types.RepoBranchesResponse if err := json.Unmarshal(targetXrpcBytes, &targetBranches); err != nil { log.Println("failed to decode target branches XRPC response", err) s.pages.Error503(w) return }
sort.Slice(sourceBranches.Branches, func(i int, j int) bool { return sourceBranches.Branches[i].Commit.Committer.When.After(sourceBranches.Branches[j].Commit.Committer.When) })
s.pages.PullCompareForkBranchesFragment(w, pages.PullCompareForkBranchesParams{ RepoInfo: s.repoResolver.GetRepoInfo(r, user), SourceBranches: sourceBranches.Branches, TargetBranches: targetBranches.Branches, })}
func (s *Pulls) ResubmitPull(w http.ResponseWriter, r *http.Request) { user := s.oauth.GetUser(r)
pull, ok := r.Context().Value("pull").(*models.Pull) if !ok { log.Println("failed to get pull") s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.") return }
switch r.Method { case http.MethodGet: s.pages.PullResubmitFragment(w, pages.PullResubmitParams{ RepoInfo: s.repoResolver.GetRepoInfo(r, user), Pull: pull, }) return case http.MethodPost: if pull.IsPatchBased() { s.resubmitPatch(w, r) return } else if pull.IsBranchBased() { s.resubmitBranch(w, r) return } else if pull.IsForkBased() { s.resubmitFork(w, r) return } }}
func (s *Pulls) resubmitPatch(w http.ResponseWriter, r *http.Request) { user := s.oauth.GetUser(r)
pull, ok := r.Context().Value("pull").(*models.Pull) if !ok { log.Println("failed to get pull") s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.") return }
f, err := s.repoResolver.Resolve(r) if err != nil { log.Println("failed to get repo and knot", err) return }
if user.Did != pull.OwnerDid { log.Println("unauthorized user") w.WriteHeader(http.StatusUnauthorized) return }
patch := r.FormValue("patch")
s.resubmitPullHelper(w, r, f, user, pull, patch, "", "")}
func (s *Pulls) resubmitBranch(w http.ResponseWriter, r *http.Request) { user := s.oauth.GetUser(r)
pull, ok := r.Context().Value("pull").(*models.Pull) if !ok { log.Println("failed to get pull") s.pages.Notice(w, "resubmit-error", "Failed to edit patch. Try again later.") return }
f, err := s.repoResolver.Resolve(r) if err != nil { log.Println("failed to get repo and knot", err) return }
if user.Did != pull.OwnerDid { log.Println("unauthorized user") w.WriteHeader(http.StatusUnauthorized) return }
roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())} if !roles.IsPushAllowed() { log.Println("unauthorized user") w.WriteHeader(http.StatusUnauthorized) return }
scheme := "http" if !s.config.Core.Dev { scheme = "https" } host := fmt.Sprintf("%s://%s", scheme, f.Knot) xrpcc := &indigoxrpc.Client{ Host: host, }
repo := fmt.Sprintf("%s/%s", f.Did, f.Name) xrpcBytes, err := tangled.RepoCompare(r.Context(), xrpcc, repo, pull.TargetBranch, pull.PullSource.Branch) if err != nil { if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { log.Println("failed to call XRPC repo.compare", xrpcerr) s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") return } log.Printf("compare request failed: %s", err) s.pages.Notice(w, "resubmit-error", err.Error()) return }
var comparison types.RepoFormatPatchResponse if err := json.Unmarshal(xrpcBytes, &comparison); err != nil { log.Println("failed to decode XRPC compare response", err) s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") return }
sourceRev := comparison.Rev2 patch := comparison.FormatPatchRaw combined := comparison.CombinedPatchRaw
s.resubmitPullHelper(w, r, f, user, pull, patch, combined, sourceRev)}
func (s *Pulls) resubmitFork(w http.ResponseWriter, r *http.Request) { user := s.oauth.GetUser(r)
pull, ok := r.Context().Value("pull").(*models.Pull) if !ok { log.Println("failed to get pull") s.pages.Notice(w, "resubmit-error", "Failed to edit patch. Try again later.") return }
f, err := s.repoResolver.Resolve(r) if err != nil { log.Println("failed to get repo and knot", err) return }
if user.Did != pull.OwnerDid { log.Println("unauthorized user") w.WriteHeader(http.StatusUnauthorized) return }
forkRepo, err := db.GetRepoByAtUri(s.db, pull.PullSource.RepoAt.String()) if err != nil { log.Println("failed to get source repo", err) s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") return }
// update the hidden tracking branch to latest client, err := s.oauth.ServiceClient( r, oauth.WithService(forkRepo.Knot), oauth.WithLxm(tangled.RepoHiddenRefNSID), oauth.WithDev(s.config.Core.Dev), ) if err != nil { log.Printf("failed to connect to knot server: %v", err) return }
resp, err := tangled.RepoHiddenRef( r.Context(), client, &tangled.RepoHiddenRef_Input{ ForkRef: pull.PullSource.Branch, RemoteRef: pull.TargetBranch, Repo: forkRepo.RepoAt().String(), }, ) if err := xrpcclient.HandleXrpcErr(err); err != nil { s.pages.Notice(w, "resubmit-error", err.Error()) return } if !resp.Success { log.Println("Failed to update tracking ref.", "err", resp.Error) s.pages.Notice(w, "resubmit-error", "Failed to update tracking ref.") return }
hiddenRef := fmt.Sprintf("hidden/%s/%s", pull.PullSource.Branch, pull.TargetBranch) // extract patch by performing compare forkScheme := "http" if !s.config.Core.Dev { forkScheme = "https" } forkHost := fmt.Sprintf("%s://%s", forkScheme, forkRepo.Knot) forkRepoId := fmt.Sprintf("%s/%s", forkRepo.Did, forkRepo.Name) forkXrpcBytes, err := tangled.RepoCompare(r.Context(), &indigoxrpc.Client{Host: forkHost}, forkRepoId, hiddenRef, pull.PullSource.Branch) if err != nil { if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { log.Println("failed to call XRPC repo.compare for fork", xrpcerr) s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") return } log.Printf("failed to compare branches: %s", err) s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") return }
var forkComparison types.RepoFormatPatchResponse if err := json.Unmarshal(forkXrpcBytes, &forkComparison); err != nil { log.Println("failed to decode XRPC compare response for fork", err) s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") return }
// Use the fork comparison we already made comparison := forkComparison
sourceRev := comparison.Rev2 patch := comparison.FormatPatchRaw combined := comparison.CombinedPatchRaw
s.resubmitPullHelper(w, r, f, user, pull, patch, combined, sourceRev)}
func (s *Pulls) resubmitPullHelper( w http.ResponseWriter, r *http.Request, repo *models.Repo, user *oauth.User, pull *models.Pull, patch string, combined string, sourceRev string,) { if pull.IsStacked() { log.Println("resubmitting stacked PR") s.resubmitStackedPullHelper(w, r, repo, user, pull, patch, pull.StackId) return }
if err := s.validator.ValidatePatch(&patch); err != nil { s.pages.Notice(w, "resubmit-error", err.Error()) return }
if patch == pull.LatestPatch() { s.pages.Notice(w, "resubmit-error", "Patch is identical to previous submission.") return }
// validate sourceRev if branch/fork based if pull.IsBranchBased() || pull.IsForkBased() { if sourceRev == pull.LatestSha() { s.pages.Notice(w, "resubmit-error", "This branch has not changed since the last submission.") return } }
tx, err := s.db.BeginTx(r.Context(), nil) if err != nil { log.Println("failed to start tx") s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") return } defer tx.Rollback()
pullAt := pull.AtUri() newRoundNumber := len(pull.Submissions) newPatch := patch newSourceRev := sourceRev combinedPatch := combined err = db.ResubmitPull(tx, pullAt, newRoundNumber, newPatch, combinedPatch, newSourceRev) if err != nil { log.Println("failed to create pull request", err) s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") return } client, err := s.oauth.AuthorizedClient(r) if err != nil { log.Println("failed to authorize client") s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") return }
ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey) if err != nil { // failed to get record s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.") return }
var recordPullSource *tangled.RepoPull_Source if pull.IsBranchBased() { recordPullSource = &tangled.RepoPull_Source{ Branch: pull.PullSource.Branch, Sha: sourceRev, } } if pull.IsForkBased() { repoAt := pull.PullSource.RepoAt.String() recordPullSource = &tangled.RepoPull_Source{ Branch: pull.PullSource.Branch, Repo: &repoAt, Sha: sourceRev, } }
_, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ Collection: tangled.RepoPullNSID, Repo: user.Did, Rkey: pull.Rkey, SwapRecord: ex.Cid, Record: &lexutil.LexiconTypeDecoder{ Val: &tangled.RepoPull{ Title: pull.Title, Target: &tangled.RepoPull_Target{ Repo: string(repo.RepoAt()), Branch: pull.TargetBranch, }, Patch: patch, // new patch Source: recordPullSource, CreatedAt: time.Now().Format(time.RFC3339), }, }, }) if err != nil { log.Println("failed to update record", err) s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.") return }
if err = tx.Commit(); err != nil { log.Println("failed to commit transaction", err) s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull.") return }
ownerSlashRepo := reporesolver.GetBaseRepoPath(r, repo) s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", ownerSlashRepo, pull.PullId))}
func (s *Pulls) resubmitStackedPullHelper( w http.ResponseWriter, r *http.Request, repo *models.Repo, user *oauth.User, pull *models.Pull, patch string, stackId string,) { targetBranch := pull.TargetBranch
origStack, _ := r.Context().Value("stack").(models.Stack) newStack, err := s.newStack(r.Context(), repo, user, targetBranch, patch, pull.PullSource, stackId) if err != nil { log.Println("failed to create resubmitted stack", err) s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.") return }
// find the diff between the stacks, first, map them by changeId origById := make(map[string]*models.Pull) newById := make(map[string]*models.Pull) for _, p := range origStack { origById[p.ChangeId] = p } for _, p := range newStack { newById[p.ChangeId] = p }
// commits that got deleted: corresponding pull is closed // commits that got added: new pull is created // commits that got updated: corresponding pull is resubmitted & new round begins additions := make(map[string]*models.Pull) deletions := make(map[string]*models.Pull) updated := make(map[string]struct{})
// pulls in orignal stack but not in new one for _, op := range origStack { if _, ok := newById[op.ChangeId]; !ok { deletions[op.ChangeId] = op } }
// pulls in new stack but not in original one for _, np := range newStack { if _, ok := origById[np.ChangeId]; !ok { additions[np.ChangeId] = np } }
// NOTE: this loop can be written in any of above blocks, // but is written separately in the interest of simpler code for _, np := range newStack { if op, ok := origById[np.ChangeId]; ok { // pull exists in both stacks updated[op.ChangeId] = struct{}{} } }
tx, err := s.db.Begin() if err != nil { log.Println("failed to start transaction", err) s.pages.Notice(w, "pull-resubmit-error", "Failed to resubmit pull request. Try again later.") return } defer tx.Rollback()
// pds updates to make var writes []*comatproto.RepoApplyWrites_Input_Writes_Elem
// deleted pulls are marked as deleted in the DB for _, p := range deletions { // do not do delete already merged PRs if p.State == models.PullMerged { continue }
err := db.DeletePull(tx, p.RepoAt, p.PullId) if err != nil { log.Println("failed to delete pull", err, p.PullId) s.pages.Notice(w, "pull-resubmit-error", "Failed to resubmit pull request. Try again later.") return } writes = append(writes, &comatproto.RepoApplyWrites_Input_Writes_Elem{ RepoApplyWrites_Delete: &comatproto.RepoApplyWrites_Delete{ Collection: tangled.RepoPullNSID, Rkey: p.Rkey, }, }) }
// new pulls are created for _, p := range additions { err := db.NewPull(tx, p) if err != nil { log.Println("failed to create pull", err, p.PullId) s.pages.Notice(w, "pull-resubmit-error", "Failed to resubmit pull request. Try again later.") return }
record := p.AsRecord() writes = append(writes, &comatproto.RepoApplyWrites_Input_Writes_Elem{ RepoApplyWrites_Create: &comatproto.RepoApplyWrites_Create{ Collection: tangled.RepoPullNSID, Rkey: &p.Rkey, Value: &lexutil.LexiconTypeDecoder{ Val: &record, }, }, }) }
// updated pulls are, well, updated; to start a new round for id := range updated { op, _ := origById[id] np, _ := newById[id]
// do not update already merged PRs if op.State == models.PullMerged { continue }
// resubmit the new pull pullAt := op.AtUri() newRoundNumber := len(op.Submissions) newPatch := np.LatestPatch() combinedPatch := np.LatestSubmission().Combined newSourceRev := np.LatestSha() err := db.ResubmitPull(tx, pullAt, newRoundNumber, newPatch, combinedPatch, newSourceRev) if err != nil { log.Println("failed to update pull", err, op.PullId) s.pages.Notice(w, "pull-resubmit-error", "Failed to resubmit pull request. Try again later.") return }
record := np.AsRecord()
writes = append(writes, &comatproto.RepoApplyWrites_Input_Writes_Elem{ RepoApplyWrites_Update: &comatproto.RepoApplyWrites_Update{ Collection: tangled.RepoPullNSID, Rkey: op.Rkey, Value: &lexutil.LexiconTypeDecoder{ Val: &record, }, }, }) }
// update parent-change-id relations for the entire stack for _, p := range newStack { err := db.SetPullParentChangeId( tx, p.ParentChangeId, // these should be enough filters to be unique per-stack db.FilterEq("repo_at", p.RepoAt.String()), db.FilterEq("owner_did", p.OwnerDid), db.FilterEq("change_id", p.ChangeId), )
if err != nil { log.Println("failed to update pull", err, p.PullId) s.pages.Notice(w, "pull-resubmit-error", "Failed to resubmit pull request. Try again later.") return } }
err = tx.Commit() if err != nil { log.Println("failed to resubmit pull", err) s.pages.Notice(w, "pull-resubmit-error", "Failed to resubmit pull request. Try again later.") return }
client, err := s.oauth.AuthorizedClient(r) if err != nil { log.Println("failed to authorize client") s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") return }
_, err = comatproto.RepoApplyWrites(r.Context(), client, &comatproto.RepoApplyWrites_Input{ Repo: user.Did, Writes: writes, }) if err != nil { log.Println("failed to create stacked pull request", err) s.pages.Notice(w, "pull", "Failed to create stacked pull request. Try again later.") return }
ownerSlashRepo := reporesolver.GetBaseRepoPath(r, repo) s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", ownerSlashRepo, pull.PullId))}
func (s *Pulls) MergePull(w http.ResponseWriter, r *http.Request) { user := s.oauth.GetUser(r) f, err := s.repoResolver.Resolve(r) if err != nil { log.Println("failed to resolve repo:", err) s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.") return }
pull, ok := r.Context().Value("pull").(*models.Pull) if !ok { log.Println("failed to get pull") s.pages.Notice(w, "pull-merge-error", "Failed to merge patch. Try again later.") return }
var pullsToMerge models.Stack pullsToMerge = append(pullsToMerge, pull) if pull.IsStacked() { stack, ok := r.Context().Value("stack").(models.Stack) if !ok { log.Println("failed to get stack") s.pages.Notice(w, "pull-merge-error", "Failed to merge patch. Try again later.") return }
// combine patches of substack subStack := stack.StrictlyBelow(pull) // collect the portion of the stack that is mergeable mergeable := subStack.Mergeable() // add to total patch pullsToMerge = append(pullsToMerge, mergeable...) }
patch := pullsToMerge.CombinedPatch()
ident, err := s.idResolver.ResolveIdent(r.Context(), pull.OwnerDid) if err != nil { log.Printf("resolving identity: %s", err) w.WriteHeader(http.StatusNotFound) return }
email, err := db.GetPrimaryEmail(s.db, pull.OwnerDid) if err != nil { log.Printf("failed to get primary email: %s", err) }
authorName := ident.Handle.String() mergeInput := &tangled.RepoMerge_Input{ Did: f.Did, Name: f.Name, Branch: pull.TargetBranch, Patch: patch, CommitMessage: &pull.Title, AuthorName: &authorName, }
if pull.Body != "" { mergeInput.CommitBody = &pull.Body }
if email.Address != "" { mergeInput.AuthorEmail = &email.Address }
client, err := s.oauth.ServiceClient( r, oauth.WithService(f.Knot), oauth.WithLxm(tangled.RepoMergeNSID), oauth.WithDev(s.config.Core.Dev), ) if err != nil { log.Printf("failed to connect to knot server: %v", err) s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.") return }
err = tangled.RepoMerge(r.Context(), client, mergeInput) if err := xrpcclient.HandleXrpcErr(err); err != nil { s.pages.Notice(w, "pull-merge-error", err.Error()) return }
tx, err := s.db.Begin() if err != nil { log.Println("failed to start transcation", err) s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.") return } defer tx.Rollback()
for _, p := range pullsToMerge { err := db.MergePull(tx, f.RepoAt(), p.PullId) if err != nil { log.Printf("failed to update pull request status in database: %s", err) s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.") return } p.State = models.PullMerged }
err = tx.Commit() if err != nil { // TODO: this is unsound, we should also revert the merge from the knotserver here log.Printf("failed to update pull request status in database: %s", err) s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.") return }
// notify about the pull merge for _, p := range pullsToMerge { s.notifier.NewPullState(r.Context(), syntax.DID(user.Did), p) }
ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f) s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", ownerSlashRepo, pull.PullId))}
func (s *Pulls) ClosePull(w http.ResponseWriter, r *http.Request) { user := s.oauth.GetUser(r)
f, err := s.repoResolver.Resolve(r) if err != nil { log.Println("malformed middleware") return }
pull, ok := r.Context().Value("pull").(*models.Pull) if !ok { log.Println("failed to get pull") s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.") return }
// auth filter: only owner or collaborators can close roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())} isOwner := roles.IsOwner() isCollaborator := roles.IsCollaborator() isPullAuthor := user.Did == pull.OwnerDid isCloseAllowed := isOwner || isCollaborator || isPullAuthor if !isCloseAllowed { log.Println("failed to close pull") s.pages.Notice(w, "pull-close", "You are unauthorized to close this pull.") return }
// Start a transaction tx, err := s.db.BeginTx(r.Context(), nil) if err != nil { log.Println("failed to start transaction", err) s.pages.Notice(w, "pull-close", "Failed to close pull.") return } defer tx.Rollback()
var pullsToClose []*models.Pull pullsToClose = append(pullsToClose, pull)
// if this PR is stacked, then we want to close all PRs below this one on the stack if pull.IsStacked() { stack := r.Context().Value("stack").(models.Stack) subStack := stack.StrictlyBelow(pull) pullsToClose = append(pullsToClose, subStack...) }
for _, p := range pullsToClose { // Close the pull in the database err = db.ClosePull(tx, f.RepoAt(), p.PullId) if err != nil { log.Println("failed to close pull", err) s.pages.Notice(w, "pull-close", "Failed to close pull.") return } p.State = models.PullClosed }
// Commit the transaction if err = tx.Commit(); err != nil { log.Println("failed to commit transaction", err) s.pages.Notice(w, "pull-close", "Failed to close pull.") return }
for _, p := range pullsToClose { s.notifier.NewPullState(r.Context(), syntax.DID(user.Did), p) }
ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f) s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", ownerSlashRepo, pull.PullId))}
func (s *Pulls) ReopenPull(w http.ResponseWriter, r *http.Request) { user := s.oauth.GetUser(r)
f, err := s.repoResolver.Resolve(r) if err != nil { log.Println("failed to resolve repo", err) s.pages.Notice(w, "pull-reopen", "Failed to reopen pull.") return }
pull, ok := r.Context().Value("pull").(*models.Pull) if !ok { log.Println("failed to get pull") s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.") return }
// auth filter: only owner or collaborators can close roles := repoinfo.RolesInRepo{Roles: s.enforcer.GetPermissionsInRepo(user.Did, f.Knot, f.DidSlashRepo())} isOwner := roles.IsOwner() isCollaborator := roles.IsCollaborator() isPullAuthor := user.Did == pull.OwnerDid isCloseAllowed := isOwner || isCollaborator || isPullAuthor if !isCloseAllowed { log.Println("failed to close pull") s.pages.Notice(w, "pull-close", "You are unauthorized to close this pull.") return }
// Start a transaction tx, err := s.db.BeginTx(r.Context(), nil) if err != nil { log.Println("failed to start transaction", err) s.pages.Notice(w, "pull-reopen", "Failed to reopen pull.") return } defer tx.Rollback()
var pullsToReopen []*models.Pull pullsToReopen = append(pullsToReopen, pull)
// if this PR is stacked, then we want to reopen all PRs above this one on the stack if pull.IsStacked() { stack := r.Context().Value("stack").(models.Stack) subStack := stack.StrictlyAbove(pull) pullsToReopen = append(pullsToReopen, subStack...) }
for _, p := range pullsToReopen { // Close the pull in the database err = db.ReopenPull(tx, f.RepoAt(), p.PullId) if err != nil { log.Println("failed to close pull", err) s.pages.Notice(w, "pull-close", "Failed to close pull.") return } p.State = models.PullOpen }
// Commit the transaction if err = tx.Commit(); err != nil { log.Println("failed to commit transaction", err) s.pages.Notice(w, "pull-reopen", "Failed to reopen pull.") return }
for _, p := range pullsToReopen { s.notifier.NewPullState(r.Context(), syntax.DID(user.Did), p) }
ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f) s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", ownerSlashRepo, pull.PullId))}
func (s *Pulls) newStack(ctx context.Context, repo *models.Repo, user *oauth.User, targetBranch, patch string, pullSource *models.PullSource, stackId string) (models.Stack, error) { formatPatches, err := patchutil.ExtractPatches(patch) if err != nil { return nil, fmt.Errorf("Failed to extract patches: %v", err) }
// must have atleast 1 patch to begin with if len(formatPatches) == 0 { return nil, fmt.Errorf("No patches found in the generated format-patch.") }
// the stack is identified by a UUID var stack models.Stack parentChangeId := "" for _, fp := range formatPatches { // all patches must have a jj change-id changeId, err := fp.ChangeId() if err != nil { return nil, fmt.Errorf("Stacking is only supported if all patches contain a change-id commit header.") }
title := fp.Title body := fp.Body rkey := tid.TID()
mentions, references := s.refResolver.Resolve(ctx, body)
initialSubmission := models.PullSubmission{ Patch: fp.Raw, SourceRev: fp.SHA, Combined: fp.Raw, } pull := models.Pull{ Title: title, Body: body, TargetBranch: targetBranch, OwnerDid: user.Did, RepoAt: repo.RepoAt(), Rkey: rkey, Mentions: mentions, References: references, Submissions: []*models.PullSubmission{ &initialSubmission, }, PullSource: pullSource, Created: time.Now(),
StackId: stackId, ChangeId: changeId, ParentChangeId: parentChangeId, }
stack = append(stack, &pull)
parentChangeId = changeId }
return stack, nil}