summaryrefslogtreecommitdiffstats
path: root/services/pull
diff options
context:
space:
mode:
authoryp05327 <576951401@qq.com>2023-02-18 21:11:03 +0900
committerGitHub <noreply@github.com>2023-02-18 20:11:03 +0800
commitbd66fa586a0da58c4cf2f5f8390aef4bac9d0527 (patch)
tree0aa52def7fb8c81ca91a2b882261e9db6a7c174a /services/pull
parent007d181bb51330c4c24e78c2f40a2e49cae45ed9 (diff)
downloadgitea-bd66fa586a0da58c4cf2f5f8390aef4bac9d0527.tar.gz
gitea-bd66fa586a0da58c4cf2f5f8390aef4bac9d0527.zip
Rename `repo.GetOwner` to `repo.LoadOwner` (#22967)
Fixes https://github.com/go-gitea/gitea/issues/22963 --------- Co-authored-by: Yarden Shoham <hrsi88@gmail.com>
Diffstat (limited to 'services/pull')
-rw-r--r--services/pull/check.go4
-rw-r--r--services/pull/merge.go6
-rw-r--r--services/pull/temp_repo.go12
3 files changed, 11 insertions, 11 deletions
diff --git a/services/pull/check.go b/services/pull/check.go
index ea5cccbdec..310ea2e714 100644
--- a/services/pull/check.go
+++ b/services/pull/check.go
@@ -261,8 +261,8 @@ func manuallyMerged(ctx context.Context, pr *issues_model.PullRequest) bool {
// When the commit author is unknown set the BaseRepo owner as merger
if merger == nil {
if pr.BaseRepo.Owner == nil {
- if err = pr.BaseRepo.GetOwner(ctx); err != nil {
- log.Error("%-v BaseRepo.GetOwner: %v", pr, err)
+ if err = pr.BaseRepo.LoadOwner(ctx); err != nil {
+ log.Error("%-v BaseRepo.LoadOwner: %v", pr, err)
return false
}
}
diff --git a/services/pull/merge.go b/services/pull/merge.go
index a3d69df8df..3ac67d91b7 100644
--- a/services/pull/merge.go
+++ b/services/pull/merge.go
@@ -199,8 +199,8 @@ func Merge(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.U
if err := pr.Issue.LoadRepo(hammerCtx); err != nil {
log.Error("LoadRepo for issue [%d]: %v", pr.ID, err)
}
- if err := pr.Issue.Repo.GetOwner(hammerCtx); err != nil {
- log.Error("GetOwner for PR [%d]: %v", pr.ID, err)
+ if err := pr.Issue.Repo.LoadOwner(hammerCtx); err != nil {
+ log.Error("LoadOwner for PR [%d]: %v", pr.ID, err)
}
if wasAutoMerged {
@@ -573,7 +573,7 @@ func rawMerge(ctx context.Context, pr *issues_model.PullRequest, doer *user_mode
}
var headUser *user_model.User
- err = pr.HeadRepo.GetOwner(ctx)
+ err = pr.HeadRepo.LoadOwner(ctx)
if err != nil {
if !user_model.IsErrUserNotExist(err) {
log.Error("Can't find user: %d for head repository - %v", pr.HeadRepo.OwnerID, err)
diff --git a/services/pull/temp_repo.go b/services/pull/temp_repo.go
index d49a15cea0..e0d6b4a158 100644
--- a/services/pull/temp_repo.go
+++ b/services/pull/temp_repo.go
@@ -38,12 +38,12 @@ func createTemporaryRepo(ctx context.Context, pr *issues_model.PullRequest) (str
return "", &repo_model.ErrRepoNotExist{
ID: pr.BaseRepoID,
}
- } else if err := pr.HeadRepo.GetOwner(ctx); err != nil {
- log.Error("HeadRepo.GetOwner: %v", err)
- return "", fmt.Errorf("HeadRepo.GetOwner: %w", err)
- } else if err := pr.BaseRepo.GetOwner(ctx); err != nil {
- log.Error("BaseRepo.GetOwner: %v", err)
- return "", fmt.Errorf("BaseRepo.GetOwner: %w", err)
+ } else if err := pr.HeadRepo.LoadOwner(ctx); err != nil {
+ log.Error("HeadRepo.LoadOwner: %v", err)
+ return "", fmt.Errorf("HeadRepo.LoadOwner: %w", err)
+ } else if err := pr.BaseRepo.LoadOwner(ctx); err != nil {
+ log.Error("BaseRepo.LoadOwner: %v", err)
+ return "", fmt.Errorf("BaseRepo.LoadOwner: %w", err)
}
// Clone base repo.