Skip to content

Commit 328477e

Browse files
wxiaoguangwxiaoguang
committed
revert all cache.WithCacheContext
1 parent b12d6bf commit 328477e

File tree

8 files changed

+4
-20
lines changed

8 files changed

+4
-20
lines changed

‎routers/private/hook_verification.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"io"
1010
"os"
1111

12-
"code.gitea.io/gitea/modules/cache"
1312
"code.gitea.io/gitea/modules/git"
1413
"code.gitea.io/gitea/modules/log"
1514
asymkey_service "code.gitea.io/gitea/services/asymkey"
@@ -96,7 +95,6 @@ func readAndVerifyCommit(sha string, repo *git.Repository, env []string) error {
9695
if err != nil {
9796
return err
9897
}
99-
ctx = cache.WithCacheContext(ctx)
10098
verification := asymkey_service.ParseCommitWithSignature(ctx, commit)
10199
if !verification.Verified {
102100
cancel()

‎routers/web/repo/commit.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
unit_model "code.gitea.io/gitea/models/unit"
2121
user_model "code.gitea.io/gitea/models/user"
2222
"code.gitea.io/gitea/modules/base"
23-
"code.gitea.io/gitea/modules/cache"
2423
"code.gitea.io/gitea/modules/charset"
2524
"code.gitea.io/gitea/modules/git"
2625
"code.gitea.io/gitea/modules/gitrepo"
@@ -385,7 +384,7 @@ func Diff(ctx *context.Context) {
385384
ctx.Data["CommitStatus"] = git_model.CalcCommitStatus(statuses)
386385
ctx.Data["CommitStatuses"] = statuses
387386

388-
verification := asymkey_service.ParseCommitWithSignature(cache.WithCacheContext(ctx), commit)
387+
verification := asymkey_service.ParseCommitWithSignature(ctx, commit)
389388
ctx.Data["Verification"] = verification
390389
ctx.Data["Author"] = user_model.ValidateCommitWithEmail(ctx, commit)
391390
ctx.Data["Parents"] = parents

‎routers/web/repo/view.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
unit_model "code.gitea.io/gitea/models/unit"
2929
user_model "code.gitea.io/gitea/models/user"
3030
"code.gitea.io/gitea/modules/base"
31-
"code.gitea.io/gitea/modules/cache"
3231
"code.gitea.io/gitea/modules/charset"
3332
"code.gitea.io/gitea/modules/fileicon"
3433
"code.gitea.io/gitea/modules/git"
@@ -121,7 +120,7 @@ func loadLatestCommitData(ctx *context.Context, latestCommit *git.Commit) bool {
121120
// or of directory if not in root directory.
122121
ctx.Data["LatestCommit"] = latestCommit
123122
if latestCommit != nil {
124-
verification := asymkey_service.ParseCommitWithSignature(cache.WithCacheContext(ctx), latestCommit)
123+
verification := asymkey_service.ParseCommitWithSignature(ctx, latestCommit)
125124

126125
if err := asymkey_model.CalculateTrustStatus(verification, ctx.Repo.Repository.GetTrustModel(), func(user *user_model.User) (bool, error) {
127126
return repo_model.IsOwnerMemberCollaborator(ctx, ctx.Repo.Repository, user.ID)

‎services/asymkey/sign.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
issues_model "code.gitea.io/gitea/models/issues"
1616
repo_model "code.gitea.io/gitea/models/repo"
1717
user_model "code.gitea.io/gitea/models/user"
18-
"code.gitea.io/gitea/modules/cache"
1918
"code.gitea.io/gitea/modules/git"
2019
"code.gitea.io/gitea/modules/gitrepo"
2120
"code.gitea.io/gitea/modules/log"
@@ -178,8 +177,6 @@ func SignWikiCommit(ctx context.Context, repo *repo_model.Repository, u *user_mo
178177
return false, "", nil, &ErrWontSign{noKey}
179178
}
180179

181-
ctx = cache.WithCacheContext(ctx)
182-
183180
Loop:
184181
for _, rule := range rules {
185182
switch rule {
@@ -235,7 +232,6 @@ func SignCRUDAction(ctx context.Context, repoPath string, u *user_model.User, tm
235232
if signingKey == "" {
236233
return false, "", nil, &ErrWontSign{noKey}
237234
}
238-
ctx = cache.WithCacheContext(ctx)
239235

240236
Loop:
241237
for _, rule := range rules {
@@ -301,7 +297,6 @@ func SignMerge(ctx context.Context, pr *issues_model.PullRequest, u *user_model.
301297

302298
var gitRepo *git.Repository
303299
var err error
304-
ctx = cache.WithCacheContext(ctx)
305300

306301
Loop:
307302
for _, rule := range rules {

‎services/convert/convert.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
repo_model "code.gitea.io/gitea/models/repo"
2323
"code.gitea.io/gitea/models/unit"
2424
user_model "code.gitea.io/gitea/models/user"
25-
"code.gitea.io/gitea/modules/cache"
2625
"code.gitea.io/gitea/modules/container"
2726
"code.gitea.io/gitea/modules/git"
2827
"code.gitea.io/gitea/modules/log"
@@ -255,7 +254,7 @@ func ToActionArtifact(repo *repo_model.Repository, art *actions_model.ActionArti
255254

256255
// ToVerification convert a git.Commit.Signature to an api.PayloadCommitVerification
257256
func ToVerification(ctx context.Context, c *git.Commit) *api.PayloadCommitVerification {
258-
verif := asymkey_service.ParseCommitWithSignature(cache.WithCacheContext(ctx), c)
257+
verif := asymkey_service.ParseCommitWithSignature(ctx, c)
259258
commitVerification := &api.PayloadCommitVerification{
260259
Verified: verif.Verified,
261260
Reason: verif.Reason,

‎services/git/commit.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
git_model "code.gitea.io/gitea/models/git"
1212
repo_model "code.gitea.io/gitea/models/repo"
1313
user_model "code.gitea.io/gitea/models/user"
14-
"code.gitea.io/gitea/modules/cache"
1514
"code.gitea.io/gitea/modules/container"
1615
"code.gitea.io/gitea/modules/git"
1716
asymkey_service "code.gitea.io/gitea/services/asymkey"
@@ -34,8 +33,6 @@ func ParseCommitsWithSignature(ctx context.Context, repo *repo_model.Repository,
3433
return nil, err
3534
}
3635

37-
ctx = cache.WithCacheContext(ctx)
38-
3936
for _, c := range oldCommits {
4037
committer, ok := emailUsers[c.Committer.Email]
4138
if !ok && c.Committer != nil {

‎services/repository/files/commit.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"context"
88

99
repo_model "code.gitea.io/gitea/models/repo"
10-
"code.gitea.io/gitea/modules/cache"
1110
"code.gitea.io/gitea/modules/git"
1211
"code.gitea.io/gitea/modules/structs"
1312
asymkey_service "code.gitea.io/gitea/services/asymkey"
@@ -25,7 +24,7 @@ func CountDivergingCommits(ctx context.Context, repo *repo_model.Repository, bra
2524
// GetPayloadCommitVerification returns the verification information of a commit
2625
func GetPayloadCommitVerification(ctx context.Context, commit *git.Commit) *structs.PayloadCommitVerification {
2726
verification := &structs.PayloadCommitVerification{}
28-
commitVerification := asymkey_service.ParseCommitWithSignature(cache.WithCacheContext(ctx), commit)
27+
commitVerification := asymkey_service.ParseCommitWithSignature(ctx, commit)
2928
if commit.Signature != nil {
3029
verification.Signature = commit.Signature.Signature
3130
verification.Payload = commit.Signature.Payload

‎services/repository/gitgraph/graph_models.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
git_model "code.gitea.io/gitea/models/git"
1616
repo_model "code.gitea.io/gitea/models/repo"
1717
user_model "code.gitea.io/gitea/models/user"
18-
"code.gitea.io/gitea/modules/cache"
1918
"code.gitea.io/gitea/modules/git"
2019
"code.gitea.io/gitea/modules/log"
2120
asymkey_service "code.gitea.io/gitea/services/asymkey"
@@ -98,7 +97,6 @@ func (graph *Graph) LoadAndProcessCommits(ctx context.Context, repository *repo_
9897

9998
emails := map[string]*user_model.User{}
10099
keyMap := map[string]bool{}
101-
ctx = cache.WithCacheContext(ctx)
102100

103101
for _, c := range graph.Commits {
104102
if len(c.Rev) == 0 {

0 commit comments

Comments
 (0)