interdiff of round #1 and #0 · pull #490 · tangled.org/core

ERROR

appview/db/repos.go

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/repo/pulls/fragments/pullCompareForks.html

Failed to calculate interdiff for this file.

NEW

appview/pulls/pulls.go

···

       852
        
       }

     

       853
        
       

     

       854
        
       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) {

     

       855
       -
       	fork, err := db.GetForkByDid(s.db, user.Did, forkRepo)

     

       0
        
       
     

       856
        
       	if errors.Is(err, sql.ErrNoRows) {

     

       857
        
       		s.pages.Notice(w, "pull", "No such fork.")

     

       858
        
       		return

     
···

       1269
        
       	}

     

       1270
        
       

     

       1271
        
       	forkVal := r.URL.Query().Get("fork")

     

       1272
       -
       

     

       1273
        
       	// fork repo

     

       1274
       -
       	repo, err := db.GetRepo(s.db, user.Did, forkVal)

     

       1275
        
       	if err != nil {

     

       1276
        
       		log.Println("failed to get repo", user.Did, forkVal)

     

       1277
        
       		return

···

       852
        
       }

     

       853
        
       

     

       854
        
       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) {

     

       855
       +
       	splits := strings.SplitN(forkRepo, "/", 2)

     

       856
       +
       	fork, err := db.GetForkByDid(s.db, splits[0], splits[1])

     

       857
        
       	if errors.Is(err, sql.ErrNoRows) {

     

       858
        
       		s.pages.Notice(w, "pull", "No such fork.")

     

       859
        
       		return

     
···

       1270
        
       	}

     

       1271
        
       

     

       1272
        
       	forkVal := r.URL.Query().Get("fork")

     

       1273
       +
       	split := strings.SplitN(forkVal, "/", 2)

     

       1274
        
       	// fork repo

     

       1275
       +
       	repo, err := db.GetRepo(s.db, split[0], split[1])

     

       1276
        
       	if err != nil {

     

       1277
        
       		log.Println("failed to get repo", user.Did, forkVal)

     

       1278
        
       		return