Skip to content

Commit 1d4cbbd

Browse files
zeripathzeripath
committed
extend propagation to the temprepo
Signed-off-by: Andrew Thornton <[email protected]>
1 parent f57eba0 commit 1d4cbbd

File tree

14 files changed

+69
-61
lines changed

14 files changed

+69
-61
lines changed

‎integrations/api_repo_file_helpers.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package integrations
77
import (
88
"code.gitea.io/gitea/models"
99
user_model "code.gitea.io/gitea/models/user"
10+
"code.gitea.io/gitea/modules/git"
1011
api "code.gitea.io/gitea/modules/structs"
1112
files_service "code.gitea.io/gitea/services/repository/files"
1213
)
@@ -20,7 +21,7 @@ func createFileInBranch(user *user_model.User, repo *models.Repository, treePath
2021
Author: nil,
2122
Committer: nil,
2223
}
23-
return files_service.CreateOrUpdateRepoFile(repo, user, opts)
24+
return files_service.CreateOrUpdateRepoFile(git.DefaultContext, repo, user, opts)
2425
}
2526

2627
func createFile(user *user_model.User, repo *models.Repository, treePath string) (*api.FileResponse, error) {

‎integrations/pull_update_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func createOutdatedPR(t *testing.T, actor, forkOrg *user_model.User) *models.Pul
9999
assert.NotEmpty(t, headRepo)
100100

101101
//create a commit on base Repo
102-
_, err = files_service.CreateOrUpdateRepoFile(baseRepo, actor, &files_service.UpdateRepoFileOptions{
102+
_, err = files_service.CreateOrUpdateRepoFile(git.DefaultContext, baseRepo, actor, &files_service.UpdateRepoFileOptions{
103103
TreePath: "File_A",
104104
Message: "Add File A",
105105
Content: "File A",
@@ -122,7 +122,7 @@ func createOutdatedPR(t *testing.T, actor, forkOrg *user_model.User) *models.Pul
122122
assert.NoError(t, err)
123123

124124
//create a commit on head Repo
125-
_, err = files_service.CreateOrUpdateRepoFile(headRepo, actor, &files_service.UpdateRepoFileOptions{
125+
_, err = files_service.CreateOrUpdateRepoFile(git.DefaultContext, headRepo, actor, &files_service.UpdateRepoFileOptions{
126126
TreePath: "File_B",
127127
Message: "Add File on PR branch",
128128
Content: "File B",

‎integrations/repofiles_delete_test.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
"code.gitea.io/gitea/models"
1212
"code.gitea.io/gitea/models/unittest"
13+
"code.gitea.io/gitea/modules/git"
1314
api "code.gitea.io/gitea/modules/structs"
1415
"code.gitea.io/gitea/modules/test"
1516
files_service "code.gitea.io/gitea/services/repository/files"
@@ -80,7 +81,7 @@ func testDeleteRepoFile(t *testing.T, u *url.URL) {
8081
opts := getDeleteRepoFileOptions(repo)
8182

8283
t.Run("Delete README.md file", func(t *testing.T) {
83-
fileResponse, err := files_service.DeleteRepoFile(repo, doer, opts)
84+
fileResponse, err := files_service.DeleteRepoFile(git.DefaultContext, repo, doer, opts)
8485
assert.NoError(t, err)
8586
expectedFileResponse := getExpectedDeleteFileResponse(u)
8687
assert.NotNil(t, fileResponse)
@@ -92,7 +93,7 @@ func testDeleteRepoFile(t *testing.T, u *url.URL) {
9293
})
9394

9495
t.Run("Verify README.md has been deleted", func(t *testing.T) {
95-
fileResponse, err := files_service.DeleteRepoFile(repo, doer, opts)
96+
fileResponse, err := files_service.DeleteRepoFile(git.DefaultContext, repo, doer, opts)
9697
assert.Nil(t, fileResponse)
9798
expectedError := "repository file does not exist [path: " + opts.TreePath + "]"
9899
assert.EqualError(t, err, expectedError)
@@ -122,7 +123,7 @@ func testDeleteRepoFileWithoutBranchNames(t *testing.T, u *url.URL) {
122123
opts.NewBranch = ""
123124

124125
t.Run("Delete README.md without Branch Name", func(t *testing.T) {
125-
fileResponse, err := files_service.DeleteRepoFile(repo, doer, opts)
126+
fileResponse, err := files_service.DeleteRepoFile(git.DefaultContext, repo, doer, opts)
126127
assert.NoError(t, err)
127128
expectedFileResponse := getExpectedDeleteFileResponse(u)
128129
assert.NotNil(t, fileResponse)
@@ -151,7 +152,7 @@ func TestDeleteRepoFileErrors(t *testing.T) {
151152
t.Run("Bad branch", func(t *testing.T) {
152153
opts := getDeleteRepoFileOptions(repo)
153154
opts.OldBranch = "bad_branch"
154-
fileResponse, err := files_service.DeleteRepoFile(repo, doer, opts)
155+
fileResponse, err := files_service.DeleteRepoFile(git.DefaultContext, repo, doer, opts)
155156
assert.Error(t, err)
156157
assert.Nil(t, fileResponse)
157158
expectedError := "branch does not exist [name: " + opts.OldBranch + "]"
@@ -162,7 +163,7 @@ func TestDeleteRepoFileErrors(t *testing.T) {
162163
opts := getDeleteRepoFileOptions(repo)
163164
origSHA := opts.SHA
164165
opts.SHA = "bad_sha"
165-
fileResponse, err := files_service.DeleteRepoFile(repo, doer, opts)
166+
fileResponse, err := files_service.DeleteRepoFile(git.DefaultContext, repo, doer, opts)
166167
assert.Nil(t, fileResponse)
167168
assert.Error(t, err)
168169
expectedError := "sha does not match [given: " + opts.SHA + ", expected: " + origSHA + "]"
@@ -172,7 +173,7 @@ func TestDeleteRepoFileErrors(t *testing.T) {
172173
t.Run("New branch already exists", func(t *testing.T) {
173174
opts := getDeleteRepoFileOptions(repo)
174175
opts.NewBranch = "develop"
175-
fileResponse, err := files_service.DeleteRepoFile(repo, doer, opts)
176+
fileResponse, err := files_service.DeleteRepoFile(git.DefaultContext, repo, doer, opts)
176177
assert.Nil(t, fileResponse)
177178
assert.Error(t, err)
178179
expectedError := "branch already exists [name: " + opts.NewBranch + "]"
@@ -182,7 +183,7 @@ func TestDeleteRepoFileErrors(t *testing.T) {
182183
t.Run("TreePath is empty:", func(t *testing.T) {
183184
opts := getDeleteRepoFileOptions(repo)
184185
opts.TreePath = ""
185-
fileResponse, err := files_service.DeleteRepoFile(repo, doer, opts)
186+
fileResponse, err := files_service.DeleteRepoFile(git.DefaultContext, repo, doer, opts)
186187
assert.Nil(t, fileResponse)
187188
assert.Error(t, err)
188189
expectedError := "path contains a malformed path component [path: ]"
@@ -192,7 +193,7 @@ func TestDeleteRepoFileErrors(t *testing.T) {
192193
t.Run("TreePath is a git directory:", func(t *testing.T) {
193194
opts := getDeleteRepoFileOptions(repo)
194195
opts.TreePath = ".git"
195-
fileResponse, err := files_service.DeleteRepoFile(repo, doer, opts)
196+
fileResponse, err := files_service.DeleteRepoFile(git.DefaultContext, repo, doer, opts)
196197
assert.Nil(t, fileResponse)
197198
assert.Error(t, err)
198199
expectedError := "path contains a malformed path component [path: " + opts.TreePath + "]"

‎integrations/repofiles_update_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ func TestCreateOrUpdateRepoFileForCreate(t *testing.T) {
198198
opts := getCreateRepoFileOptions(repo)
199199

200200
// test
201-
fileResponse, err := files_service.CreateOrUpdateRepoFile(repo, doer, opts)
201+
fileResponse, err := files_service.CreateOrUpdateRepoFile(git.DefaultContext, repo, doer, opts)
202202

203203
// asserts
204204
assert.NoError(t, err)
@@ -234,7 +234,7 @@ func TestCreateOrUpdateRepoFileForUpdate(t *testing.T) {
234234
opts := getUpdateRepoFileOptions(repo)
235235

236236
// test
237-
fileResponse, err := files_service.CreateOrUpdateRepoFile(repo, doer, opts)
237+
fileResponse, err := files_service.CreateOrUpdateRepoFile(git.DefaultContext, repo, doer, opts)
238238

239239
// asserts
240240
assert.NoError(t, err)
@@ -269,7 +269,7 @@ func TestCreateOrUpdateRepoFileForUpdateWithFileMove(t *testing.T) {
269269
opts.TreePath = "README_new.md" // new file name, README_new.md
270270

271271
// test
272-
fileResponse, err := files_service.CreateOrUpdateRepoFile(repo, doer, opts)
272+
fileResponse, err := files_service.CreateOrUpdateRepoFile(git.DefaultContext, repo, doer, opts)
273273

274274
// asserts
275275
assert.NoError(t, err)
@@ -319,7 +319,7 @@ func TestCreateOrUpdateRepoFileWithoutBranchNames(t *testing.T) {
319319
opts.NewBranch = ""
320320

321321
// test
322-
fileResponse, err := files_service.CreateOrUpdateRepoFile(repo, doer, opts)
322+
fileResponse, err := files_service.CreateOrUpdateRepoFile(git.DefaultContext, repo, doer, opts)
323323

324324
// asserts
325325
assert.NoError(t, err)
@@ -349,7 +349,7 @@ func TestCreateOrUpdateRepoFileErrors(t *testing.T) {
349349
t.Run("bad branch", func(t *testing.T) {
350350
opts := getUpdateRepoFileOptions(repo)
351351
opts.OldBranch = "bad_branch"
352-
fileResponse, err := files_service.CreateOrUpdateRepoFile(repo, doer, opts)
352+
fileResponse, err := files_service.CreateOrUpdateRepoFile(git.DefaultContext, repo, doer, opts)
353353
assert.Error(t, err)
354354
assert.Nil(t, fileResponse)
355355
expectedError := "branch does not exist [name: " + opts.OldBranch + "]"
@@ -360,7 +360,7 @@ func TestCreateOrUpdateRepoFileErrors(t *testing.T) {
360360
opts := getUpdateRepoFileOptions(repo)
361361
origSHA := opts.SHA
362362
opts.SHA = "bad_sha"
363-
fileResponse, err := files_service.CreateOrUpdateRepoFile(repo, doer, opts)
363+
fileResponse, err := files_service.CreateOrUpdateRepoFile(git.DefaultContext, repo, doer, opts)
364364
assert.Nil(t, fileResponse)
365365
assert.Error(t, err)
366366
expectedError := "sha does not match [given: " + opts.SHA + ", expected: " + origSHA + "]"
@@ -370,7 +370,7 @@ func TestCreateOrUpdateRepoFileErrors(t *testing.T) {
370370
t.Run("new branch already exists", func(t *testing.T) {
371371
opts := getUpdateRepoFileOptions(repo)
372372
opts.NewBranch = "develop"
373-
fileResponse, err := files_service.CreateOrUpdateRepoFile(repo, doer, opts)
373+
fileResponse, err := files_service.CreateOrUpdateRepoFile(git.DefaultContext, repo, doer, opts)
374374
assert.Nil(t, fileResponse)
375375
assert.Error(t, err)
376376
expectedError := "branch already exists [name: " + opts.NewBranch + "]"
@@ -380,7 +380,7 @@ func TestCreateOrUpdateRepoFileErrors(t *testing.T) {
380380
t.Run("treePath is empty:", func(t *testing.T) {
381381
opts := getUpdateRepoFileOptions(repo)
382382
opts.TreePath = ""
383-
fileResponse, err := files_service.CreateOrUpdateRepoFile(repo, doer, opts)
383+
fileResponse, err := files_service.CreateOrUpdateRepoFile(git.DefaultContext, repo, doer, opts)
384384
assert.Nil(t, fileResponse)
385385
assert.Error(t, err)
386386
expectedError := "path contains a malformed path component [path: ]"
@@ -390,7 +390,7 @@ func TestCreateOrUpdateRepoFileErrors(t *testing.T) {
390390
t.Run("treePath is a git directory:", func(t *testing.T) {
391391
opts := getUpdateRepoFileOptions(repo)
392392
opts.TreePath = ".git"
393-
fileResponse, err := files_service.CreateOrUpdateRepoFile(repo, doer, opts)
393+
fileResponse, err := files_service.CreateOrUpdateRepoFile(git.DefaultContext, repo, doer, opts)
394394
assert.Nil(t, fileResponse)
395395
assert.Error(t, err)
396396
expectedError := "path contains a malformed path component [path: " + opts.TreePath + "]"
@@ -400,7 +400,7 @@ func TestCreateOrUpdateRepoFileErrors(t *testing.T) {
400400
t.Run("create file that already exists", func(t *testing.T) {
401401
opts := getCreateRepoFileOptions(repo)
402402
opts.TreePath = "README.md" //already exists
403-
fileResponse, err := files_service.CreateOrUpdateRepoFile(repo, doer, opts)
403+
fileResponse, err := files_service.CreateOrUpdateRepoFile(git.DefaultContext, repo, doer, opts)
404404
assert.Nil(t, fileResponse)
405405
assert.Error(t, err)
406406
expectedError := "repository file already exists [path: " + opts.TreePath + "]"

‎modules/git/repo_compare.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package git
77

88
import (
99
"bytes"
10+
"context"
1011
"fmt"
1112
"io"
1213
"regexp"
@@ -159,15 +160,15 @@ func (repo *Repository) GetDiffNumChangedFiles(base, head string, directComparis
159160

160161
// GetDiffShortStat counts number of changed files, number of additions and deletions
161162
func (repo *Repository) GetDiffShortStat(base, head string) (numFiles, totalAdditions, totalDeletions int, err error) {
162-
numFiles, totalAdditions, totalDeletions, err = GetDiffShortStat(repo.Path, base+"..."+head)
163+
numFiles, totalAdditions, totalDeletions, err = GetDiffShortStat(repo.Ctx, repo.Path, base+"..."+head)
163164
if err != nil && strings.Contains(err.Error(), "no merge base") {
164-
return GetDiffShortStat(repo.Path, base, head)
165+
return GetDiffShortStat(repo.Ctx, repo.Path, base, head)
165166
}
166167
return
167168
}
168169

169170
// GetDiffShortStat counts number of changed files, number of additions and deletions
170-
func GetDiffShortStat(repoPath string, args ...string) (numFiles, totalAdditions, totalDeletions int, err error) {
171+
func GetDiffShortStat(ctx context.Context, repoPath string, args ...string) (numFiles, totalAdditions, totalDeletions int, err error) {
171172
// Now if we call:
172173
// $ git diff --shortstat 1ebb35b98889ff77299f24d82da426b434b0cca0...788b8b1440462d477f45b0088875
173174
// we get:
@@ -177,7 +178,7 @@ func GetDiffShortStat(repoPath string, args ...string) (numFiles, totalAdditions
177178
"--shortstat",
178179
}, args...)
179180

180-
stdout, err := NewCommand(args...).RunInDir(repoPath)
181+
stdout, err := NewCommandContext(ctx, args...).RunInDir(repoPath)
181182
if err != nil {
182183
return 0, 0, 0, err
183184
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ func createOrUpdateFile(ctx *context.APIContext, opts *files_service.UpdateRepoF
401401
}
402402
opts.Content = string(content)
403403

404-
return files_service.CreateOrUpdateRepoFile(ctx.Repo.Repository, ctx.User, opts)
404+
return files_service.CreateOrUpdateRepoFile(ctx, ctx.Repo.Repository, ctx.User, opts)
405405
}
406406

407407
// DeleteFile Delete a fle in a repository
@@ -488,7 +488,7 @@ func DeleteFile(ctx *context.APIContext) {
488488
opts.Message = ctx.Tr("repo.editor.delete", opts.TreePath)
489489
}
490490

491-
if fileResponse, err := files_service.DeleteRepoFile(ctx.Repo.Repository, ctx.User, opts); err != nil {
491+
if fileResponse, err := files_service.DeleteRepoFile(ctx, ctx.Repo.Repository, ctx.User, opts); err != nil {
492492
if git.IsErrBranchNotExist(err) || models.IsErrRepoFileDoesNotExist(err) || git.IsErrNotExist(err) {
493493
ctx.Error(http.StatusNotFound, "DeleteFile", err)
494494
return

‎routers/web/repo/editor.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ func editFilePost(ctx *context.Context, form forms.EditRepoFileForm, isNewFile b
244244
message += "\n\n" + form.CommitMessage
245245
}
246246

247-
if _, err := files_service.CreateOrUpdateRepoFile(ctx.Repo.Repository, ctx.User, &files_service.UpdateRepoFileOptions{
247+
if _, err := files_service.CreateOrUpdateRepoFile(ctx, ctx.Repo.Repository, ctx.User, &files_service.UpdateRepoFileOptions{
248248
LastCommitID: form.LastCommit,
249249
OldBranch: ctx.Repo.BranchName,
250250
NewBranch: branchName,
@@ -369,7 +369,7 @@ func DiffPreviewPost(ctx *context.Context) {
369369
return
370370
}
371371

372-
diff, err := files_service.GetDiffPreview(ctx.Repo.Repository, ctx.Repo.BranchName, treePath, form.Content)
372+
diff, err := files_service.GetDiffPreview(ctx, ctx.Repo.Repository, ctx.Repo.BranchName, treePath, form.Content)
373373
if err != nil {
374374
ctx.Error(http.StatusInternalServerError, "GetDiffPreview: "+err.Error())
375375
return
@@ -450,7 +450,7 @@ func DeleteFilePost(ctx *context.Context) {
450450
message += "\n\n" + form.CommitMessage
451451
}
452452

453-
if _, err := files_service.DeleteRepoFile(ctx.Repo.Repository, ctx.User, &files_service.DeleteRepoFileOptions{
453+
if _, err := files_service.DeleteRepoFile(ctx, ctx.Repo.Repository, ctx.User, &files_service.DeleteRepoFileOptions{
454454
LastCommitID: form.LastCommit,
455455
OldBranch: ctx.Repo.BranchName,
456456
NewBranch: branchName,
@@ -658,7 +658,7 @@ func UploadFilePost(ctx *context.Context) {
658658
message += "\n\n" + form.CommitMessage
659659
}
660660

661-
if err := files_service.UploadRepoFiles(ctx.Repo.Repository, ctx.User, &files_service.UploadRepoFileOptions{
661+
if err := files_service.UploadRepoFiles(ctx, ctx.Repo.Repository, ctx.User, &files_service.UploadRepoFileOptions{
662662
LastCommitID: ctx.Repo.CommitID,
663663
OldBranch: oldBranchName,
664664
NewBranch: branchName,

‎services/gitdiff/gitdiff.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1466,12 +1466,12 @@ func GetDiff(gitRepo *git.Repository, opts *DiffOptions, files ...string) (*Diff
14661466
if len(opts.BeforeCommitID) == 0 || opts.BeforeCommitID == git.EmptySHA {
14671467
shortstatArgs = []string{git.EmptyTreeSHA, opts.AfterCommitID}
14681468
}
1469-
diff.NumFiles, diff.TotalAddition, diff.TotalDeletion, err = git.GetDiffShortStat(repoPath, shortstatArgs...)
1469+
diff.NumFiles, diff.TotalAddition, diff.TotalDeletion, err = git.GetDiffShortStat(ctx, repoPath, shortstatArgs...)
14701470
if err != nil && strings.Contains(err.Error(), "no merge base") {
14711471
// git >= 2.28 now returns an error if base and head have become unrelated.
14721472
// previously it would return the results of git diff --shortstat base head so let's try that...
14731473
shortstatArgs = []string{opts.BeforeCommitID, opts.AfterCommitID}
1474-
diff.NumFiles, diff.TotalAddition, diff.TotalDeletion, err = git.GetDiffShortStat(repoPath, shortstatArgs...)
1474+
diff.NumFiles, diff.TotalAddition, diff.TotalDeletion, err = git.GetDiffShortStat(ctx, repoPath, shortstatArgs...)
14751475
}
14761476
if err != nil {
14771477
return nil, err

‎services/repository/files/delete.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package files
66

77
import (
8+
"context"
89
"fmt"
910
"strings"
1011

@@ -30,7 +31,7 @@ type DeleteRepoFileOptions struct {
3031
}
3132

3233
// DeleteRepoFile deletes a file in the given repository
33-
func DeleteRepoFile(repo *models.Repository, doer *user_model.User, opts *DeleteRepoFileOptions) (*api.FileResponse, error) {
34+
func DeleteRepoFile(ctx context.Context, repo *models.Repository, doer *user_model.User, opts *DeleteRepoFileOptions) (*api.FileResponse, error) {
3435
// If no branch name is set, assume the repo's default branch
3536
if opts.OldBranch == "" {
3637
opts.OldBranch = repo.DefaultBranch
@@ -73,7 +74,7 @@ func DeleteRepoFile(repo *models.Repository, doer *user_model.User, opts *Delete
7374

7475
author, committer := GetAuthorAndCommitterUsers(opts.Author, opts.Committer, doer)
7576

76-
t, err := NewTemporaryUploadRepository(repo)
77+
t, err := NewTemporaryUploadRepository(ctx, repo)
7778
if err != nil {
7879
return nil, err
7980
}

‎services/repository/files/diff.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@
55
package files
66

77
import (
8+
"context"
89
"strings"
910

1011
"code.gitea.io/gitea/models"
1112
"code.gitea.io/gitea/services/gitdiff"
1213
)
1314

1415
// GetDiffPreview produces and returns diff result of a file which is not yet committed.
15-
func GetDiffPreview(repo *models.Repository, branch, treePath, content string) (*gitdiff.Diff, error) {
16+
func GetDiffPreview(ctx context.Context, repo *models.Repository, branch, treePath, content string) (*gitdiff.Diff, error) {
1617
if branch == "" {
1718
branch = repo.DefaultBranch
1819
}
19-
t, err := NewTemporaryUploadRepository(repo)
20+
t, err := NewTemporaryUploadRepository(ctx, repo)
2021
if err != nil {
2122
return nil, err
2223
}

‎services/repository/files/diff_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func TestGetDiffPreview(t *testing.T) {
117117
expectedDiff.NumFiles = len(expectedDiff.Files)
118118

119119
t.Run("with given branch", func(t *testing.T) {
120-
diff, err := GetDiffPreview(ctx.Repo.Repository, branch, treePath, content)
120+
diff, err := GetDiffPreview(ctx, ctx.Repo.Repository, branch, treePath, content)
121121
assert.NoError(t, err)
122122
expectedBs, err := json.Marshal(expectedDiff)
123123
assert.NoError(t, err)
@@ -127,7 +127,7 @@ func TestGetDiffPreview(t *testing.T) {
127127
})
128128

129129
t.Run("empty branch, same results", func(t *testing.T) {
130-
diff, err := GetDiffPreview(ctx.Repo.Repository, "", treePath, content)
130+
diff, err := GetDiffPreview(ctx, ctx.Repo.Repository, "", treePath, content)
131131
assert.NoError(t, err)
132132
expectedBs, err := json.Marshal(expectedDiff)
133133
assert.NoError(t, err)
@@ -152,20 +152,20 @@ func TestGetDiffPreviewErrors(t *testing.T) {
152152
content := "# repo1\n\nDescription for repo1\nthis is a new line"
153153

154154
t.Run("empty repo", func(t *testing.T) {
155-
diff, err := GetDiffPreview(&models.Repository{}, branch, treePath, content)
155+
diff, err := GetDiffPreview(ctx, &models.Repository{}, branch, treePath, content)
156156
assert.Nil(t, diff)
157157
assert.EqualError(t, err, "repository does not exist [id: 0, uid: 0, owner_name: , name: ]")
158158
})
159159

160160
t.Run("bad branch", func(t *testing.T) {
161161
badBranch := "bad_branch"
162-
diff, err := GetDiffPreview(ctx.Repo.Repository, badBranch, treePath, content)
162+
diff, err := GetDiffPreview(ctx, ctx.Repo.Repository, badBranch, treePath, content)
163163
assert.Nil(t, diff)
164164
assert.EqualError(t, err, "branch does not exist [name: "+badBranch+"]")
165165
})
166166

167167
t.Run("empty treePath", func(t *testing.T) {
168-
diff, err := GetDiffPreview(ctx.Repo.Repository, branch, "", content)
168+
diff, err := GetDiffPreview(ctx, ctx.Repo.Repository, branch, "", content)
169169
assert.Nil(t, diff)
170170
assert.EqualError(t, err, "path is invalid [path: ]")
171171
})

0 commit comments

Comments
 (0)