Mirrors/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-09-01 14:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use correct ctx usage

Browse Source
This commit is contained in:
Lunny Xiao 2024-08-27 23:35:32 -07:00
parent 3e268b95f4
commit 8e09e01ef6
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
services/pull/merge.go
View File

@ -182,7 +182,7 @@ func Merge(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.U
return models.ErrInvalidMergeStyle{ID: pr.BaseRepo.ID, Style: mergeStyle} return models.ErrInvalidMergeStyle{ID: pr.BaseRepo.ID, Style: mergeStyle}
} }
lockCtx, releaser, err := globallock.Lock(ctx, getPullWorkingLockKey(pr.ID)) ctx, releaser, err := globallock.Lock(ctx, getPullWorkingLockKey(pr.ID))
if err != nil { if err != nil {
log.Error("lock.Lock(): %v", err) log.Error("lock.Lock(): %v", err)
return fmt.Errorf("lock.Lock: %w", err) return fmt.Errorf("lock.Lock: %w", err)
@ -192,8 +192,8 @@ func Merge(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.U
go AddTestPullRequestTask(doer, pr.BaseRepo.ID, pr.BaseBranch, false, "", "") go AddTestPullRequestTask(doer, pr.BaseRepo.ID, pr.BaseBranch, false, "", "")
}() }()
_, err = doMergeAndPush(lockCtx, pr, doer, mergeStyle, expectedHeadCommitID, message, repo_module.PushTriggerPRMergeToBase) _, err = doMergeAndPush(ctx, pr, doer, mergeStyle, expectedHeadCommitID, message, repo_module.PushTriggerPRMergeToBase)
releaser() ctx = releaser()
if err != nil { if err != nil {
return err return err
} }
@ -492,13 +492,13 @@ func CheckPullBranchProtections(ctx context.Context, pr *issues_model.PullReques
// MergedManually mark pr as merged manually // MergedManually mark pr as merged manually
func MergedManually(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.User, baseGitRepo *git.Repository, commitID string) error { func MergedManually(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.User, baseGitRepo *git.Repository, commitID string) error {
lockCtx, releaser, err := globallock.Lock(ctx, getPullWorkingLockKey(pr.ID)) ctx, releaser, err := globallock.Lock(ctx, getPullWorkingLockKey(pr.ID))
if err != nil { if err != nil {
log.Error("lock.Lock(): %v", err) log.Error("lock.Lock(): %v", err)
return fmt.Errorf("lock.Lock: %w", err) return fmt.Errorf("lock.Lock: %w", err)
} }
err = db.WithTx(lockCtx, func(ctx context.Context) error { err = db.WithTx(ctx, func(ctx context.Context) error {
if err := pr.LoadBaseRepo(ctx); err != nil { if err := pr.LoadBaseRepo(ctx); err != nil {
return err return err
} }
@ -549,7 +549,7 @@ func MergedManually(ctx context.Context, pr *issues_model.PullRequest, doer *use
} }
return nil return nil
}) })
releaser() ctx = releaser()
if err != nil { if err != nil {
return err return err
} }

12
services/repository/transfer.go
View File

@ -42,17 +42,17 @@ func TransferOwnership(ctx context.Context, doer, newOwner *user_model.User, rep
oldOwner := repo.Owner oldOwner := repo.Owner
lockCtx, releaser, err := globallock.Lock(ctx, getRepoWorkingLockKey(repo.ID)) ctx, releaser, err := globallock.Lock(ctx, getRepoWorkingLockKey(repo.ID))
if err != nil { if err != nil {
log.Error("lock.Lock(): %v", err) log.Error("lock.Lock(): %v", err)
return fmt.Errorf("lock.Lock: %w", err) return fmt.Errorf("lock.Lock: %w", err)
} }
if err := transferOwnership(lockCtx, doer, newOwner.Name, repo); err != nil { if err := transferOwnership(ctx, doer, newOwner.Name, repo); err != nil {
releaser() releaser()
return err return err
} }
releaser() ctx = releaser()
newRepo, err := repo_model.GetRepositoryByID(ctx, repo.ID) newRepo, err := repo_model.GetRepositoryByID(ctx, repo.ID)
if err != nil { if err != nil {
@ -368,17 +368,17 @@ func ChangeRepositoryName(ctx context.Context, doer *user_model.User, repo *repo
// repo so that we can automatically rename the repo path and updates the // repo so that we can automatically rename the repo path and updates the
// local copy's origin accordingly. // local copy's origin accordingly.
lockCtx, releaser, err := globallock.Lock(ctx, getRepoWorkingLockKey(repo.ID)) ctx, releaser, err := globallock.Lock(ctx, getRepoWorkingLockKey(repo.ID))
if err != nil { if err != nil {
log.Error("lock.Lock(): %v", err) log.Error("lock.Lock(): %v", err)
return fmt.Errorf("lock.Lock: %w", err) return fmt.Errorf("lock.Lock: %w", err)
} }
if err := changeRepositoryName(lockCtx, repo, newRepoName); err != nil { if err := changeRepositoryName(ctx, repo, newRepoName); err != nil {
releaser() releaser()
return err return err
} }
releaser() ctx = releaser()
repo.Name = newRepoName repo.Name = newRepoName
notify_service.RenameRepository(ctx, doer, repo, oldRepoName) notify_service.RenameRepository(ctx, doer, repo, oldRepoName)