Skip to content

Commit 3d2ca63

Browse files
committed
only re-calc divergence if AddTestPullRequestTask() is exec
1 parent 45b5aa0 commit 3d2ca63

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

services/pull/check.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,7 @@ func AddToTaskQueue(pr *models.PullRequest) {
3232
go func() {
3333
err := prQueue.PushFunc(strconv.FormatInt(pr.ID, 10), func() error {
3434
pr.Status = models.PullRequestStatusChecking
35-
divergence, err := GetDiverging(pr)
36-
if err != nil {
37-
log.Error("AddToTaskQueue.GetDiverging[%d]: %v", pr.ID, err)
38-
}
39-
pr.CommitsAhead = divergence.Ahead
40-
pr.CommitsBehind = divergence.Behind
41-
err = pr.UpdateColsIfNotMerged("status", "commits_ahead", "commits_behind")
35+
err := pr.UpdateColsIfNotMerged("status")
4236
if err != nil {
4337
log.Error("AddToTaskQueue.UpdateCols[%d].(add to queue): %v", pr.ID, err)
4438
} else {

services/pull/pull.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,15 @@ func AddTestPullRequestTask(doer *models.User, repoID int64, branch string, isSy
244244
return
245245
}
246246
for _, pr := range prs {
247+
divergence, err := GetDiverging(pr)
248+
if err != nil {
249+
log.Error("GetDiverging: %v", err)
250+
} else {
251+
err = pr.UpdateCommitDivergence(divergence)
252+
if err != nil {
253+
log.Error("UpdateCommitDivergence: %v", err)
254+
}
255+
}
247256
AddToTaskQueue(pr)
248257
}
249258
})

0 commit comments

Comments
 (0)