mod: bump github.com/gogs/git-module from 1.2.0 to 1.4.0 (#6866)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joe Chen <jc@unknwon.io>

4 files changed, 51 insertions, 49 deletions

diff --git a/internal/gitutil/mocks.go b/internal/gitutil/mocks.go
index b58fa079..1f740ee7 100644
--- a/internal/gitutil/mocks.go
+++ b/internal/gitutil/mocks.go
@@ -13,35 +13,35 @@ import (
 var _ ModuleStore = (*MockModuleStore)(nil)
 
 type MockModuleStore struct {
-	repoAddRemote    func(repoPath, name, url string, opts ...git.AddRemoteOptions) error
-	repoDiffNameOnly func(repoPath, base, head string, opts ...git.DiffNameOnlyOptions) ([]string, error)
-	repoLog          func(repoPath, rev string, opts ...git.LogOptions) ([]*git.Commit, error)
-	repoMergeBase    func(repoPath, base, head string, opts ...git.MergeBaseOptions) (string, error)
-	repoRemoveRemote func(repoPath, name string, opts ...git.RemoveRemoteOptions) error
-	repoTags         func(repoPath string, opts ...git.TagsOptions) ([]string, error)
+	remoteAdd    func(repoPath, name, url string, opts ...git.RemoteAddOptions) error
+	diffNameOnly func(repoPath, base, head string, opts ...git.DiffNameOnlyOptions) ([]string, error)
+	log          func(repoPath, rev string, opts ...git.LogOptions) ([]*git.Commit, error)
+	mergeBase    func(repoPath, base, head string, opts ...git.MergeBaseOptions) (string, error)
+	remoteRemove func(repoPath, name string, opts ...git.RemoteRemoveOptions) error
+	repoTags     func(repoPath string, opts ...git.TagsOptions) ([]string, error)
 
 	pullRequestMeta func(headPath, basePath, headBranch, baseBranch string) (*PullRequestMeta, error)
 	listTagsAfter   func(repoPath, after string, limit int) (*TagsPage, error)
 }
 
-func (m *MockModuleStore) RepoAddRemote(repoPath, name, url string, opts ...git.AddRemoteOptions) error {
-	return m.repoAddRemote(repoPath, name, url, opts...)
+func (m *MockModuleStore) RemoteAdd(repoPath, name, url string, opts ...git.RemoteAddOptions) error {
+	return m.remoteAdd(repoPath, name, url, opts...)
 }
 
-func (m *MockModuleStore) RepoDiffNameOnly(repoPath, base, head string, opts ...git.DiffNameOnlyOptions) ([]string, error) {
-	return m.repoDiffNameOnly(repoPath, base, head, opts...)
+func (m *MockModuleStore) DiffNameOnly(repoPath, base, head string, opts ...git.DiffNameOnlyOptions) ([]string, error) {
+	return m.diffNameOnly(repoPath, base, head, opts...)
 }
 
-func (m *MockModuleStore) RepoLog(repoPath, rev string, opts ...git.LogOptions) ([]*git.Commit, error) {
-	return m.repoLog(repoPath, rev, opts...)
+func (m *MockModuleStore) Log(repoPath, rev string, opts ...git.LogOptions) ([]*git.Commit, error) {
+	return m.log(repoPath, rev, opts...)
 }
 
-func (m *MockModuleStore) RepoMergeBase(repoPath, base, head string, opts ...git.MergeBaseOptions) (string, error) {
-	return m.repoMergeBase(repoPath, base, head, opts...)
+func (m *MockModuleStore) MergeBase(repoPath, base, head string, opts ...git.MergeBaseOptions) (string, error) {
+	return m.mergeBase(repoPath, base, head, opts...)
 }
 
-func (m *MockModuleStore) RepoRemoveRemote(repoPath, name string, opts ...git.RemoveRemoteOptions) error {
-	return m.repoRemoveRemote(repoPath, name, opts...)
+func (m *MockModuleStore) RemoteRemove(repoPath, name string, opts ...git.RemoteRemoveOptions) error {
+	return m.remoteRemove(repoPath, name, opts...)
 }
 
 func (m *MockModuleStore) RepoTags(repoPath string, opts ...git.TagsOptions) ([]string, error) {
diff --git a/internal/gitutil/module.go b/internal/gitutil/module.go
index f34e2961..f550f865 100644
--- a/internal/gitutil/module.go
+++ b/internal/gitutil/module.go
@@ -12,23 +12,25 @@ import (
 //
 // NOTE: All methods are sorted in alphabetical order.
 type ModuleStore interface {
-	// AddRemote adds a new remote to the repository in given path.
-	RepoAddRemote(repoPath, name, url string, opts ...git.AddRemoteOptions) error
-	// RepoDiffNameOnly returns a list of changed files between base and head revisions
+	// RemoteAdd adds a new remote to the repository in given path.
+	RemoteAdd(repoPath, name, url string, opts ...git.RemoteAddOptions) error
+	// DiffNameOnly returns a list of changed files between base and head revisions
 	// of the repository in given path.
-	RepoDiffNameOnly(repoPath, base, head string, opts ...git.DiffNameOnlyOptions) ([]string, error)
-	// RepoLog returns a list of commits in the state of given revision of the repository
-	// in given path. The returned list is in reverse chronological order.
-	RepoLog(repoPath, rev string, opts ...git.LogOptions) ([]*git.Commit, error)
-	// RepoMergeBase returns merge base between base and head revisions of the repository
-	// in given path.
-	RepoMergeBase(repoPath, base, head string, opts ...git.MergeBaseOptions) (string, error)
-	// RepoRemoveRemote removes a remote from the repository in given path.
-	RepoRemoveRemote(repoPath, name string, opts ...git.RemoveRemoteOptions) error
+	DiffNameOnly(repoPath, base, head string, opts ...git.DiffNameOnlyOptions) ([]string, error)
+	// Log returns a list of commits in the state of given revision of the
+	// repository in given path. The returned list is in reverse chronological
+	// order.
+	Log(repoPath, rev string, opts ...git.LogOptions) ([]*git.Commit, error)
+	// MergeBase returns merge base between base and head revisions of the
+	// repository in given path.
+	MergeBase(repoPath, base, head string, opts ...git.MergeBaseOptions) (string, error)
+	// RemoteRemove removes a remote from the repository in given path.
+	RemoteRemove(repoPath, name string, opts ...git.RemoteRemoveOptions) error
 	// RepoTags returns a list of tags of the repository in given path.
 	RepoTags(repoPath string, opts ...git.TagsOptions) ([]string, error)
 
-	// GetPullRequestMeta gathers pull request metadata based on given head and base information.
+	// PullRequestMeta gathers pull request metadata based on given head and base
+	// information.
 	PullRequestMeta(headPath, basePath, headBranch, baseBranch string) (*PullRequestMeta, error)
 	// ListTagsAfter returns a list of tags "after" (exclusive) given tag.
 	ListTagsAfter(repoPath, after string, limit int) (*TagsPage, error)
@@ -37,24 +39,24 @@ type ModuleStore interface {
 // module holds the real implementation.
 type module struct{}
 
-func (module) RepoAddRemote(repoPath, name, url string, opts ...git.AddRemoteOptions) error {
-	return git.RepoAddRemote(repoPath, name, url, opts...)
+func (module) RemoteAdd(repoPath, name, url string, opts ...git.RemoteAddOptions) error {
+	return git.RemoteAdd(repoPath, name, url, opts...)
 }
 
-func (module) RepoDiffNameOnly(repoPath, base, head string, opts ...git.DiffNameOnlyOptions) ([]string, error) {
-	return git.RepoDiffNameOnly(repoPath, base, head, opts...)
+func (module) DiffNameOnly(repoPath, base, head string, opts ...git.DiffNameOnlyOptions) ([]string, error) {
+	return git.DiffNameOnly(repoPath, base, head, opts...)
 }
 
-func (module) RepoLog(repoPath, rev string, opts ...git.LogOptions) ([]*git.Commit, error) {
-	return git.RepoLog(repoPath, rev, opts...)
+func (module) Log(repoPath, rev string, opts ...git.LogOptions) ([]*git.Commit, error) {
+	return git.Log(repoPath, rev, opts...)
 }
 
-func (module) RepoMergeBase(repoPath, base, head string, opts ...git.MergeBaseOptions) (string, error) {
-	return git.RepoMergeBase(repoPath, base, head, opts...)
+func (module) MergeBase(repoPath, base, head string, opts ...git.MergeBaseOptions) (string, error) {
+	return git.MergeBase(repoPath, base, head, opts...)
 }
 
-func (module) RepoRemoveRemote(repoPath, name string, opts ...git.RemoveRemoteOptions) error {
-	return git.RepoRemoveRemote(repoPath, name, opts...)
+func (module) RemoteRemove(repoPath, name string, opts ...git.RemoteRemoveOptions) error {
+	return git.RemoteRemove(repoPath, name, opts...)
 }
 
 func (module) RepoTags(repoPath string, opts ...git.TagsOptions) ([]string, error) {
diff --git a/internal/gitutil/pull_request.go b/internal/gitutil/pull_request.go
index e35a477e..99213e05 100644
--- a/internal/gitutil/pull_request.go
+++ b/internal/gitutil/pull_request.go
@@ -30,12 +30,12 @@ func (module) PullRequestMeta(headPath, basePath, headBranch, baseBranch string)
 	// We need to create a temporary remote when the pull request is sent from a forked repository.
 	if headPath != basePath {
 		tmpRemote := strconv.FormatInt(time.Now().UnixNano(), 10)
-		err := Module.RepoAddRemote(headPath, tmpRemote, basePath, git.AddRemoteOptions{Fetch: true})
+		err := Module.RemoteAdd(headPath, tmpRemote, basePath, git.RemoteAddOptions{Fetch: true})
 		if err != nil {
 			return nil, fmt.Errorf("add remote: %v", err)
 		}
 		defer func() {
-			err := Module.RepoRemoveRemote(headPath, tmpRemote)
+			err := Module.RemoteRemove(headPath, tmpRemote)
 			if err != nil {
 				log.Error("Failed to remove remote %q [path: %s]: %v", tmpRemote, headPath, err)
 				return
@@ -45,18 +45,18 @@ func (module) PullRequestMeta(headPath, basePath, headBranch, baseBranch string)
 		tmpRemoteBranch = "remotes/" + tmpRemote + "/" + baseBranch
 	}
 
-	mergeBase, err := Module.RepoMergeBase(headPath, tmpRemoteBranch, headBranch)
+	mergeBase, err := Module.MergeBase(headPath, tmpRemoteBranch, headBranch)
 	if err != nil {
 		return nil, errors.Wrap(err, "get merge base")
 	}
 
-	commits, err := Module.RepoLog(headPath, mergeBase+"..."+headBranch)
+	commits, err := Module.Log(headPath, mergeBase+"..."+headBranch)
 	if err != nil {
 		return nil, errors.Wrap(err, "get commits")
 	}
 
 	// Count number of changed files
-	names, err := Module.RepoDiffNameOnly(headPath, tmpRemoteBranch, headBranch, git.DiffNameOnlyOptions{NeedsMergeBase: true})
+	names, err := Module.DiffNameOnly(headPath, tmpRemoteBranch, headBranch, git.DiffNameOnlyOptions{NeedsMergeBase: true})
 	if err != nil {
 		return nil, errors.Wrap(err, "get changed files")
 	}
diff --git a/internal/gitutil/pull_request_test.go b/internal/gitutil/pull_request_test.go
index ca0b40ad..1bee39ea 100644
--- a/internal/gitutil/pull_request_test.go
+++ b/internal/gitutil/pull_request_test.go
@@ -25,7 +25,7 @@ func TestModuler_PullRequestMeta(t *testing.T) {
 	}
 
 	SetMockModuleStore(t, &MockModuleStore{
-		repoAddRemote: func(repoPath, name, url string, opts ...git.AddRemoteOptions) error {
+		remoteAdd: func(repoPath, name, url string, opts ...git.RemoteAddOptions) error {
 			if repoPath != headPath {
 				return fmt.Errorf("repoPath: want %q but got %q", headPath, repoPath)
 			} else if name == "" {
@@ -42,7 +42,7 @@ func TestModuler_PullRequestMeta(t *testing.T) {
 
 			return nil
 		},
-		repoMergeBase: func(repoPath, base, head string, opts ...git.MergeBaseOptions) (string, error) {
+		mergeBase: func(repoPath, base, head string, opts ...git.MergeBaseOptions) (string, error) {
 			if repoPath != headPath {
 				return "", fmt.Errorf("repoPath: want %q but got %q", headPath, repoPath)
 			} else if base == "" {
@@ -53,7 +53,7 @@ func TestModuler_PullRequestMeta(t *testing.T) {
 
 			return mergeBase, nil
 		},
-		repoLog: func(repoPath, rev string, opts ...git.LogOptions) ([]*git.Commit, error) {
+		log: func(repoPath, rev string, opts ...git.LogOptions) ([]*git.Commit, error) {
 			if repoPath != headPath {
 				return nil, fmt.Errorf("repoPath: want %q but got %q", headPath, repoPath)
 			}
@@ -65,7 +65,7 @@ func TestModuler_PullRequestMeta(t *testing.T) {
 
 			return commits, nil
 		},
-		repoDiffNameOnly: func(repoPath, base, head string, opts ...git.DiffNameOnlyOptions) ([]string, error) {
+		diffNameOnly: func(repoPath, base, head string, opts ...git.DiffNameOnlyOptions) ([]string, error) {
 			if repoPath != headPath {
 				return nil, fmt.Errorf("repoPath: want %q but got %q", headPath, repoPath)
 			} else if base == "" {
@@ -82,7 +82,7 @@ func TestModuler_PullRequestMeta(t *testing.T) {
 
 			return changedFiles, nil
 		},
-		repoRemoveRemote: func(repoPath, name string, opts ...git.RemoveRemoteOptions) error {
+		remoteRemove: func(repoPath, name string, opts ...git.RemoteRemoveOptions) error {
 			if repoPath != headPath {
 				return fmt.Errorf("repoPath: want %q but got %q", headPath, repoPath)
 			} else if name == "" {