remove duplicated code on check pull request's required commit status…

…es pass

modules/pull/commit_status.go

@@ -5,7 +5,12 @@
 
 package pull
 
-import "code.gitea.io/gitea/models"
+import (
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/git"
+
+	"github.com/pkg/errors"
+)
 
 // IsCommitStatusContextSuccess returns true if all required status check contexts succeed.
 func IsCommitStatusContextSuccess(commitStatuses []*models.CommitStatus, requiredContexts []string) bool {
@@ -27,3 +32,39 @@ func IsCommitStatusContextSuccess(commitStatuses []*models.CommitStatus, require
 	}
 	return true
 }
+
+// IsPullCommitStatusPass returns if all required status checks PASS
+func IsPullCommitStatusPass(pr *models.PullRequest) (bool, error) {
+	// check if all required status checks are successful
+	headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
+	if err != nil {
+		return false, errors.Wrap(err, "OpenRepository")
+	}
+
+	headBranchExist := headGitRepo.IsBranchExist(pr.HeadBranch)
+	if !headBranchExist {
+		return false, errors.New("HeadBranchExist is not exist, cannot merge")
+	}
+
+	sha, err := headGitRepo.GetBranchCommitID(pr.HeadBranch)
+	if err != nil {
+		return false, errors.Wrap(err, "GetBranchCommitID")
+	}
+
+	commitStatuses, err := models.GetLatestCommitStatus(pr.BaseRepo, sha, 0)
+	if err != nil {
+		return false, errors.Wrap(err, "GetLatestCommitStatus")
+	}
+
+	if err = pr.LoadProtectedBranch(); err != nil {
+		return false, errors.Wrap(err, "GetLatestCommitStatus")
+	}
+
+	if pr.ProtectedBranch != nil &&
+		pr.ProtectedBranch.EnableStatusCheck &&
+		!IsCommitStatusContextSuccess(commitStatuses, pr.ProtectedBranch.StatusCheckContexts) {
+		return false, nil
+	}
+
+	return true, nil
+}

routers/api/v1/repo/pull.go

@@ -571,39 +571,13 @@ func MergePullRequest(ctx *context.APIContext, form auth.MergePullRequestForm) {
 		return
 	}
 
-	// check if all required status checks are successful
-	headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
+	isPass, err := pull_service.IsPullCommitStatusPass(pr)
 	if err != nil {
-		ctx.Error(500, "OpenRepository", err)
+		ctx.Error(500, "IsPullCommitStatusPass", err)
 		return
 	}
 
-	headBranchExist := headGitRepo.IsBranchExist(pr.HeadBranch)
-	if !headBranchExist {
-		ctx.Error(500, "HeadBranchExist is not exist, cannot merge", nil)
-		return
-	}
-
-	sha, err := headGitRepo.GetBranchCommitID(pr.HeadBranch)
-	if err != nil {
-		ctx.Error(500, "GetBranchCommitID", err)
-		return
-	}
-
-	commitStatuses, err := models.GetLatestCommitStatus(ctx.Repo.Repository, sha, 0)
-	if err != nil {
-		ctx.Error(500, "GetLatestCommitStatus", err)
-		return
-	}
-
-	if err = pr.LoadProtectedBranch(); err != nil {
-		ctx.Error(500, "GetLatestCommitStatus", err)
-		return
-	}
-
-	if pr.ProtectedBranch != nil &&
-		pr.ProtectedBranch.EnableStatusCheck &&
-		!pull_service.IsCommitStatusContextSuccess(commitStatuses, pr.ProtectedBranch.StatusCheckContexts) {
+	if !isPass {
 		ctx.Status(405)
 		return
 	}

routers/repo/pull.go

@@ -626,39 +626,12 @@ func MergePullRequest(ctx *context.Context, form auth.MergePullRequestForm) {
 		return
 	}
 
-	// check if all required status checks are successful
-	headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
-	if err != nil {
-		ctx.ServerError("OpenRepository", err)
-		return
-	}
-
-	headBranchExist := headGitRepo.IsBranchExist(pr.HeadBranch)
-	if !headBranchExist {
-		ctx.ServerError("HeadBranchExist is not exist, cannot merge", nil)
-		return
-	}
-
-	sha, err := headGitRepo.GetBranchCommitID(pr.HeadBranch)
+	isPass, err := pull_service.IsPullCommitStatusPass(pr)
 	if err != nil {
-		ctx.ServerError("GetBranchCommitID", err)
+		ctx.ServerError("IsPullCommitStatusPass", err)
 		return
 	}
-
-	commitStatuses, err := models.GetLatestCommitStatus(ctx.Repo.Repository, sha, 0)
-	if err != nil {
-		ctx.ServerError("GetLatestCommitStatus", err)
-		return
-	}
-
-	if err = pr.LoadProtectedBranch(); err != nil {
-		ctx.ServerError("GetLatestCommitStatus", err)
-		return
-	}
-
-	if pr.ProtectedBranch != nil &&
-		pr.ProtectedBranch.EnableStatusCheck &&
-		!pull_service.IsCommitStatusContextSuccess(commitStatuses, pr.ProtectedBranch.StatusCheckContexts) {
+	if !isPass {
 		ctx.Flash.Error(ctx.Tr("repo.pulls.no_merge_status_check"))
 		ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index))
 		return