Skip to content

Commit 3043eb3

Browse files
65436543
authored
Delete old git.NewCommand() and use it as git.NewCommandContext() (#18552)
1 parent 8ae5e6d commit 3043eb3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+258
-263
lines changed

‎cmd/hook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ func runHookPostReceive(c *cli.Context) error {
309309
defer cancel()
310310

311311
// First of all run update-server-info no matter what
312-
if _, err := git.NewCommandContext(ctx, "update-server-info").Run(); err != nil {
312+
if _, err := git.NewCommand(ctx, "update-server-info").Run(); err != nil {
313313
return fmt.Errorf("Failed to call 'git update-server-info': %v", err)
314314
}
315315

‎integrations/api_repo_git_tags_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ func TestAPIGitTags(t *testing.T) {
2828
token := getTokenForLoggedInUser(t, session)
2929

3030
// Set up git config for the tagger
31-
git.NewCommand("config", "user.name", user.Name).RunInDir(repo.RepoPath())
32-
git.NewCommand("config", "user.email", user.Email).RunInDir(repo.RepoPath())
31+
git.NewCommand(git.DefaultContext, "config", "user.name", user.Name).RunInDir(repo.RepoPath())
32+
git.NewCommand(git.DefaultContext, "config", "user.email", user.Email).RunInDir(repo.RepoPath())
3333

3434
gitRepo, _ := git.OpenRepository(repo.RepoPath())
3535
defer gitRepo.Close()

‎integrations/git_helper_for_declarative_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func doGitInitTestRepository(dstPath string) func(*testing.T) {
134134
// Init repository in dstPath
135135
assert.NoError(t, git.InitRepository(git.DefaultContext, dstPath, false))
136136
// forcibly set default branch to master
137-
_, err := git.NewCommand("symbolic-ref", "HEAD", git.BranchPrefix+"master").RunInDir(dstPath)
137+
_, err := git.NewCommand(git.DefaultContext, "symbolic-ref", "HEAD", git.BranchPrefix+"master").RunInDir(dstPath)
138138
assert.NoError(t, err)
139139
assert.NoError(t, os.WriteFile(filepath.Join(dstPath, "README.md"), []byte(fmt.Sprintf("# Testing Repository\n\nOriginally created in: %s", dstPath)), 0o644))
140140
assert.NoError(t, git.AddChanges(dstPath, true))
@@ -153,28 +153,28 @@ func doGitInitTestRepository(dstPath string) func(*testing.T) {
153153

154154
func doGitAddRemote(dstPath, remoteName string, u *url.URL) func(*testing.T) {
155155
return func(t *testing.T) {
156-
_, err := git.NewCommand("remote", "add", remoteName, u.String()).RunInDir(dstPath)
156+
_, err := git.NewCommand(git.DefaultContext, "remote", "add", remoteName, u.String()).RunInDir(dstPath)
157157
assert.NoError(t, err)
158158
}
159159
}
160160

161161
func doGitPushTestRepository(dstPath string, args ...string) func(*testing.T) {
162162
return func(t *testing.T) {
163-
_, err := git.NewCommand(append([]string{"push", "-u"}, args...)...).RunInDir(dstPath)
163+
_, err := git.NewCommand(git.DefaultContext, append([]string{"push", "-u"}, args...)...).RunInDir(dstPath)
164164
assert.NoError(t, err)
165165
}
166166
}
167167

168168
func doGitPushTestRepositoryFail(dstPath string, args ...string) func(*testing.T) {
169169
return func(t *testing.T) {
170-
_, err := git.NewCommand(append([]string{"push"}, args...)...).RunInDir(dstPath)
170+
_, err := git.NewCommand(git.DefaultContext, append([]string{"push"}, args...)...).RunInDir(dstPath)
171171
assert.Error(t, err)
172172
}
173173
}
174174

175175
func doGitCreateBranch(dstPath, branch string) func(*testing.T) {
176176
return func(t *testing.T) {
177-
_, err := git.NewCommand("checkout", "-b", branch).RunInDir(dstPath)
177+
_, err := git.NewCommand(git.DefaultContext, "checkout", "-b", branch).RunInDir(dstPath)
178178
assert.NoError(t, err)
179179
}
180180
}
@@ -188,7 +188,7 @@ func doGitCheckoutBranch(dstPath string, args ...string) func(*testing.T) {
188188

189189
func doGitMerge(dstPath string, args ...string) func(*testing.T) {
190190
return func(t *testing.T) {
191-
_, err := git.NewCommand(append([]string{"merge"}, args...)...).RunInDir(dstPath)
191+
_, err := git.NewCommand(git.DefaultContext, append([]string{"merge"}, args...)...).RunInDir(dstPath)
192192
assert.NoError(t, err)
193193
}
194194
}

‎integrations/git_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ func lfsCommitAndPushTest(t *testing.T, dstPath string) (littleLFS, bigLFS strin
160160
return
161161
}
162162
prefix := "lfs-data-file-"
163-
_, err := git.NewCommand("lfs").AddArguments("install").RunInDir(dstPath)
163+
_, err := git.NewCommand(git.DefaultContext, "lfs").AddArguments("install").RunInDir(dstPath)
164164
assert.NoError(t, err)
165-
_, err = git.NewCommand("lfs").AddArguments("track", prefix+"*").RunInDir(dstPath)
165+
_, err = git.NewCommand(git.DefaultContext, "lfs").AddArguments("track", prefix+"*").RunInDir(dstPath)
166166
assert.NoError(t, err)
167167
err = git.AddChanges(dstPath, false, ".gitattributes")
168168
assert.NoError(t, err)
@@ -292,20 +292,20 @@ func lockTest(t *testing.T, repoPath string) {
292292
}
293293

294294
func lockFileTest(t *testing.T, filename, repoPath string) {
295-
_, err := git.NewCommand("lfs").AddArguments("locks").RunInDir(repoPath)
295+
_, err := git.NewCommand(git.DefaultContext, "lfs").AddArguments("locks").RunInDir(repoPath)
296296
assert.NoError(t, err)
297-
_, err = git.NewCommand("lfs").AddArguments("lock", filename).RunInDir(repoPath)
297+
_, err = git.NewCommand(git.DefaultContext, "lfs").AddArguments("lock", filename).RunInDir(repoPath)
298298
assert.NoError(t, err)
299-
_, err = git.NewCommand("lfs").AddArguments("locks").RunInDir(repoPath)
299+
_, err = git.NewCommand(git.DefaultContext, "lfs").AddArguments("locks").RunInDir(repoPath)
300300
assert.NoError(t, err)
301-
_, err = git.NewCommand("lfs").AddArguments("unlock", filename).RunInDir(repoPath)
301+
_, err = git.NewCommand(git.DefaultContext, "lfs").AddArguments("unlock", filename).RunInDir(repoPath)
302302
assert.NoError(t, err)
303303
}
304304

305305
func doCommitAndPush(t *testing.T, size int, repoPath, prefix string) string {
306306
name, err := generateCommitWithNewData(size, repoPath, "[email protected]", "User Two", prefix)
307307
assert.NoError(t, err)
308-
_, err = git.NewCommand("push", "origin", "master").RunInDir(repoPath) // Push
308+
_, err = git.NewCommand(git.DefaultContext, "push", "origin", "master").RunInDir(repoPath) // Push
309309
assert.NoError(t, err)
310310
return name
311311
}
@@ -671,7 +671,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, baseBranch, headB
671671
})
672672

673673
t.Run("Push", func(t *testing.T) {
674-
_, err := git.NewCommand("push", "origin", "HEAD:refs/for/master", "-o", "topic="+headBranch).RunInDir(dstPath)
674+
_, err := git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/master", "-o", "topic="+headBranch).RunInDir(dstPath)
675675
if !assert.NoError(t, err) {
676676
return
677677
}
@@ -692,7 +692,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, baseBranch, headB
692692
assert.Contains(t, "Testing commit 1", prMsg.Body)
693693
assert.Equal(t, commit, prMsg.Head.Sha)
694694

695-
_, err = git.NewCommand("push", "origin", "HEAD:refs/for/master/test/"+headBranch).RunInDir(dstPath)
695+
_, err = git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/master/test/"+headBranch).RunInDir(dstPath)
696696
if !assert.NoError(t, err) {
697697
return
698698
}
@@ -745,7 +745,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, baseBranch, headB
745745
})
746746

747747
t.Run("Push2", func(t *testing.T) {
748-
_, err := git.NewCommand("push", "origin", "HEAD:refs/for/master", "-o", "topic="+headBranch).RunInDir(dstPath)
748+
_, err := git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/master", "-o", "topic="+headBranch).RunInDir(dstPath)
749749
if !assert.NoError(t, err) {
750750
return
751751
}
@@ -757,7 +757,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, baseBranch, headB
757757
assert.Equal(t, false, prMsg.HasMerged)
758758
assert.Equal(t, commit, prMsg.Head.Sha)
759759

760-
_, err = git.NewCommand("push", "origin", "HEAD:refs/for/master/test/"+headBranch).RunInDir(dstPath)
760+
_, err = git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/master/test/"+headBranch).RunInDir(dstPath)
761761
if !assert.NoError(t, err) {
762762
return
763763
}

‎integrations/pull_merge_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -269,19 +269,19 @@ func TestCantMergeUnrelated(t *testing.T) {
269269
}).(*repo_model.Repository)
270270
path := repo_model.RepoPath(user1.Name, repo1.Name)
271271

272-
_, err := git.NewCommand("read-tree", "--empty").RunInDir(path)
272+
_, err := git.NewCommand(git.DefaultContext, "read-tree", "--empty").RunInDir(path)
273273
assert.NoError(t, err)
274274

275275
stdin := bytes.NewBufferString("Unrelated File")
276276
var stdout strings.Builder
277-
err = git.NewCommand("hash-object", "-w", "--stdin").RunInDirFullPipeline(path, &stdout, nil, stdin)
277+
err = git.NewCommand(git.DefaultContext, "hash-object", "-w", "--stdin").RunInDirFullPipeline(path, &stdout, nil, stdin)
278278
assert.NoError(t, err)
279279
sha := strings.TrimSpace(stdout.String())
280280

281-
_, err = git.NewCommand("update-index", "--add", "--replace", "--cacheinfo", "100644", sha, "somewher-over-the-rainbow").RunInDir(path)
281+
_, err = git.NewCommand(git.DefaultContext, "update-index", "--add", "--replace", "--cacheinfo", "100644", sha, "somewher-over-the-rainbow").RunInDir(path)
282282
assert.NoError(t, err)
283283

284-
treeSha, err := git.NewCommand("write-tree").RunInDir(path)
284+
treeSha, err := git.NewCommand(git.DefaultContext, "write-tree").RunInDir(path)
285285
assert.NoError(t, err)
286286
treeSha = strings.TrimSpace(treeSha)
287287

@@ -301,11 +301,11 @@ func TestCantMergeUnrelated(t *testing.T) {
301301
_, _ = messageBytes.WriteString("\n")
302302

303303
stdout.Reset()
304-
err = git.NewCommand("commit-tree", treeSha).RunInDirTimeoutEnvFullPipeline(env, -1, path, &stdout, nil, messageBytes)
304+
err = git.NewCommand(git.DefaultContext, "commit-tree", treeSha).RunInDirTimeoutEnvFullPipeline(env, -1, path, &stdout, nil, messageBytes)
305305
assert.NoError(t, err)
306306
commitSha := strings.TrimSpace(stdout.String())
307307

308-
_, err = git.NewCommand("branch", "unrelated", commitSha).RunInDir(path)
308+
_, err = git.NewCommand(git.DefaultContext, "branch", "unrelated", commitSha).RunInDir(path)
309309
assert.NoError(t, err)
310310

311311
testEditFileToNewBranch(t, session, "user1", "repo1", "master", "conflict", "README.md", "Hello, World (Edited Once)\n")

‎integrations/repo_tag_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ func TestCreateNewTagProtected(t *testing.T) {
6666

6767
doGitClone(dstPath, u)(t)
6868

69-
_, err = git.NewCommand("tag", "v-2").RunInDir(dstPath)
69+
_, err = git.NewCommand(git.DefaultContext, "tag", "v-2").RunInDir(dstPath)
7070
assert.NoError(t, err)
7171

72-
_, err = git.NewCommand("push", "--tags").RunInDir(dstPath)
72+
_, err = git.NewCommand(git.DefaultContext, "push", "--tags").RunInDir(dstPath)
7373
assert.Error(t, err)
7474
assert.Contains(t, err.Error(), "Tag v-2 is protected")
7575
})

‎models/migrations/v128.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,17 @@ func fixMergeBase(x *xorm.Engine) error {
8383

8484
if !pr.HasMerged {
8585
var err error
86-
pr.MergeBase, err = git.NewCommand("merge-base", "--", pr.BaseBranch, gitRefName).RunInDir(repoPath)
86+
pr.MergeBase, err = git.NewCommand(git.DefaultContext, "merge-base", "--", pr.BaseBranch, gitRefName).RunInDir(repoPath)
8787
if err != nil {
8888
var err2 error
89-
pr.MergeBase, err2 = git.NewCommand("rev-parse", git.BranchPrefix+pr.BaseBranch).RunInDir(repoPath)
89+
pr.MergeBase, err2 = git.NewCommand(git.DefaultContext, "rev-parse", git.BranchPrefix+pr.BaseBranch).RunInDir(repoPath)
9090
if err2 != nil {
9191
log.Error("Unable to get merge base for PR ID %d, Index %d in %s/%s. Error: %v & %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err, err2)
9292
continue
9393
}
9494
}
9595
} else {
96-
parentsString, err := git.NewCommand("rev-list", "--parents", "-n", "1", pr.MergedCommitID).RunInDir(repoPath)
96+
parentsString, err := git.NewCommand(git.DefaultContext, "rev-list", "--parents", "-n", "1", pr.MergedCommitID).RunInDir(repoPath)
9797
if err != nil {
9898
log.Error("Unable to get parents for merged PR ID %d, Index %d in %s/%s. Error: %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err)
9999
continue
@@ -106,7 +106,7 @@ func fixMergeBase(x *xorm.Engine) error {
106106
args := append([]string{"merge-base", "--"}, parents[1:]...)
107107
args = append(args, gitRefName)
108108

109-
pr.MergeBase, err = git.NewCommand(args...).RunInDir(repoPath)
109+
pr.MergeBase, err = git.NewCommand(git.DefaultContext, args...).RunInDir(repoPath)
110110
if err != nil {
111111
log.Error("Unable to get merge base for merged PR ID %d, Index %d in %s/%s. Error: %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err)
112112
continue

‎models/migrations/v134.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func refixMergeBase(x *xorm.Engine) error {
8080

8181
gitRefName := fmt.Sprintf("refs/pull/%d/head", pr.Index)
8282

83-
parentsString, err := git.NewCommand("rev-list", "--parents", "-n", "1", pr.MergedCommitID).RunInDir(repoPath)
83+
parentsString, err := git.NewCommand(git.DefaultContext, "rev-list", "--parents", "-n", "1", pr.MergedCommitID).RunInDir(repoPath)
8484
if err != nil {
8585
log.Error("Unable to get parents for merged PR ID %d, Index %d in %s/%s. Error: %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err)
8686
continue
@@ -94,7 +94,7 @@ func refixMergeBase(x *xorm.Engine) error {
9494
args := append([]string{"merge-base", "--"}, parents[1:]...)
9595
args = append(args, gitRefName)
9696

97-
pr.MergeBase, err = git.NewCommand(args...).RunInDir(repoPath)
97+
pr.MergeBase, err = git.NewCommand(git.DefaultContext, args...).RunInDir(repoPath)
9898
if err != nil {
9999
log.Error("Unable to get merge base for merged PR ID %d, Index %d in %s/%s. Error: %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err)
100100
continue

‎modules/doctor/mergebase.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@ func checkPRMergeBase(ctx context.Context, logger log.Logger, autofix bool) erro
4444

4545
if !pr.HasMerged {
4646
var err error
47-
pr.MergeBase, err = git.NewCommandContext(ctx, "merge-base", "--", pr.BaseBranch, pr.GetGitRefName()).RunInDir(repoPath)
47+
pr.MergeBase, err = git.NewCommand(ctx, "merge-base", "--", pr.BaseBranch, pr.GetGitRefName()).RunInDir(repoPath)
4848
if err != nil {
4949
var err2 error
50-
pr.MergeBase, err2 = git.NewCommandContext(ctx, "rev-parse", git.BranchPrefix+pr.BaseBranch).RunInDir(repoPath)
50+
pr.MergeBase, err2 = git.NewCommand(ctx, "rev-parse", git.BranchPrefix+pr.BaseBranch).RunInDir(repoPath)
5151
if err2 != nil {
5252
logger.Warn("Unable to get merge base for PR ID %d, #%d onto %s in %s/%s. Error: %v & %v", pr.ID, pr.Index, pr.BaseBranch, pr.BaseRepo.OwnerName, pr.BaseRepo.Name, err, err2)
5353
return nil
5454
}
5555
}
5656
} else {
57-
parentsString, err := git.NewCommandContext(ctx, "rev-list", "--parents", "-n", "1", pr.MergedCommitID).RunInDir(repoPath)
57+
parentsString, err := git.NewCommand(ctx, "rev-list", "--parents", "-n", "1", pr.MergedCommitID).RunInDir(repoPath)
5858
if err != nil {
5959
logger.Warn("Unable to get parents for merged PR ID %d, #%d onto %s in %s/%s. Error: %v", pr.ID, pr.Index, pr.BaseBranch, pr.BaseRepo.OwnerName, pr.BaseRepo.Name, err)
6060
return nil
@@ -67,7 +67,7 @@ func checkPRMergeBase(ctx context.Context, logger log.Logger, autofix bool) erro
6767
args := append([]string{"merge-base", "--"}, parents[1:]...)
6868
args = append(args, pr.GetGitRefName())
6969

70-
pr.MergeBase, err = git.NewCommandContext(ctx, args...).RunInDir(repoPath)
70+
pr.MergeBase, err = git.NewCommand(ctx, args...).RunInDir(repoPath)
7171
if err != nil {
7272
logger.Warn("Unable to get merge base for merged PR ID %d, #%d onto %s in %s/%s. Error: %v", pr.ID, pr.Index, pr.BaseBranch, pr.BaseRepo.OwnerName, pr.BaseRepo.Name, err)
7373
return nil

‎modules/doctor/misc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ func checkEnablePushOptions(ctx context.Context, logger log.Logger, autofix bool
9595
defer r.Close()
9696

9797
if autofix {
98-
_, err := git.NewCommandContext(ctx, "config", "receive.advertisePushOptions", "true").RunInDir(r.Path)
98+
_, err := git.NewCommand(ctx, "config", "receive.advertisePushOptions", "true").RunInDir(r.Path)
9999
return err
100100
}
101101

102-
value, err := git.NewCommandContext(ctx, "config", "receive.advertisePushOptions").RunInDir(r.Path)
102+
value, err := git.NewCommand(ctx, "config", "receive.advertisePushOptions").RunInDir(r.Path)
103103
if err != nil {
104104
return err
105105
}

0 commit comments

Comments
 (0)