fix

Author: wxiaoguang

services/pull/pull.go

@@ -128,14 +128,7 @@ func NewPullRequest(ctx context.Context, opts *NewPullRequestOptions) error {
 		}
 
 		// Update Commit Divergence
-		divergence, err := GetDiverging(ctx, pr)
-		if err != nil {
-			return err
-		}
-		pr.CommitsAhead = divergence.Ahead
-		pr.CommitsBehind = divergence.Behind
-
-		err = pr.UpdateCommitDivergence(ctx, divergence.Ahead, divergence.Behind)
+		err = UpdateCommitDivergence(ctx, pr)
 		if err != nil {
 			return err
 		}
@@ -433,14 +426,8 @@ func AddTestPullRequestTask(opts TestPullRequestOptions) {
 						if err := issues_model.MarkReviewsAsNotStale(ctx, pr.IssueID, opts.NewCommitID); err != nil {
 							log.Error("MarkReviewsAsNotStale: %v", err)
 						}
-						divergence, err := GetDiverging(ctx, pr)
-						if err != nil {
-							log.Error("GetDiverging: %v", err)
-						} else {
-							err = pr.UpdateCommitDivergence(ctx, divergence.Ahead, divergence.Behind)
-							if err != nil {
-								log.Error("UpdateCommitDivergence: %v", err)
-							}
+						if err = UpdateCommitDivergence(ctx, pr); err != nil {
+							log.Error("UpdateCommitDivergence: %v", err)
 						}
 					}
 
@@ -474,18 +461,14 @@ func AddTestPullRequestTask(opts TestPullRequestOptions) {
 		}
 		for _, pr := range prs {
 			pr.BaseRepo = baseRepo // avoid loading again
-			divergence, err := GetDiverging(ctx, pr)
+			err = UpdateCommitDivergence(ctx, pr)
 			if err != nil {
-				if git_model.IsErrBranchNotExist(err) && !gitrepo.IsBranchExist(ctx, pr.HeadRepo, pr.HeadBranch) {
-					log.Warn("Cannot test PR %s/%d: head_branch %s no longer exists", pr.BaseRepo.Name, pr.IssueID, pr.HeadBranch)
+				if errors.Is(err, util.ErrNotExist) {
+					log.Warn("Cannot test PR %s/%d with base=%s head=%s: no longer exists", pr.BaseRepo.FullName(), pr.IssueID, pr.BaseBranch, pr.HeadBranch)
 				} else {
-					log.Error("GetDiverging: %v", err)
-				}
-			} else {
-				err = pr.UpdateCommitDivergence(ctx, divergence.Ahead, divergence.Behind)
-				if err != nil {
 					log.Error("UpdateCommitDivergence: %v", err)
 				}
+				continue
 			}
 			StartPullRequestCheckDelayable(ctx, pr)
 		}

services/pull/update.go

@@ -41,7 +41,7 @@ func Update(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.
 
 	// TODO: FakePR: if the PR is a fake PR (for example: from Merge Upstream), then no need to check diverging
 	if pr.ID > 0 {
-		diffCount, err := GetDiverging(ctx, pr)
+		diffCount, err := gitrepo.GetDivergingCommits(ctx, pr.BaseRepo, pr.BaseBranch, pr.GetGitHeadRefName())
 		if err != nil {
 			return err
 		} else if diffCount.Behind == 0 {
@@ -186,3 +186,11 @@ func GetDiverging(ctx context.Context, pr *issues_model.PullRequest) (*gitrepo.D
 
 	return gitrepo.GetDivergingCommits(ctx, pr.BaseRepo, pr.BaseBranch, pr.GetGitHeadRefName())
 }
+
+func UpdateCommitDivergence(ctx context.Context, pr *issues_model.PullRequest) error {
+	divergence, err := GetDiverging(ctx, pr)
+	if err != nil {
+		return err
+	}
+	return pr.UpdateCommitDivergence(ctx, divergence.Ahead, divergence.Behind)
+}