Skip to content

Commit c5fbab7

Browse files
lunnylunny
committed
Revert "Rename gitcmd.NewCommand to gitcmd.New"
This reverts commit 48d5b0f.
1 parent 7151d42 commit c5fbab7

File tree

97 files changed

+316
-316
lines changed

Some content is hidden

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

97 files changed

+316
-316
lines changed

‎cmd/hook.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ func runHookPostReceive(ctx context.Context, c *cli.Command) error {
313313
setup(ctx, c.Bool("debug"))
314314

315315
// First of all run update-server-info no matter what
316-
if _, _, err := gitcmd.New("update-server-info").RunStdString(ctx, nil); err != nil {
316+
if _, _, err := gitcmd.NewCommand("update-server-info").RunStdString(ctx, nil); err != nil {
317317
return fmt.Errorf("failed to call 'git update-server-info': %w", err)
318318
}
319319

‎models/migrations/v1_12/v128.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,17 @@ func FixMergeBase(ctx context.Context, x *xorm.Engine) error {
8484

8585
if !pr.HasMerged {
8686
var err error
87-
pr.MergeBase, _, err = gitcmd.New("merge-base").AddDashesAndList(pr.BaseBranch, gitRefName).RunStdString(ctx, &gitcmd.RunOpts{Dir: repoPath})
87+
pr.MergeBase, _, err = gitcmd.NewCommand("merge-base").AddDashesAndList(pr.BaseBranch, gitRefName).RunStdString(ctx, &gitcmd.RunOpts{Dir: repoPath})
8888
if err != nil {
8989
var err2 error
90-
pr.MergeBase, _, err2 = gitcmd.New("rev-parse").AddDynamicArguments(git.BranchPrefix+pr.BaseBranch).RunStdString(ctx, &gitcmd.RunOpts{Dir: repoPath})
90+
pr.MergeBase, _, err2 = gitcmd.NewCommand("rev-parse").AddDynamicArguments(git.BranchPrefix+pr.BaseBranch).RunStdString(ctx, &gitcmd.RunOpts{Dir: repoPath})
9191
if err2 != nil {
9292
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)
9393
continue
9494
}
9595
}
9696
} else {
97-
parentsString, _, err := gitcmd.New("rev-list", "--parents", "-n", "1").AddDynamicArguments(pr.MergedCommitID).RunStdString(ctx, &gitcmd.RunOpts{Dir: repoPath})
97+
parentsString, _, err := gitcmd.NewCommand("rev-list", "--parents", "-n", "1").AddDynamicArguments(pr.MergedCommitID).RunStdString(ctx, &gitcmd.RunOpts{Dir: repoPath})
9898
if err != nil {
9999
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)
100100
continue
@@ -106,7 +106,7 @@ func FixMergeBase(ctx context.Context, x *xorm.Engine) error {
106106

107107
refs := append([]string{}, parents[1:]...)
108108
refs = append(refs, gitRefName)
109-
cmd := gitcmd.New("merge-base").AddDashesAndList(refs...)
109+
cmd := gitcmd.NewCommand("merge-base").AddDashesAndList(refs...)
110110

111111
pr.MergeBase, _, err = cmd.RunStdString(ctx, &gitcmd.RunOpts{Dir: repoPath})
112112
if err != nil {

‎models/migrations/v1_12/v134.go‎

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

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

83-
parentsString, _, err := gitcmd.New("rev-list", "--parents", "-n", "1").AddDynamicArguments(pr.MergedCommitID).RunStdString(ctx, &gitcmd.RunOpts{Dir: repoPath})
83+
parentsString, _, err := gitcmd.NewCommand("rev-list", "--parents", "-n", "1").AddDynamicArguments(pr.MergedCommitID).RunStdString(ctx, &gitcmd.RunOpts{Dir: 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
@@ -93,7 +93,7 @@ func RefixMergeBase(ctx context.Context, x *xorm.Engine) error {
9393
// we should recalculate
9494
refs := append([]string{}, parents[1:]...)
9595
refs = append(refs, gitRefName)
96-
cmd := gitcmd.New("merge-base").AddDashesAndList(refs...)
96+
cmd := gitcmd.NewCommand("merge-base").AddDashesAndList(refs...)
9797

9898
pr.MergeBase, _, err = cmd.RunStdString(ctx, &gitcmd.RunOpts{Dir: repoPath})
9999
if err != nil {

‎modules/git/attribute/checker.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
func checkAttrCommand(gitRepo *git.Repository, treeish string, filenames, attributes []string) (*gitcmd.Command, []string, func(), error) {
1818
cancel := func() {}
1919
envs := []string{"GIT_FLUSH=1"}
20-
cmd := gitcmd.New("check-attr", "-z")
20+
cmd := gitcmd.NewCommand("check-attr", "-z")
2121
if len(attributes) == 0 {
2222
cmd.AddArguments("--all")
2323
}

‎modules/git/batch_reader.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ type WriteCloserError interface {
3030
// This is needed otherwise the git cat-file will hang for invalid repositories.
3131
func ensureValidGitRepository(ctx context.Context, repoPath string) error {
3232
stderr := strings.Builder{}
33-
err := gitcmd.New("rev-parse").
33+
err := gitcmd.NewCommand("rev-parse").
3434
Run(ctx, &gitcmd.RunOpts{
3535
Dir: repoPath,
3636
Stderr: &stderr,
@@ -62,7 +62,7 @@ func catFileBatchCheck(ctx context.Context, repoPath string) (WriteCloserError,
6262

6363
go func() {
6464
stderr := strings.Builder{}
65-
err := gitcmd.New("cat-file", "--batch-check").
65+
err := gitcmd.NewCommand("cat-file", "--batch-check").
6666
Run(ctx, &gitcmd.RunOpts{
6767
Dir: repoPath,
6868
Stdin: batchStdinReader,
@@ -110,7 +110,7 @@ func catFileBatch(ctx context.Context, repoPath string) (WriteCloserError, *bufi
110110

111111
go func() {
112112
stderr := strings.Builder{}
113-
err := gitcmd.New("cat-file", "--batch").
113+
err := gitcmd.NewCommand("cat-file", "--batch").
114114
Run(ctx, &gitcmd.RunOpts{
115115
Dir: repoPath,
116116
Stdin: batchStdinReader,

‎modules/git/blame.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func CreateBlameReader(ctx context.Context, objectFormat ObjectFormat, repoPath
142142
}
143143
}()
144144

145-
cmd := gitcmd.New("blame", "--porcelain")
145+
cmd := gitcmd.NewCommand("blame", "--porcelain")
146146

147147
if DefaultFeatures().CheckVersionAtLeast("2.23") && !bypassBlameIgnore {
148148
ignoreRevsFileName, ignoreRevsFileCleanup, err = tryCreateBlameIgnoreRevsFile(commit)

‎modules/git/commit.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func (c *Commit) GetCommitByPath(relpath string) (*Commit, error) {
8888

8989
// AddChanges marks local changes to be ready for commit.
9090
func AddChanges(ctx context.Context, repoPath string, all bool, files ...string) error {
91-
cmd := gitcmd.New().AddArguments("add")
91+
cmd := gitcmd.NewCommand().AddArguments("add")
9292
if all {
9393
cmd.AddArguments("--all")
9494
}
@@ -107,7 +107,7 @@ type CommitChangesOptions struct {
107107
// CommitChanges commits local changes with given committer, author and message.
108108
// If author is nil, it will be the same as committer.
109109
func CommitChanges(ctx context.Context, repoPath string, opts CommitChangesOptions) error {
110-
cmd := gitcmd.New()
110+
cmd := gitcmd.NewCommand()
111111
if opts.Committer != nil {
112112
cmd.AddOptionValues("-c", "user.name="+opts.Committer.Name)
113113
cmd.AddOptionValues("-c", "user.email="+opts.Committer.Email)
@@ -132,7 +132,7 @@ func CommitChanges(ctx context.Context, repoPath string, opts CommitChangesOptio
132132

133133
// AllCommitsCount returns count of all commits in repository
134134
func AllCommitsCount(ctx context.Context, repoPath string, hidePRRefs bool, files ...string) (int64, error) {
135-
cmd := gitcmd.New("rev-list")
135+
cmd := gitcmd.NewCommand("rev-list")
136136
if hidePRRefs {
137137
cmd.AddArguments("--exclude=" + PullPrefix + "*")
138138
}
@@ -161,7 +161,7 @@ type CommitsCountOptions struct {
161161

162162
// CommitsCount returns number of total commits of until given revision.
163163
func CommitsCount(ctx context.Context, opts CommitsCountOptions) (int64, error) {
164-
cmd := gitcmd.New("rev-list", "--count")
164+
cmd := gitcmd.NewCommand("rev-list", "--count")
165165

166166
cmd.AddDynamicArguments(opts.Revision...)
167167

@@ -208,7 +208,7 @@ func (c *Commit) HasPreviousCommit(objectID ObjectID) (bool, error) {
208208
return false, nil
209209
}
210210

211-
_, _, err := gitcmd.New("merge-base", "--is-ancestor").AddDynamicArguments(that, this).RunStdString(c.repo.Ctx, &gitcmd.RunOpts{Dir: c.repo.Path})
211+
_, _, err := gitcmd.NewCommand("merge-base", "--is-ancestor").AddDynamicArguments(that, this).RunStdString(c.repo.Ctx, &gitcmd.RunOpts{Dir: c.repo.Path})
212212
if err == nil {
213213
return true, nil
214214
}
@@ -349,7 +349,7 @@ func (c *Commit) GetFileContent(filename string, limit int) (string, error) {
349349

350350
// GetBranchName gets the closest branch name (as returned by 'git name-rev --name-only')
351351
func (c *Commit) GetBranchName() (string, error) {
352-
cmd := gitcmd.New("name-rev")
352+
cmd := gitcmd.NewCommand("name-rev")
353353
if DefaultFeatures().CheckVersionAtLeast("2.13.0") {
354354
cmd.AddArguments("--exclude", "refs/tags/*")
355355
}
@@ -432,7 +432,7 @@ func GetCommitFileStatus(ctx context.Context, repoPath, commitID string) (*Commi
432432
}()
433433

434434
stderr := new(bytes.Buffer)
435-
err := gitcmd.New("log", "--name-status", "-m", "--pretty=format:", "--first-parent", "--no-renames", "-z", "-1").AddDynamicArguments(commitID).Run(ctx, &gitcmd.RunOpts{
435+
err := gitcmd.NewCommand("log", "--name-status", "-m", "--pretty=format:", "--first-parent", "--no-renames", "-z", "-1").AddDynamicArguments(commitID).Run(ctx, &gitcmd.RunOpts{
436436
Dir: repoPath,
437437
Stdout: w,
438438
Stderr: stderr,
@@ -448,7 +448,7 @@ func GetCommitFileStatus(ctx context.Context, repoPath, commitID string) (*Commi
448448

449449
// GetFullCommitID returns full length (40) of commit ID by given short SHA in a repository.
450450
func GetFullCommitID(ctx context.Context, repoPath, shortID string) (string, error) {
451-
commitID, _, err := gitcmd.New("rev-parse").AddDynamicArguments(shortID).RunStdString(ctx, &gitcmd.RunOpts{Dir: repoPath})
451+
commitID, _, err := gitcmd.NewCommand("rev-parse").AddDynamicArguments(shortID).RunStdString(ctx, &gitcmd.RunOpts{Dir: repoPath})
452452
if err != nil {
453453
if strings.Contains(err.Error(), "exit status 128") {
454454
return "", ErrNotExist{shortID, ""}

‎modules/git/config.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func syncGitConfig(ctx context.Context) (err error) {
118118
}
119119

120120
func configSet(ctx context.Context, key, value string) error {
121-
stdout, _, err := gitcmd.New("config", "--global", "--get").AddDynamicArguments(key).RunStdString(ctx, nil)
121+
stdout, _, err := gitcmd.NewCommand("config", "--global", "--get").AddDynamicArguments(key).RunStdString(ctx, nil)
122122
if err != nil && !gitcmd.IsErrorExitCode(err, 1) {
123123
return fmt.Errorf("failed to get git config %s, err: %w", key, err)
124124
}
@@ -128,7 +128,7 @@ func configSet(ctx context.Context, key, value string) error {
128128
return nil
129129
}
130130

131-
_, _, err = gitcmd.New("config", "--global").AddDynamicArguments(key, value).RunStdString(ctx, nil)
131+
_, _, err = gitcmd.NewCommand("config", "--global").AddDynamicArguments(key, value).RunStdString(ctx, nil)
132132
if err != nil {
133133
return fmt.Errorf("failed to set git global config %s, err: %w", key, err)
134134
}
@@ -137,14 +137,14 @@ func configSet(ctx context.Context, key, value string) error {
137137
}
138138

139139
func configSetNonExist(ctx context.Context, key, value string) error {
140-
_, _, err := gitcmd.New("config", "--global", "--get").AddDynamicArguments(key).RunStdString(ctx, nil)
140+
_, _, err := gitcmd.NewCommand("config", "--global", "--get").AddDynamicArguments(key).RunStdString(ctx, nil)
141141
if err == nil {
142142
// already exist
143143
return nil
144144
}
145145
if gitcmd.IsErrorExitCode(err, 1) {
146146
// not exist, set new config
147-
_, _, err = gitcmd.New("config", "--global").AddDynamicArguments(key, value).RunStdString(ctx, nil)
147+
_, _, err = gitcmd.NewCommand("config", "--global").AddDynamicArguments(key, value).RunStdString(ctx, nil)
148148
if err != nil {
149149
return fmt.Errorf("failed to set git global config %s, err: %w", key, err)
150150
}
@@ -155,14 +155,14 @@ func configSetNonExist(ctx context.Context, key, value string) error {
155155
}
156156

157157
func configAddNonExist(ctx context.Context, key, value string) error {
158-
_, _, err := gitcmd.New("config", "--global", "--get").AddDynamicArguments(key, regexp.QuoteMeta(value)).RunStdString(ctx, nil)
158+
_, _, err := gitcmd.NewCommand("config", "--global", "--get").AddDynamicArguments(key, regexp.QuoteMeta(value)).RunStdString(ctx, nil)
159159
if err == nil {
160160
// already exist
161161
return nil
162162
}
163163
if gitcmd.IsErrorExitCode(err, 1) {
164164
// not exist, add new config
165-
_, _, err = gitcmd.New("config", "--global", "--add").AddDynamicArguments(key, value).RunStdString(ctx, nil)
165+
_, _, err = gitcmd.NewCommand("config", "--global", "--add").AddDynamicArguments(key, value).RunStdString(ctx, nil)
166166
if err != nil {
167167
return fmt.Errorf("failed to add git global config %s, err: %w", key, err)
168168
}
@@ -172,10 +172,10 @@ func configAddNonExist(ctx context.Context, key, value string) error {
172172
}
173173

174174
func configUnsetAll(ctx context.Context, key, value string) error {
175-
_, _, err := gitcmd.New("config", "--global", "--get").AddDynamicArguments(key).RunStdString(ctx, nil)
175+
_, _, err := gitcmd.NewCommand("config", "--global", "--get").AddDynamicArguments(key).RunStdString(ctx, nil)
176176
if err == nil {
177177
// exist, need to remove
178-
_, _, err = gitcmd.New("config", "--global", "--unset-all").AddDynamicArguments(key, regexp.QuoteMeta(value)).RunStdString(ctx, nil)
178+
_, _, err = gitcmd.NewCommand("config", "--global", "--unset-all").AddDynamicArguments(key, regexp.QuoteMeta(value)).RunStdString(ctx, nil)
179179
if err != nil {
180180
return fmt.Errorf("failed to unset git global config %s, err: %w", key, err)
181181
}

‎modules/git/diff.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func GetRawDiff(repo *Repository, commitID string, diffType RawDiffType, writer
3535
// GetReverseRawDiff dumps the reverse diff results of repository in given commit ID to io.Writer.
3636
func GetReverseRawDiff(ctx context.Context, repoPath, commitID string, writer io.Writer) error {
3737
stderr := new(bytes.Buffer)
38-
cmd := gitcmd.New("show", "--pretty=format:revert %H%n", "-R").AddDynamicArguments(commitID)
38+
cmd := gitcmd.NewCommand("show", "--pretty=format:revert %H%n", "-R").AddDynamicArguments(commitID)
3939
if err := cmd.Run(ctx, &gitcmd.RunOpts{
4040
Dir: repoPath,
4141
Stdout: writer,
@@ -57,7 +57,7 @@ func GetRepoRawDiffForFile(repo *Repository, startCommit, endCommit string, diff
5757
files = append(files, file)
5858
}
5959

60-
cmd := gitcmd.New()
60+
cmd := gitcmd.NewCommand()
6161
switch diffType {
6262
case RawDiffNormal:
6363
if len(startCommit) != 0 {
@@ -313,7 +313,7 @@ func GetAffectedFiles(repo *Repository, branchName, oldCommitID, newCommitID str
313313
affectedFiles := make([]string, 0, 32)
314314

315315
// Run `git diff --name-only` to get the names of the changed files
316-
err = gitcmd.New("diff", "--name-only").AddDynamicArguments(oldCommitID, newCommitID).
316+
err = gitcmd.NewCommand("diff", "--name-only").AddDynamicArguments(oldCommitID, newCommitID).
317317
Run(repo.Ctx, &gitcmd.RunOpts{
318318
Env: env,
319319
Dir: repo.Path,

‎modules/git/git.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func DefaultFeatures() *Features {
5757
}
5858

5959
func loadGitVersionFeatures() (*Features, error) {
60-
stdout, _, runErr := gitcmd.New("version").RunStdString(context.Background(), nil)
60+
stdout, _, runErr := gitcmd.NewCommand("version").RunStdString(context.Background(), nil)
6161
if runErr != nil {
6262
return nil, runErr
6363
}

0 commit comments

Comments
 (0)