瀏覽代碼

Fix bug for ctx usage (#26762)

Regression from #26158

Fix #26684
tags/v1.21.0-rc0
Lunny Xiao 9 月之前
父節點
當前提交
6945918d34
No account linked to committer's email address
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 4
    4
      modules/repository/branch.go
  2. 2
    2
      services/pull/review.go

+ 4
- 4
modules/repository/branch.go 查看文件

@@ -106,15 +106,15 @@ func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository,
return int64(len(allBranches)), nil
}

if err := db.WithTx(ctx, func(subCtx context.Context) error {
if err := db.WithTx(ctx, func(ctx context.Context) error {
if len(toAdd) > 0 {
if err := git_model.AddBranches(subCtx, toAdd); err != nil {
if err := git_model.AddBranches(ctx, toAdd); err != nil {
return err
}
}

for _, b := range toUpdate {
if _, err := db.GetEngine(subCtx).ID(b.ID).
if _, err := db.GetEngine(ctx).ID(b.ID).
Cols("commit_id, commit_message, pusher_id, commit_time, is_deleted").
Update(b); err != nil {
return err
@@ -122,7 +122,7 @@ func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository,
}

if len(toRemove) > 0 {
if err := git_model.DeleteBranches(subCtx, repo.ID, doerID, toRemove); err != nil {
if err := git_model.DeleteBranches(ctx, repo.ID, doerID, toRemove); err != nil {
return err
}
}

+ 2
- 2
services/pull/review.go 查看文件

@@ -333,9 +333,9 @@ func DismissApprovalReviews(ctx context.Context, doer *user_model.User, pull *is
return err
}

return db.WithTx(ctx, func(subCtx context.Context) error {
return db.WithTx(ctx, func(ctx context.Context) error {
for _, review := range reviews {
if err := issues_model.DismissReview(subCtx, review, true); err != nil {
if err := issues_model.DismissReview(ctx, review, true); err != nil {
return err
}


Loading…
取消
儲存