Merge branch 'main' into lunny/add_reply_code_review

modules/task/pull_checkout.go

@@ -4,6 +4,7 @@
 package task
 
 import (
+	stdctx "context"
 	"encoding/base64"
 	"fmt"
 	"os"
@@ -11,17 +12,16 @@ import (
 	"strconv"
 	"strings"
 
-	"code.gitea.io/sdk/gitea"
-	"code.gitea.io/tea/modules/config"
-	local_git "code.gitea.io/tea/modules/git"
-	"code.gitea.io/tea/modules/utils"
+	gitea "gitea.dev/sdk"
 
-	"github.com/go-git/go-git/v5"
-	git_plumbing "github.com/go-git/go-git/v5/plumbing"
+	"gitea.dev/tea/modules/config"
+	local_git "gitea.dev/tea/modules/git"
+	"gitea.dev/tea/modules/utils"
 )
 
 // PullCheckout checkout current workdir to the head branch of specified pull request
 func PullCheckout(
+	ctx stdctx.Context,
 	login *config.Login,
 	repoOwner, repoName string,
 	forceCreateBranch bool,
@@ -29,7 +29,7 @@ func PullCheckout(
 	callback func(string) (string, error),
 ) error {
 	client := login.Client()
-	pr, _, err := client.GetPullRequest(repoOwner, repoName, index)
+	pr, _, err := client.PullRequests.GetPullRequest(ctx, repoOwner, repoName, index)
 	if err != nil {
 		return fmt.Errorf("couldn't fetch PR: %s", err)
 	}
@@ -80,7 +80,7 @@ func doPRFetch(
 	login *config.Login,
 	pr *gitea.PullRequest,
 	localRepo *local_git.TeaRepo,
-	localRemote *git.Remote,
+	localRemote *local_git.Remote,
 	callback func(string) (string, error),
 ) (string, error) {
 	_ = callback
@@ -90,6 +90,10 @@ func doPRFetch(
 	if err != nil {
 		return "", err
 	}
+	auth, err := local_git.GetAuthForURL(url, login.GetAccessToken(), login.SSHKey, callback)
+	if err != nil {
+		return "", err
+	}
 	refspecs := []string{}
 	if isRemoteDeleted(pr) {
 		// When the head branch is already deleted, pr.Head.Ref points to
@@ -97,15 +101,15 @@ func doPRFetch(
 		// This ref must be fetched explicitly, and does not allow pushing, so we use it
 		// only in this case as fallback.
 		localBranchName = fmt.Sprintf("pulls/%d", pr.Index)
-		refspecs = append(refspecs, fmt.Sprintf("%s:refs/remotes/%s/%s",
+		refspecs = []string{fmt.Sprintf("%s:refs/remotes/%s/%s",
 			pr.Head.Ref,
 			localRemoteName,
 			localBranchName,
-		))
+		)}
 	}
 	fmt.Printf("Fetching PR %v (head %s:%s) from remote '%s'\n", pr.Index, url, pr.Head.Ref, localRemoteName)
 
-	err = runGitFetch(localRemoteName, url.String(), login.GetAccessToken(), login.SSHKey, refspecs...)
+	err = localRepo.Fetch(localRemoteName, refspecs, auth)
 	if err != nil {
 		return "", err
 	}
@@ -122,12 +126,12 @@ func doPRCheckout(
 ) error {
 	// determine the ref to checkout, depending on existence of a matching commit on a local branch
 	var info string
-	var checkoutRef git_plumbing.ReferenceName
+	var checkoutRef local_git.ReferenceName
 
 	if b, _ := localRepo.TeaFindBranchBySha(pr.Head.Sha, remoteURL); b != nil {
 
 		// if a matching branch exists, use that
-		checkoutRef = git_plumbing.NewBranchReferenceName(b.Name)
+		checkoutRef = local_git.NewBranchReferenceName(b.Name)
 		info = fmt.Sprintf("Found matching local branch %s, checking it out", checkoutRef.Short())
 
 	} else if forceCreateBranch {
@@ -137,10 +141,10 @@ func doPRCheckout(
 		if isRemoteDeleted(pr) {
 			localBranchName += "-" + pr.Head.Ref
 		}
-		checkoutRef = git_plumbing.NewBranchReferenceName(localBranchName)
+		checkoutRef = local_git.NewBranchReferenceName(localBranchName)
 		if err := localRepo.TeaCreateBranch(localBranchName, localRemoteBranchName, localRemoteName); err == nil {
 			info = fmt.Sprintf("Created branch '%s'\n", localBranchName)
-		} else if err == git.ErrBranchExists {
+		} else if err == local_git.ErrBranchExists {
 			info = "There may be changes since you last checked out, run `git pull` to get them."
 		} else {
 			return err
@@ -149,7 +153,7 @@ func doPRCheckout(
 	} else {
 
 		// use the remote tracking branch
-		checkoutRef = git_plumbing.NewRemoteReferenceName(localRemoteName, localRemoteBranchName)
+		checkoutRef = local_git.NewRemoteReferenceName(localRemoteName, localRemoteBranchName)
 		info = fmt.Sprintf(
 			"Checking out remote tracking branch %s. To make changes, create a new branch:\n  git checkout %s",
 			checkoutRef.String(), localRemoteBranchName)