Something went wrong. Try again.
Monorepo for Tangled forked from tangled.org/core
Something went wrong. Try again.
Go
12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562156315641565156615671568156915701571157215731574157515761577157815791580158115821583158415851586158715881589159015911592159315941595159615971598159916001601160216031604160516061607160816091610161116121613161416151616161716181619162016211622162316241625162616271628162916301631163216331634163516361637163816391640164116421643164416451646164716481649165016511652165316541655165616571658165916601661166216631664166516661667166816691670167116721673167416751676167716781679168016811682168316841685168616871688168916901691169216931694169516961697169816991700170117021703170417051706170717081709171017111712171317141715171617171718171917201721172217231724172517261727172817291730173117321733173417351736173717381739174017411742174317441745174617471748174917501751175217531754175517561757175817591760176117621763176417651766176717681769177017711772177317741775177617771778177917801781178217831784178517861787178817891790179117921793179417951796179717981799180018011802180318041805180618071808180918101811181218131814181518161817181818191820182118221823182418251826182718281829183018311832183318341835183618371838183918401841184218431844184518461847184818491850185118521853185418551856185718581859186018611862186318641865186618671868186918701871187218731874187518761877187818791880188118821883188418851886188718881889189018911892189318941895189618971898189919001901190219031904190519061907190819091910191119121913191419151916191719181919192019211922192319241925192619271928192919301931193219331934193519361937193819391940194119421943194419451946194719481949195019511952195319541955195619571958195919601961196219631964196519661967196819691970197119721973197419751976197719781979198019811982198319841985198619871988198919901991199219931994199519961997199819992000200120022003200420052006200720082009201020112012201320142015201620172018201920202021202220232024202520262027202820292030203120322033203420352036203720382039204020412042204320442045204620472048204920502051205220532054205520562057205820592060206120622063206420652066206720682069207020712072207320742075207620772078207920802081208220832084208520862087208820892090209120922093209420952096209720982099210021012102210321042105210621072108210921102111211221132114211521162117211821192120212121222123212421252126212721282129213021312132213321342135213621372138213921402141214221432144214521462147214821492150215121522153215421552156215721582159216021612162216321642165216621672168216921702171217221732174217521762177217821792180218121822183218421852186218721882189219021912192219321942195219621972198219922002201220222032204220522062207220822092210221122122213221422152216221722182219222022212222222322242225222622272228222922302231223222332234223522362237223822392240224122422243224422452246224722482249225022512252225322542255225622572258225922602261226222632264226522662267226822692270227122722273227422752276227722782279228022812282228322842285228622872288228922902291229222932294229522962297229822992300230123022303230423052306230723082309231023112312231323142315231623172318231923202321232223232324232523262327232823292330233123322333233423352336233723382339234023412342234323442345234623472348234923502351package pulls
import ( "database/sql" "encoding/json" "errors" "fmt" "log" "net/http" "sort" "strconv" "strings" "time"
"tangled.org/core/api/tangled" "tangled.org/core/appview/config" "tangled.org/core/appview/db" "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/reporesolver" "tangled.org/core/appview/xrpcclient" "tangled.org/core/idresolver" "tangled.org/core/patchutil" "tangled.org/core/tid" "tangled.org/core/types"
"github.com/bluekeyes/go-gitdiff/gitdiff" comatproto "github.com/bluesky-social/indigo/api/atproto" 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 db *db.DB config *config.Config notifier notify.Notifier}
func New( oauth *oauth.OAuth, repoResolver *reporesolver.RepoResolver, pages *pages.Pages, resolver *idresolver.Resolver, db *db.DB, config *config.Config, notifier notify.Notifier,) *Pulls { return &Pulls{ oauth: oauth, repoResolver: repoResolver, pages: pages, idResolver: resolver, db: db, config: config, notifier: notifier, }}
// 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) resubmitResult := pages.Unknown if user.Did == pull.OwnerDid { resubmitResult = s.resubmitCheck(r, f, pull, stack) }
s.pages.PullActionsFragment(w, pages.PullActionsParams{ LoggedInUser: user, RepoInfo: f.RepoInfo(user), Pull: pull, RoundNumber: roundNumber, MergeCheck: mergeCheckResponse, ResubmitCheck: resubmitResult, 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 }
// can be nil if this pull is not stacked stack, _ := r.Context().Value("stack").(models.Stack) abandonedPulls, _ := r.Context().Value("abandonedPulls").([]*models.Pull)
totalIdents := 1 for _, submission := range pull.Submissions { totalIdents += len(submission.Comments) }
identsToResolve := make([]string, totalIdents)
// populate idents identsToResolve[0] = pull.OwnerDid idx := 1 for _, submission := range pull.Submissions { for _, comment := range submission.Comments { identsToResolve[idx] = comment.OwnerDid idx += 1 } }
mergeCheckResponse := s.mergeCheck(r, f, pull, stack) resubmitResult := pages.Unknown if user != nil && user.Did == pull.OwnerDid { resubmitResult = s.resubmitCheck(r, f, pull, stack) }
repoInfo := f.RepoInfo(user)
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, db.FilterEq("repo_owner", repoInfo.OwnerDid), db.FilterEq("repo_name", repoInfo.Name), db.FilterEq("knot", repoInfo.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 }
reactionCountMap, err := db.GetReactionCountMap(s.db, pull.PullAt()) 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.PullAt()) }
s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{ LoggedInUser: user, RepoInfo: repoInfo, Pull: pull, Stack: stack, AbandonedPulls: abandonedPulls, MergeCheck: mergeCheckResponse, ResubmitCheck: resubmitResult, Pipelines: m,
OrderedReactionKinds: models.OrderedReactionKinds, Reactions: reactionCountMap, UserReacted: userReactions, })}
func (s *Pulls) mergeCheck(r *http.Request, f *reporesolver.ResolvedRepo, 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.OwnerDid(), 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) resubmitCheck(r *http.Request, f *reporesolver.ResolvedRepo, 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 = f.Knot ownerDid = f.OwnerDid() repoName = f.Name }
scheme := "http" if !s.config.Core.Dev { scheme = "https" } host := fmt.Sprintf("%s://%s", scheme, knot) xrpcc := &indigoxrpc.Client{ Host: host, }
repo := fmt.Sprintf("%s/%s", ownerDid, repoName) branchResp, err := tangled.RepoBranch(r.Context(), xrpcc, pull.PullSource.Branch, repo) 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.Submissions[pull.LastRoundNumber()].SourceRev
if pull.IsStacked() && stack != nil { top := stack[0] latestSourceRev = top.Submissions[top.LastRoundNumber()].SourceRev }
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) f, err := s.repoResolver.Resolve(r) if err != nil { log.Println("failed to get repo and knot", err) return }
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].Patch diff := patchutil.AsNiceDiff(patch, pull.TargetBranch)
s.pages.RepoPullPatchPage(w, pages.RepoPullPatchParams{ LoggedInUser: user, RepoInfo: f.RepoInfo(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)
f, err := s.repoResolver.Resolve(r) if err != nil { log.Println("failed to get repo and knot", err) return }
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].Patch) 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].Patch) 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: f.RepoInfo(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) { 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 }
pulls, err := db.GetPulls( s.db, db.FilterEq("repo_at", f.RepoAt()), db.FilterEq("state", state), ) 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]
repoInfo := f.RepoInfo(user) ps, err := db.GetPipelineStatuses( s.db, db.FilterEq("repo_owner", repoInfo.OwnerDid), db.FilterEq("repo_name", repoInfo.Name), db.FilterEq("knot", repoInfo.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 }
s.pages.RepoPulls(w, pages.RepoPullsParams{ LoggedInUser: s.oauth.GetUser(r), RepoInfo: f.RepoInfo(user), Pulls: pulls, FilteringBy: state, 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: f.RepoInfo(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 }
// 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)
pullAt, err := db.GetPullAt(s.db, f.RepoAt(), pull.PullId) if err != nil { log.Println("failed to get pull at", err) s.pages.Notice(w, "pull-comment", "Failed to create comment.") return }
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 := client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ Collection: tangled.RepoPullCommentNSID, Repo: user.Did, Rkey: tid.TID(), Record: &lexutil.LexiconTypeDecoder{ Val: &tangled.RepoPullComment{ Pull: string(pullAt), 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, }
// 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)
s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d#comment-%d", f.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.OwnerDid(), 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: f.RepoInfo(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 isPushAllowed := f.RepoInfo(user).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, f *reporesolver.ResolvedRepo, 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, f.Knot) xrpcc := &indigoxrpc.Client{ Host: host, }
repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name) xrpcBytes, err := tangled.RepoCompare(r.Context(), xrpcc, repo, 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.Patch
if !patchutil.IsPatchValid(patch) { 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, f, user, title, body, targetBranch, patch, sourceRev, pullSource, recordPullSource, isStacked)}
func (s *Pulls) handlePatchBasedPull(w http.ResponseWriter, r *http.Request, f *reporesolver.ResolvedRepo, user *oauth.User, title, body, targetBranch, patch string, isStacked bool) { if !patchutil.IsPatchValid(patch) { s.pages.Notice(w, "pull", "Invalid patch format. Please provide a valid diff.") return }
s.createPullRequest(w, r, f, user, title, body, targetBranch, patch, "", nil, nil, isStacked)}
func (s *Pulls) handleForkBasedPull(w http.ResponseWriter, r *http.Request, f *reporesolver.ResolvedRepo, 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.Patch
if !patchutil.IsPatchValid(patch) { 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, f, user, title, body, targetBranch, patch, sourceRev, pullSource, recordPullSource, isStacked)}
func (s *Pulls) createPullRequest( w http.ResponseWriter, r *http.Request, f *reporesolver.ResolvedRepo, user *oauth.User, title, body, targetBranch string, patch 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, f, 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 == "" { 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 }
title = formatPatches[0].Title body = formatPatches[0].Body }
rkey := tid.TID() initialSubmission := models.PullSubmission{ Patch: patch, SourceRev: sourceRev, } pull := &models.Pull{ Title: title, Body: body, TargetBranch: targetBranch, OwnerDid: user.Did, RepoAt: f.RepoAt(), Rkey: rkey, 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, f.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 = client.RepoPutRecord(r.Context(), &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(f.RepoAt()), Branch: targetBranch, }, Patch: patch, Source: recordPullSource, }, }, }) 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)
s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pullId))}
func (s *Pulls) createStackedPullRequest( w http.ResponseWriter, r *http.Request, f *reporesolver.ResolvedRepo, 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 := newStack(f, 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 = client.RepoApplyWrites(r.Context(), &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 }
s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls", f.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 patch == "" || !patchutil.IsPatchValid(patch) { 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) f, err := s.repoResolver.Resolve(r) if err != nil { log.Println("failed to get repo and knot", err) return }
s.pages.PullPatchUploadFragment(w, pages.PullPatchUploadParams{ RepoInfo: f.RepoInfo(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.OwnerDid(), 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: f.RepoInfo(user), Branches: withoutDefault, })}
func (s *Pulls) CompareForksFragment(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 }
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: f.RepoInfo(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.OwnerDid(), 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: f.RepoInfo(user), SourceBranches: sourceBranches.Branches, TargetBranches: targetBranches.Branches, })}
func (s *Pulls) ResubmitPull(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 }
switch r.Method { case http.MethodGet: s.pages.PullResubmitFragment(w, pages.PullResubmitParams{ RepoInfo: f.RepoInfo(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 }
if !f.RepoInfo(user).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.OwnerDid(), 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.Patch
s.resubmitPullHelper(w, r, f, user, pull, patch, 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 }
// 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, pull.TargetBranch, 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 }
// 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 }
// Use the fork comparison we already made comparison := forkComparison
sourceRev := comparison.Rev2 patch := comparison.Patch
s.resubmitPullHelper(w, r, f, user, pull, patch, sourceRev)}
// validate a resubmission against a pull requestfunc validateResubmittedPatch(pull *models.Pull, patch string) error { if patch == "" { return fmt.Errorf("Patch is empty.") }
if patch == pull.LatestPatch() { return fmt.Errorf("Patch is identical to previous submission.") }
if !patchutil.IsPatchValid(patch) { return fmt.Errorf("Invalid patch format. Please provide a valid diff.") }
return nil}
func (s *Pulls) resubmitPullHelper( w http.ResponseWriter, r *http.Request, f *reporesolver.ResolvedRepo, user *oauth.User, pull *models.Pull, patch string, sourceRev string,) { if pull.IsStacked() { log.Println("resubmitting stacked PR") s.resubmitStackedPullHelper(w, r, f, user, pull, patch, pull.StackId) return }
if err := validateResubmittedPatch(pull, patch); err != nil { s.pages.Notice(w, "resubmit-error", err.Error()) return }
// validate sourceRev if branch/fork based if pull.IsBranchBased() || pull.IsForkBased() { if sourceRev == pull.Submissions[pull.LastRoundNumber()].SourceRev { 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()
err = db.ResubmitPull(tx, pull, patch, sourceRev) 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 := client.RepoGetRecord(r.Context(), "", 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 = client.RepoPutRecord(r.Context(), &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(f.RepoAt()), Branch: pull.TargetBranch, }, Patch: patch, // new patch Source: recordPullSource, }, }, }) 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 }
s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId))}
func (s *Pulls) resubmitStackedPullHelper( w http.ResponseWriter, r *http.Request, f *reporesolver.ResolvedRepo, user *oauth.User, pull *models.Pull, patch string, stackId string,) { targetBranch := pull.TargetBranch
origStack, _ := r.Context().Value("stack").(models.Stack) newStack, err := newStack(f, 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 // // for commits that were unchanged: no changes, parent-change-id is updated as necessary additions := make(map[string]*models.Pull) deletions := make(map[string]*models.Pull) unchanged := make(map[string]struct{}) 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 // TODO: can we avoid reparse? origFiles, origHeaderStr, _ := gitdiff.Parse(strings.NewReader(op.LatestPatch())) newFiles, newHeaderStr, _ := gitdiff.Parse(strings.NewReader(np.LatestPatch()))
origHeader, _ := gitdiff.ParsePatchHeader(origHeaderStr) newHeader, _ := gitdiff.ParsePatchHeader(newHeaderStr)
patchutil.SortPatch(newFiles) patchutil.SortPatch(origFiles)
// text content of patch may be identical, but a jj rebase might have forwarded it // // we still need to update the hash in submission.Patch and submission.SourceRev if patchutil.Equal(newFiles, origFiles) && origHeader.Title == newHeader.Title && origHeader.Body == newHeader.Body { unchanged[op.ChangeId] = struct{}{} } else { 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 }
submission := np.Submissions[np.LastRoundNumber()]
// resubmit the old pull err := db.ResubmitPull(tx, op, submission.Patch, submission.SourceRev)
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 := op.AsRecord() record.Patch = submission.Patch
writes = append(writes, &comatproto.RepoApplyWrites_Input_Writes_Elem{ RepoApplyWrites_Update: &comatproto.RepoApplyWrites_Update{ Collection: tangled.RepoPullNSID, Rkey: op.Rkey, Value: &lexutil.LexiconTypeDecoder{ Val: &record, }, }, }) }
// unchanged pulls are edited without starting a new round // // update source-revs & patches without advancing rounds for changeId := range unchanged { op, _ := origById[changeId] np, _ := newById[changeId]
origSubmission := op.Submissions[op.LastRoundNumber()] newSubmission := np.Submissions[np.LastRoundNumber()]
log.Println("moving unchanged change id : ", changeId)
err := db.UpdatePull( tx, newSubmission.Patch, newSubmission.SourceRev, db.FilterEq("id", origSubmission.ID), )
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 := op.AsRecord() record.Patch = newSubmission.Patch
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 = client.RepoApplyWrites(r.Context(), &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 }
s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId))}
func (s *Pulls) MergePull(w http.ResponseWriter, r *http.Request) { 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.OwnerDid(), 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 } }
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.NewPullMerged(r.Context(), p) }
s.pages.HxLocation(w, fmt.Sprintf("/@%s/%s/pulls/%d", f.OwnerHandle(), f.Name, 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 := f.RolesInRepo(user) 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 } }
// 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.NewPullClosed(r.Context(), p) }
s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.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 := f.RolesInRepo(user) 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 } }
// 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 }
s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId))}
func newStack(f *reporesolver.ResolvedRepo, 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()
initialSubmission := models.PullSubmission{ Patch: fp.Raw, SourceRev: fp.SHA, } pull := models.Pull{ Title: title, Body: body, TargetBranch: targetBranch, OwnerDid: user.Did, RepoAt: f.RepoAt(), Rkey: rkey, Submissions: []*models.PullSubmission{ &initialSubmission, }, PullSource: pullSource, Created: time.Now(),
StackId: stackId, ChangeId: changeId, ParentChangeId: parentChangeId, }
stack = append(stack, &pull)
parentChangeId = changeId }
return stack, nil}