refactor & fix

Author: 6543

modules/git/repo_branch.go

@@ -150,6 +150,7 @@ func (repo *Repository) CreateBranch(branch, oldbranchOrCommit string) error {
 
 // AddRemote adds a new remote to repository.
 func (repo *Repository) AddRemote(name, url string, fetch bool) error {
+	// TODO validate url
 	cmd := NewCommandContext(repo.Ctx, "remote", "add")
 	if fetch {
 		cmd.AddArguments("-f")

routers/web/explore/repo.go

@@ -13,7 +13,6 @@ import (
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/setting"
-	"code.gitea.io/gitea/modules/util"
 )
 
 const (

services/migrations/gitea_uploader.go

@@ -9,6 +9,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
@@ -656,10 +657,25 @@ func (g *GiteaLocalUploader) newPullRequest(pr *base.PullRequest) (*models.PullR
 	if pr.IsForkPullRequest() && pr.State != "closed" {
 		if pr.Head.OwnerName != "" {
 			remote := pr.Head.OwnerName
-			_, ok := g.prHeadCache[remote]
+			ref := pr.Head.Ref
+			cloneURL := pr.Head.CloneURL
+			ok := false
+
+			ref = strings.ReplaceAll(strings.ReplaceAll(ref, " ", ""), "'", "")
+			_, err := url.Parse(remote)
+			if err != nil {
+				remote = ""
+			}
+			_, err = url.Parse(cloneURL)
+			if err != nil {
+				cloneURL = ""
+			}
+			// TODO: lint remote & ref
+
+			_, ok = g.prHeadCache[remote]
 			if !ok {
 				// git remote add
-				err := g.gitRepo.AddRemote(remote, pr.Head.CloneURL, true)
+				err := g.gitRepo.AddRemote(remote, cloneURL, true)
 				if err != nil {
 					log.Error("AddRemote failed: %s", err)
 				} else {
@@ -669,11 +685,11 @@ func (g *GiteaLocalUploader) newPullRequest(pr *base.PullRequest) (*models.PullR
 			}
 
 			if ok {
-				_, err = git.NewCommand("fetch", remote, pr.Head.Ref).RunInDir(g.repo.RepoPath())
+				_, err = git.NewCommandContext(g.ctx, "fetch", remote, ref).RunInDir(g.repo.RepoPath())
 				if err != nil {
-					log.Error("Fetch branch from %s failed: %v", pr.Head.CloneURL, err)
+					log.Error("Fetch branch from %s failed: %v", cloneURL, err)
 				} else {
-					headBranch := filepath.Join(g.repo.RepoPath(), "refs", "heads", pr.Head.OwnerName, pr.Head.Ref)
+					headBranch := filepath.Join(g.repo.RepoPath(), "refs", "heads", remote, ref)
 					if err := os.MkdirAll(filepath.Dir(headBranch), os.ModePerm); err != nil {
 						return nil, err
 					}
@@ -686,7 +702,7 @@ func (g *GiteaLocalUploader) newPullRequest(pr *base.PullRequest) (*models.PullR
 					if err != nil {
 						return nil, err
 					}
-					head = pr.Head.OwnerName + "/" + pr.Head.Ref
+					head = remote + "/" + ref
 				}
 			}
 		}