test

Author: wxiaoguang

Makefile

@@ -581,7 +581,7 @@ generate-ini-mssql:
 
 .PHONY: test-mssql
 test-mssql: integrations.mssql.test generate-ini-mssql
-	GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mssql.ini ./integrations.mssql.test
+	GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mssql.ini ./integrations.mssql.test -test.v
 
 .PHONY: test-mssql\#%
 test-mssql\#%: integrations.mssql.test generate-ini-mssql

services/automerge/automerge.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"os"
 	"strconv"
 	"strings"
 
@@ -155,6 +156,11 @@ func getPullRequestsByHeadSHA(ctx context.Context, sha string, repo *repo_model.
 
 // handlePullRequestAutoMerge merge the pull request if all checks are successful
 func handlePullRequestAutoMerge(pullID int64, sha string) {
+	defer func() {
+		if r := recover(); r != nil {
+			fmt.Fprintf(os.Stdout, "panic: %v\n%s", r, log.Stack(2))
+		}
+	}()
 	ctx, _, finished := process.GetManager().AddContext(graceful.GetManager().HammerContext(),
 		fmt.Sprintf("Handle AutoMerge of PR[%d] with sha[%s]", pullID, sha))
 	defer finished()

services/automergequeue/automergequeue.go

@@ -40,7 +40,7 @@ func StartPRCheckAndAutoMerge(ctx context.Context, pull *issues_model.PullReques
 		return
 	}
 	defer gitRepo.Close()
-	commitID, err := gitRepo.GetRefCommitIDNew(pull.GetGitHeadRefName())
+	commitID, err := gitRepo.GetRefCommitIDOld(pull.GetGitHeadRefName())
 	if err != nil {
 		log.Error("GetRefCommitID: %v", err)
 		return

services/pull/commit_status.go

@@ -111,7 +111,7 @@ func GetPullRequestCommitStatusState(ctx context.Context, pr *issues_model.PullR
 	if pr.Flow == issues_model.PullRequestFlowGithub {
 		sha, err = headGitRepo.GetBranchCommitID(pr.HeadBranch)
 	} else {
-		sha, err = headGitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+		sha, err = headGitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 	}
 	if err != nil {
 		return "", err

services/pull/patch.go

@@ -94,13 +94,13 @@ func testPullRequestTmpRepoBranchMergeable(ctx context.Context, prCtx *prTmpRepo
 	pr.MergeBase, _, err = gitcmd.NewCommand("merge-base", "--", "base", "tracking").WithDir(prCtx.tmpBasePath).RunStdString(ctx)
 	if err != nil {
 		var err2 error
-		pr.MergeBase, err2 = gitRepo.GetRefCommitIDNew(git.BranchPrefix + "base")
+		pr.MergeBase, err2 = gitRepo.GetRefCommitIDOld(git.BranchPrefix + "base")
 		if err2 != nil {
 			return fmt.Errorf("GetMergeBase: %v and can't find commit ID for base: %w", err, err2)
 		}
 	}
 	pr.MergeBase = strings.TrimSpace(pr.MergeBase)
-	if pr.HeadCommitID, err = gitRepo.GetRefCommitIDNew(git.BranchPrefix + "tracking"); err != nil {
+	if pr.HeadCommitID, err = gitRepo.GetRefCommitIDOld(git.BranchPrefix + "tracking"); err != nil {
 		return fmt.Errorf("GetBranchCommitID: can't find commit ID for head: %w", err)
 	}
 

services/pull/pull.go

@@ -805,7 +805,7 @@ func GetSquashMergeCommitMessages(ctx context.Context, pr *issues_model.PullRequ
 	if pr.Flow == issues_model.PullRequestFlowGithub {
 		headCommit, err = gitRepo.GetBranchCommit(pr.HeadBranch)
 	} else {
-		pr.HeadCommitID, err = gitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+		pr.HeadCommitID, err = gitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 		if err != nil {
 			log.Error("Unable to get head commit: %s Error: %v", pr.GetGitHeadRefName(), err)
 			return ""
@@ -982,7 +982,7 @@ func GetIssuesAllCommitStatus(ctx context.Context, issues issues_model.IssueList
 
 // getAllCommitStatus get pr's commit statuses.
 func getAllCommitStatus(ctx context.Context, gitRepo *git.Repository, pr *issues_model.PullRequest) (statuses []*git_model.CommitStatus, lastStatus *git_model.CommitStatus, err error) {
-	sha, shaErr := gitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+	sha, shaErr := gitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 	if shaErr != nil {
 		return nil, nil, shaErr
 	}
@@ -1032,7 +1032,7 @@ func IsHeadEqualWithBranch(ctx context.Context, pr *issues_model.PullRequest, br
 			return false, err
 		}
 	} else {
-		pr.HeadCommitID, err = baseGitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+		pr.HeadCommitID, err = baseGitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 		if err != nil {
 			return false, err
 		}

services/pull/review.go

@@ -259,7 +259,7 @@ func createCodeComment(ctx context.Context, doer *user_model.User, repo *repo_mo
 
 	// Only fetch diff if comment is review comment
 	if len(patch) == 0 && reviewID != 0 {
-		headCommitID, err := gitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+		headCommitID, err := gitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 		if err != nil {
 			return nil, fmt.Errorf("GetRefCommitID[%s]: %w", pr.GetGitHeadRefName(), err)
 		}
@@ -325,7 +325,7 @@ func SubmitReview(ctx context.Context, doer *user_model.User, gitRepo *git.Repos
 			return nil, nil, ErrSubmitReviewOnClosedPR
 		}
 
-		headCommitID, err := gitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+		headCommitID, err := gitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 		if err != nil {
 			return nil, nil, err
 		}

services/repository/branch.go

@@ -232,7 +232,7 @@ func loadOneBranch(ctx context.Context, repo *repo_model.Repository, dbBranch *g
 				defer baseGitRepo.Close()
 				repoIDToGitRepo[pr.BaseRepoID] = baseGitRepo
 			}
-			pullCommit, err := baseGitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+			pullCommit, err := baseGitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 			if err != nil && !git.IsErrNotExist(err) {
 				return nil, fmt.Errorf("GetBranchCommitID: %v", err)
 			}
@@ -807,7 +807,7 @@ func DeleteBranchAfterMerge(ctx context.Context, doer *user_model.User, prID int
 	defer gitHeadCloser.Close()
 
 	// Check if branch has no new commits
-	headCommitID, err := gitBaseRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+	headCommitID, err := gitBaseRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 	if err != nil {
 		log.Error("GetRefCommitID: %v", err)
 		return errFailedToDelete(err)