diff options
| author | KN4CK3R <admin@oldschoolhack.me> | 2022-11-19 09:12:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-19 16:12:33 +0800 |
| commit | 044c754ea53f5b81f451451df53aea366f6f700a (patch) | |
| tree | 45688c28a84f87f71ec3f99eb0e8456eb7d19c42 /services/automerge | |
| parent | fefdb7ffd11bbfbff66dae8e88681ec840dedfde (diff) | |
| download | gitea-044c754ea53f5b81f451451df53aea366f6f700a.tar.gz gitea-044c754ea53f5b81f451451df53aea366f6f700a.zip | |
Add `context.Context` to more methods (#21546)
This PR adds a context parameter to a bunch of methods. Some helper
`xxxCtx()` methods got replaced with the normal name now.
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'services/automerge')
| -rw-r--r-- | services/automerge/automerge.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/automerge/automerge.go b/services/automerge/automerge.go index 5c38367e3b..3291ed31f0 100644 --- a/services/automerge/automerge.go +++ b/services/automerge/automerge.go @@ -188,8 +188,8 @@ func handlePull(pullID int64, sha string) { // We get the latest sha commit hash again to handle the case where the check of a previous push // did not succeed or was not finished yet. - if err = pr.LoadHeadRepoCtx(ctx); err != nil { - log.Error("pull[%d] LoadHeadRepoCtx: %v", pr.ID, err) + if err = pr.LoadHeadRepo(ctx); err != nil { + log.Error("pull[%d] LoadHeadRepo: %v", pr.ID, err) return } @@ -244,8 +244,8 @@ func handlePull(pullID int64, sha string) { if pr.BaseRepoID == pr.HeadRepoID { baseGitRepo = headGitRepo } else { - if err = pr.LoadBaseRepoCtx(ctx); err != nil { - log.Error("LoadBaseRepoCtx: %v", err) + if err = pr.LoadBaseRepo(ctx); err != nil { + log.Error("LoadBaseRepo: %v", err) return } |