Skip to content

Commit 30e1abb

Browse files
TheFox0x7TheFox0x7
committed
Remove temp repo context
1 parent 1c41142 commit 30e1abb

File tree

7 files changed

+95
-96
lines changed

7 files changed

+95
-96
lines changed

‎services/packages/cargo/index.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func RebuildIndex(ctx context.Context, doer, owner *user_model.User) error {
7878
"Rebuild Cargo Index",
7979
func(t *files_service.TemporaryUploadRepository) error {
8080
// Remove all existing content but the Cargo config
81-
files, err := t.LsFiles()
81+
files, err := t.LsFiles(ctx)
8282
if err != nil {
8383
return err
8484
}
@@ -89,7 +89,7 @@ func RebuildIndex(ctx context.Context, doer, owner *user_model.User) error {
8989
break
9090
}
9191
}
92-
if err := t.RemoveFilesFromIndex(files...); err != nil {
92+
if err := t.RemoveFilesFromIndex(ctx, files...); err != nil {
9393
return err
9494
}
9595

@@ -204,7 +204,7 @@ func addOrUpdatePackageIndex(ctx context.Context, t *files_service.TemporaryUplo
204204
return nil
205205
}
206206

207-
return writeObjectToIndex(t, BuildPackagePath(p.LowerName), b)
207+
return writeObjectToIndex(ctx, t, BuildPackagePath(p.LowerName), b)
208208
}
209209

210210
func getOrCreateIndexRepository(ctx context.Context, doer, owner *user_model.User) (*repo_model.Repository, error) {
@@ -252,29 +252,29 @@ func createOrUpdateConfigFile(ctx context.Context, repo *repo_model.Repository,
252252
return err
253253
}
254254

255-
return writeObjectToIndex(t, ConfigFileName, &b)
255+
return writeObjectToIndex(ctx, t, ConfigFileName, &b)
256256
},
257257
)
258258
}
259259

