Skip to content

Commit 04347eb

Browse files
wolfogrewolfogre
authored
Use context parameter in services/repository (#23186)
Use context parameter in `services/repository`. And use `cache.WithCacheContext(ctx)` to generate push action history feeds. Fix #23160
1 parent cbbd372 commit 04347eb

29 files changed

+102
-100
lines changed

‎routers/api/v1/admin/adopt.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func ListUnadoptedRepositories(ctx *context.APIContext) {
4545
if listOptions.Page == 0 {
4646
listOptions.Page = 1
4747
}
48-
repoNames, count, err := repo_service.ListUnadoptedRepositories(ctx.FormString("query"), &listOptions)
48+
repoNames, count, err := repo_service.ListUnadoptedRepositories(ctx, ctx.FormString("query"), &listOptions)
4949
if err != nil {
5050
ctx.InternalServerError(err)
5151
return
@@ -109,7 +109,7 @@ func AdoptRepository(ctx *context.APIContext) {
109109
ctx.NotFound()
110110
return
111111
}
112-
if _, err := repo_service.AdoptRepository(ctx.Doer, ctxUser, repo_module.CreateRepoOptions{
112+
if _, err := repo_service.AdoptRepository(ctx, ctx.Doer, ctxUser, repo_module.CreateRepoOptions{
113113
Name: repoName,
114114
IsPrivate: true,
115115
}); err != nil {
@@ -172,7 +172,7 @@ func DeleteUnadoptedRepository(ctx *context.APIContext) {
172172
return
173173
}
174174

175-
if err := repo_service.DeleteUnadoptedRepository(ctx.Doer, ctxUser, repoName); err != nil {
175+
if err := repo_service.DeleteUnadoptedRepository(ctx, ctx.Doer, ctxUser, repoName); err != nil {
176176
ctx.InternalServerError(err)
177177
return
178178
}

‎routers/api/v1/repo/branch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func DeleteBranch(ctx *context.APIContext) {
118118

119119
branchName := ctx.Params("*")
120120

121-
if err := repo_service.DeleteBranch(ctx.Doer, ctx.Repo.Repository, ctx.Repo.GitRepo, branchName); err != nil {
121+
if err := repo_service.DeleteBranch(ctx, ctx.Doer, ctx.Repo.Repository, ctx.Repo.GitRepo, branchName); err != nil {
122122
switch {
123123
case git.IsErrBranchNotExist(err):
124124
ctx.NotFound(err)

‎routers/api/v1/repo/pull.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ func MergePullRequest(ctx *context.APIContext) {
904904
}
905905
defer headRepo.Close()
906906
}
907-
if err := repo_service.DeleteBranch(ctx.Doer, pr.HeadRepo, headRepo, pr.HeadBranch); err != nil {
907+
if err := repo_service.DeleteBranch(ctx, ctx.Doer, pr.HeadRepo, headRepo, pr.HeadBranch); err != nil {
908908
switch {
909909
case git.IsErrBranchNotExist(err):
910910
ctx.NotFound(err)

‎routers/api/v1/repo/repo.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ func CreateUserRepo(ctx *context.APIContext, owner *user_model.User, opt api.Cre
230230
if opt.AutoInit && opt.Readme == "" {
231231
opt.Readme = "Default"
232232
}
233-
repo, err := repo_service.CreateRepository(ctx.Doer, owner, repo_module.CreateRepoOptions{
233+
repo, err := repo_service.CreateRepository(ctx, ctx.Doer, owner, repo_module.CreateRepoOptions{
234234
Name: opt.Name,
235235
Description: opt.Description,
236236
IssueLabels: opt.IssueLabels,
@@ -393,7 +393,7 @@ func Generate(ctx *context.APIContext) {
393393
}
394394
}
395395

396-
repo, err := repo_service.GenerateRepository(ctx.Doer, ctxUser, ctx.Repo.Repository, opts)
396+
repo, err := repo_service.GenerateRepository(ctx, ctx.Doer, ctxUser, ctx.Repo.Repository, opts)
397397
if err != nil {
398398
if repo_model.IsErrRepoAlreadyExist(err) {
399399
ctx.Error(http.StatusConflict, "", "The repository with the same name already exists.")
@@ -637,7 +637,7 @@ func updateBasicProperties(ctx *context.APIContext, opts api.EditRepoOption) err
637637
}
638638
// Check if repository name has been changed and not just a case change
639639
if repo.LowerName != strings.ToLower(newRepoName) {
640-
if err := repo_service.ChangeRepositoryName(ctx.Doer, repo, newRepoName); err != nil {
640+
if err := repo_service.ChangeRepositoryName(ctx, ctx.Doer, repo, newRepoName); err != nil {
641641
switch {
642642
case repo_model.IsErrRepoAlreadyExist(err):
643643
ctx.Error(http.StatusUnprocessableEntity, fmt.Sprintf("repo name is already taken [name: %s]", newRepoName), err)
@@ -714,7 +714,7 @@ func updateBasicProperties(ctx *context.APIContext, opts api.EditRepoOption) err
714714
repo.DefaultBranch = *opts.DefaultBranch
715715
}
716716

717-
if err := repo_service.UpdateRepository(repo, visibilityChanged); err != nil {
717+
if err := repo_service.UpdateRepository(ctx, repo, visibilityChanged); err != nil {
718718
ctx.Error(http.StatusInternalServerError, "UpdateRepository", err)
719719
return err
720720
}

‎routers/private/serv.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ func ServCommand(ctx *context.PrivateContext) {
368368
return
369369
}
370370

371-
repo, err = repo_service.PushCreateRepo(user, owner, results.RepoName)
371+
repo, err = repo_service.PushCreateRepo(ctx, user, owner, results.RepoName)
372372
if err != nil {
373373
log.Error("pushCreateRepo: %v", err)
374374
ctx.JSON(http.StatusNotFound, private.ErrServCommand{

‎routers/web/admin/repos.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func UnadoptedRepos(ctx *context.Context) {
9696
}
9797

9898
ctx.Data["Keyword"] = q
99-
repoNames, count, err := repo_service.ListUnadoptedRepositories(q, &opts)
99+
repoNames, count, err := repo_service.ListUnadoptedRepositories(ctx, q, &opts)
100100
if err != nil {
101101
ctx.ServerError("ListUnadoptedRepositories", err)
102102
}
@@ -148,7 +148,7 @@ func AdoptOrDeleteRepository(ctx *context.Context) {
148148
if has || !isDir {
149149
// Fallthrough to failure mode
150150
} else if action == "adopt" {
151-
if _, err := repo_service.AdoptRepository(ctx.Doer, ctxUser, repo_module.CreateRepoOptions{
151+
if _, err := repo_service.AdoptRepository(ctx, ctx.Doer, ctxUser, repo_module.CreateRepoOptions{
152152
Name: dirSplit[1],
153153
IsPrivate: true,
154154
}); err != nil {
@@ -157,7 +157,7 @@ func AdoptOrDeleteRepository(ctx *context.Context) {
157157
}
158158
ctx.Flash.Success(ctx.Tr("repo.adopt_preexisting_success", dir))
159159
} else if action == "delete" {
160-
if err := repo_service.DeleteUnadoptedRepository(ctx.Doer, ctxUser, dirSplit[1]); err != nil {
160+
if err := repo_service.DeleteUnadoptedRepository(ctx, ctx.Doer, ctxUser, dirSplit[1]); err != nil {
161161
ctx.ServerError("repository.AdoptRepository", err)
162162
return
163163
}

‎routers/web/org/setting.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func SettingsPost(ctx *context.Context) {
137137
}
138138
for _, repo := range repos {
139139
repo.OwnerName = org.Name
140-
if err := repo_service.UpdateRepository(repo, true); err != nil {
140+
if err := repo_service.UpdateRepository(ctx, repo, true); err != nil {
141141
ctx.ServerError("UpdateRepository", err)
142142
return
143143
}

‎routers/web/repo/branch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func DeleteBranchPost(ctx *context.Context) {
9191
defer redirect(ctx)
9292
branchName := ctx.FormString("name")
9393

94-
if err := repo_service.DeleteBranch(ctx.Doer, ctx.Repo.Repository, ctx.Repo.GitRepo, branchName); err != nil {
94+
if err := repo_service.DeleteBranch(ctx, ctx.Doer, ctx.Repo.Repository, ctx.Repo.GitRepo, branchName); err != nil {
9595
switch {
9696
case git.IsErrBranchNotExist(err):
9797
log.Debug("DeleteBranch: Can't delete non existing branch '%s'", branchName)

‎routers/web/repo/http.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ func httpBase(ctx *context.Context) (h *serviceHandler) {
276276
return
277277
}
278278

279-
repo, err = repo_service.PushCreateRepo(ctx.Doer, owner, reponame)
279+
repo, err = repo_service.PushCreateRepo(ctx, ctx.Doer, owner, reponame)
280280
if err != nil {
281281
log.Error("pushCreateRepo: %v", err)
282282
ctx.Status(http.StatusNotFound)

‎routers/web/repo/issue.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ func RetrieveRepoReviewers(ctx *context.Context, repo *repo_model.Repository, is
589589
return
590590
}
591591

592-
teamReviewers, err = repo_service.GetReviewerTeams(repo)
592+
teamReviewers, err = repo_service.GetReviewerTeams(ctx, repo)
593593
if err != nil {
594594
ctx.ServerError("GetReviewerTeams", err)
595595
return

0 commit comments

Comments
 (0)