260260
// This is a shorter version of CreateOrUpdateRepoFile which allows to perform multiple actions on a git repository
261261
func alterRepositoryContent(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, commitMessage string, fn func(*files_service.TemporaryUploadRepository) error) error {
262-
t, err := files_service.NewTemporaryUploadRepository(ctx, repo)
262+
t, err := files_service.NewTemporaryUploadRepository(repo)
263263
if err != nil {
264264
return err
265265
}
266266
defer t.Close()
267267

268268
var lastCommitID string
269-
if err := t.Clone(repo.DefaultBranch, true); err != nil {
269+
if err := t.Clone(ctx, repo.DefaultBranch, true); err != nil {
270270
if !git.IsErrBranchNotExist(err) || !repo.IsEmpty {
271271
return err
272272
}
273-
if err := t.Init(repo.ObjectFormatName); err != nil {
273+
if err := t.Init(ctx, repo.ObjectFormatName); err != nil {
274274
return err
275275
}
276276
} else {
277-
if err := t.SetDefaultIndex(); err != nil {
277+
if err := t.SetDefaultIndex(ctx); err != nil {
278278
return err
279279
}
280280

@@ -290,7 +290,7 @@ func alterRepositoryContent(ctx context.Context, doer *user_model.User, repo *re
290290
return err
291291
}
292292

293-
treeHash, err := t.WriteTree()
293+
treeHash, err := t.WriteTree(ctx)
294294
if err != nil {
295295
return err
296296
}
@@ -301,19 +301,19 @@ func alterRepositoryContent(ctx context.Context, doer *user_model.User, repo *re
301301
CommitMessage: commitMessage,
302302
DoerUser: doer,
303303
}
304-
commitHash, err := t.CommitTree(commitOpts)
304+
commitHash, err := t.CommitTree(ctx, commitOpts)
305305
if err != nil {
306306
return err
307307
}
308308

309-
return t.Push(doer, commitHash, repo.DefaultBranch)
309+
return t.Push(ctx, doer, commitHash, repo.DefaultBranch)
310310
}
311311

312-
func writeObjectToIndex(t *files_service.TemporaryUploadRepository, path string, r io.Reader) error {
313-
hash, err := t.HashObject(r)
312+
func writeObjectToIndex(ctx context.Context, t *files_service.TemporaryUploadRepository, path string, r io.Reader) error {
313+
hash, err := t.HashObject(ctx, r)
314314
if err != nil {
315315
return err
316316
}
317317

318-
return t.AddObjectToIndex("100644", hash, path)
318+
return t.AddObjectToIndex(ctx, "100644", hash, path)
319319
}

‎services/repository/files/cherry_pick.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,18 @@ func CherryPick(ctx context.Context, repo *repo_model.Repository, doer *user_mod
3939
}
4040
message := strings.TrimSpace(opts.Message)
4141

42-
t, err := NewTemporaryUploadRepository(ctx, repo)
42+
t, err := NewTemporaryUploadRepository(repo)
4343
if err != nil {
4444
log.Error("NewTemporaryUploadRepository failed: %v", err)
4545
}
4646
defer t.Close()
47-
if err := t.Clone(opts.OldBranch, false); err != nil {
47+
if err := t.Clone(ctx, opts.OldBranch, false); err != nil {
4848
return nil, err
4949
}
50-
if err := t.SetDefaultIndex(); err != nil {
50+
if err := t.SetDefaultIndex(t.gitRepo.Ctx); err != nil {
5151
return nil, err
5252
}
53-
if err := t.RefreshIndex(); err != nil {
53+
if err := t.RefreshIndex(ctx); err != nil {
5454
return nil, err
5555
}
5656

@@ -103,7 +103,7 @@ func CherryPick(ctx context.Context, repo *repo_model.Repository, doer *user_mod
103103
return nil, fmt.Errorf("failed to merge due to conflicts")
104104
}
105105

106-
treeHash, err := t.WriteTree()
106+
treeHash, err := t.WriteTree(ctx)
107107
if err != nil {
108108
// likely non-sensical tree due to merge conflicts...
109109
return nil, err
@@ -124,13 +124,13 @@ func CherryPick(ctx context.Context, repo *repo_model.Repository, doer *user_mod
124124
if opts.Dates != nil {
125125
commitOpts.AuthorTime, commitOpts.CommitterTime = &opts.Dates.Author, &opts.Dates.Committer
126126
}
127-
commitHash, err := t.CommitTree(commitOpts)
127+
commitHash, err := t.CommitTree(ctx, commitOpts)
128128
if err != nil {
129129
return nil, err
130130
}
131131

132132
// Then push this tree to NewBranch
133-
if err := t.Push(doer, commitHash, opts.NewBranch); err != nil {
133+
if err := t.Push(ctx, doer, commitHash, opts.NewBranch); err != nil {
134134
return nil, err
135135
}
136136

‎services/repository/files/diff.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@ func GetDiffPreview(ctx context.Context, repo *repo_model.Repository, branch, tr
1616
if branch == "" {
1717
branch = repo.DefaultBranch
1818
}
19-
t, err := NewTemporaryUploadRepository(ctx, repo)
19+
t, err := NewTemporaryUploadRepository(repo)
2020
if err != nil {
2121
return nil, err
2222
}
2323
defer t.Close()
24-
if err := t.Clone(branch, true); err != nil {
24+
if err := t.Clone(ctx, branch, true); err != nil {
2525
return nil, err
2626
}
27-
if err := t.SetDefaultIndex(); err != nil {
27+
if err := t.SetDefaultIndex(ctx); err != nil {
2828
return nil, err
2929
}
3030

3131
// Add the object to the database
32-
objectHash, err := t.HashObject(strings.NewReader(content))
32+
objectHash, err := t.HashObject(ctx, strings.NewReader(content))
3333
if err != nil {
3434
return nil, err
3535
}
3636

3737
// Add the object to the index
38-
if err := t.AddObjectToIndex("100644", objectHash, treePath); err != nil {
38+
if err := t.AddObjectToIndex(ctx, "100644", objectHash, treePath); err != nil {
3939
return nil, err
4040
}
41-
return t.DiffIndex()
41+
return t.DiffIndex(ctx)
4242
}

‎services/repository/files/patch.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,15 @@ func ApplyDiffPatch(ctx context.Context, repo *repo_model.Repository, doer *user
126126

127127
message := strings.TrimSpace(opts.Message)
128128

129-
t, err := NewTemporaryUploadRepository(ctx, repo)
129+
t, err := NewTemporaryUploadRepository(repo)
130130
if err != nil {
131131
log.Error("NewTemporaryUploadRepository failed: %v", err)
132132
}
133133
defer t.Close()
134-
if err := t.Clone(opts.OldBranch, true); err != nil {
134+
if err := t.Clone(ctx, opts.OldBranch, true); err != nil {
135135
return nil, err
136136
}
137-
if err := t.SetDefaultIndex(); err != nil {
137+
if err := t.SetDefaultIndex(ctx); err != nil {
138138
return nil, err
139139
}
140140

@@ -179,7 +179,7 @@ func ApplyDiffPatch(ctx context.Context, repo *repo_model.Repository, doer *user
179179
}
180180

181181
// Now write the tree
182-
treeHash, err := t.WriteTree()
182+
treeHash, err := t.WriteTree(ctx)
183183
if err != nil {
184184
return nil, err
185185
}
@@ -199,13 +199,13 @@ func ApplyDiffPatch(ctx context.Context, repo *repo_model.Repository, doer *user
199199
if opts.Dates != nil {
200200
commitOpts.AuthorTime, commitOpts.CommitterTime = &opts.Dates.Author, &opts.Dates.Committer
201201
}
202-
commitHash, err := t.CommitTree(commitOpts)
202+
commitHash, err := t.CommitTree(ctx, commitOpts)
203203
if err != nil {
204204
return nil, err
205205
}
206206

207207
// Then push this tree to NewBranch
208-
if err := t.Push(doer, commitHash, opts.NewBranch); err != nil {
208+
if err := t.Push(ctx, doer, commitHash, opts.NewBranch); err != nil {
209209
return nil, err
210210
}
211211

0 commit comments

Comments
 (0)