fix gogit build

lunny · lunny · commit 0fa7917c44b1 · 2025-10-07T19:03:37.000-07:00
diff --git a/modules/git/blob_gogit.go b/modules/git/blob_gogit.go
@@ -7,6 +7,7 @@
 package git
 
 import (
+	"context"
 	"io"
 
 	"github.com/go-git/go-git/v5/plumbing"
@@ -22,11 +23,11 @@ type Blob struct {
 
 // DataAsync gets a ReadCloser for the contents of a blob without reading it all.
 // Calling the Close function on the result will discard all unread output.
-func (b *Blob) DataAsync() (io.ReadCloser, error) {
+func (b *Blob) DataAsync(ctx context.Context) (io.ReadCloser, error) {
 	return b.gogitEncodedObj.Reader()
 }
 
 // Size returns the uncompressed size of the blob
-func (b *Blob) Size() int64 {
+func (b *Blob) Size(ctx context.Context) int64 {
 	return b.gogitEncodedObj.Size()
 }
diff --git a/modules/git/commit_info_gogit.go b/modules/git/commit_info_gogit.go
@@ -37,7 +37,7 @@ func (tes Entries) GetCommitsInfo(ctx context.Context, repoLink string, commit *
 	var revs map[string]*Commit
 	if commit.repo.LastCommitCache != nil {
 		var unHitPaths []string
-		revs, unHitPaths, err = getLastCommitForPathsByCache(commit.ID.String(), treePath, entryPaths, commit.repo.LastCommitCache)
+		revs, unHitPaths, err = getLastCommitForPathsByCache(ctx, commit.ID.String(), treePath, entryPaths, commit.repo.LastCommitCache)
 		if err != nil {
 			return nil, nil, err
 		}
@@ -73,7 +73,7 @@ func (tes Entries) GetCommitsInfo(ctx context.Context, repoLink string, commit *
 
 		// If the entry is a submodule, add a submodule file for this
 		if entry.IsSubModule() {
-			commitsInfo[i].SubmoduleFile, err = GetCommitInfoSubmoduleFile(repoLink, path.Join(treePath, entry.Name()), commit, entry.ID)
+			commitsInfo[i].SubmoduleFile, err = GetCommitInfoSubmoduleFile(ctx, repoLink, path.Join(treePath, entry.Name()), commit, entry.ID)
 			if err != nil {
 				return nil, nil, err
 			}
@@ -143,11 +143,11 @@ func getFileHashes(c cgobject.CommitNode, treePath string, paths []string) (map[
 	return hashes, nil
 }
 
-func getLastCommitForPathsByCache(commitID, treePath string, paths []string, cache *LastCommitCache) (map[string]*Commit, []string, error) {
+func getLastCommitForPathsByCache(ctx context.Context, commitID, treePath string, paths []string, cache *LastCommitCache) (map[string]*Commit, []string, error) {
 	var unHitEntryPaths []string
 	results := make(map[string]*Commit)
 	for _, p := range paths {
-		lastCommit, err := cache.Get(commitID, path.Join(treePath, p))
+		lastCommit, err := cache.Get(ctx, commitID, path.Join(treePath, p))
 		if err != nil {
 			return nil, nil, err
 		}
diff --git a/modules/git/languagestats/language_stats_gogit.go b/modules/git/languagestats/language_stats_gogit.go
@@ -7,6 +7,7 @@ package languagestats
 
 import (
 	"bytes"
+	"context"
 	"io"
 
 	"code.gitea.io/gitea/modules/analyze"
@@ -21,7 +22,7 @@ import (
 )
 
 // GetLanguageStats calculates language stats for git repository at specified commit
-func GetLanguageStats(repo *git_module.Repository, commitID string) (map[string]int64, error) {
+func GetLanguageStats(ctx context.Context, repo *git_module.Repository, commitID string) (map[string]int64, error) {
 	r, err := git.PlainOpen(repo.Path)
 	if err != nil {
 		return nil, err
@@ -42,7 +43,7 @@ func GetLanguageStats(repo *git_module.Repository, commitID string) (map[string]
 		return nil, err
 	}
 
-	checker, err := attribute.NewBatchChecker(repo, commitID, attribute.LinguistAttributes)
+	checker, err := attribute.NewBatchChecker(ctx, repo, commitID, attribute.LinguistAttributes)
 	if err != nil {
 		return nil, err
 	}
@@ -67,7 +68,7 @@ func GetLanguageStats(repo *git_module.Repository, commitID string) (map[string]
 		isDocumentation := optional.None[bool]()
 		isDetectable := optional.None[bool]()
 
-		attrs, err := checker.CheckPath(f.Name)
+		attrs, err := checker.CheckPath(ctx, f.Name)
 		if err == nil {
 			isVendored = attrs.GetVendored()
 			if isVendored.ValueOrDefault(false) {
diff --git a/modules/git/last_commit_cache_gogit.go b/modules/git/last_commit_cache_gogit.go
@@ -32,7 +32,7 @@ func (c *Commit) recursiveCache(ctx context.Context, index cgobject.CommitNode,
 		return nil
 	}
 
-	entries, err := tree.ListEntries()
+	entries, err := tree.ListEntries(ctx)
 	if err != nil {
 		return err
 	}
@@ -51,7 +51,7 @@ func (c *Commit) recursiveCache(ctx context.Context, index cgobject.CommitNode,
 
 	for entry := range commits {
 		if entryMap[entry].IsDir() {
-			subTree, err := tree.SubTree(entry)
+			subTree, err := tree.SubTree(ctx, entry)
 			if err != nil {
 				return err
 			}
diff --git a/modules/git/notes_gogit.go b/modules/git/notes_gogit.go
@@ -19,7 +19,7 @@ import (
 // FIXME: Add LastCommitCache support
 func GetNote(ctx context.Context, repo *Repository, commitID string, note *Note) error {
 	log.Trace("Searching for git note corresponding to the commit %q in the repository %q", commitID, repo.Path)
-	notes, err := repo.GetCommit(NotesRef)
+	notes, err := repo.GetCommit(ctx, NotesRef)
 	if err != nil {
 		if IsErrNotExist(err) {
 			return err
diff --git a/modules/git/pipeline/lfs_gogit.go b/modules/git/pipeline/lfs_gogit.go
@@ -7,6 +7,7 @@ package pipeline
 
 import (
 	"bufio"
+	"context"
 	"io"
 	"sort"
 	"strings"
@@ -20,7 +21,7 @@ import (
 )
 
 // FindLFSFile finds commits that contain a provided pointer file hash
-func FindLFSFile(repo *git.Repository, objectID git.ObjectID) ([]*LFSResult, error) {
+func FindLFSFile(ctx context.Context, repo *git.Repository, objectID git.ObjectID) ([]*LFSResult, error) {
 	resultsMap := map[string]*LFSResult{}
 	results := make([]*LFSResult, 0)
 
@@ -105,7 +106,7 @@ func FindLFSFile(repo *git.Repository, objectID git.ObjectID) ([]*LFSResult, err
 			i++
 		}
 	}()
-	go NameRevStdin(repo.Ctx, shasToNameReader, nameRevStdinWriter, &wg, basePath)
+	go NameRevStdin(ctx, shasToNameReader, nameRevStdinWriter, &wg, basePath)
 	go func() {
 		defer wg.Done()
 		defer shasToNameWriter.Close()
diff --git a/modules/git/repo_base_gogit.go b/modules/git/repo_base_gogit.go
@@ -7,7 +7,6 @@
 package git
 
 import (
-	"context"
 	"path/filepath"
 
 	gitealog "code.gitea.io/gitea/modules/log"
@@ -34,13 +33,12 @@ type Repository struct {
 	gogitStorage *filesystem.Storage
 	gpgSettings  *GPGSettings
 
-	Ctx             context.Context
 	LastCommitCache *LastCommitCache
 	objectFormat    ObjectFormat
 }
 
 // OpenRepository opens the repository at the given path within the context.Context
-func OpenRepository(ctx context.Context, repoPath string) (*Repository, error) {
+func OpenRepository(repoPath string) (*Repository, error) {
 	repoPath, err := filepath.Abs(repoPath)
 	if err != nil {
 		return nil, err
@@ -80,7 +78,6 @@ func OpenRepository(ctx context.Context, repoPath string) (*Repository, error) {
 		gogitRepo:    gogitRepo,
 		gogitStorage: storage,
 		tagCache:     newObjectCache[*Tag](),
-		Ctx:          ctx,
 		objectFormat: ParseGogitHash(plumbing.ZeroHash).Type(),
 	}, nil
 }
diff --git a/modules/git/repo_branch_gogit.go b/modules/git/repo_branch_gogit.go
@@ -7,6 +7,7 @@
 package git
 
 import (
+	"context"
 	"sort"
 	"strings"
 
@@ -17,9 +18,9 @@ import (
 // IsObjectExist returns true if the given object exists in the repository.
 // FIXME: Inconsistent behavior with nogogit edition
 // Unlike the implementation of IsObjectExist in nogogit edition, it does not support short hashes here.
-// For example, IsObjectExist("153f451") will return false, but it will return true in nogogit edition.
+// For example, IsObjectExist(ctx, "153f451") will return false, but it will return true in nogogit edition.
 // To fix this, the solution could be adding support for short hashes in gogit edition if it's really needed.
-func (repo *Repository) IsObjectExist(name string) bool {
+func (repo *Repository) IsObjectExist(ctx context.Context, name string) bool {
 	if name == "" {
 		return false
 	}
@@ -33,7 +34,7 @@ func (repo *Repository) IsObjectExist(name string) bool {
 // Unlike the implementation of IsObjectExist in nogogit edition, it does not support blob hashes here.
 // For example, IsObjectExist([existing_blob_hash]) will return false, but it will return true in nogogit edition.
 // To fix this, the solution could be refusing to support blob hashes in nogogit edition since a blob hash is not a reference.
-func (repo *Repository) IsReferenceExist(name string) bool {
+func (repo *Repository) IsReferenceExist(ctx context.Context, name string) bool {
 	if name == "" {
 		return false
 	}
@@ -44,7 +45,7 @@ func (repo *Repository) IsReferenceExist(name string) bool {
 }
 
 // IsBranchExist returns true if given branch exists in current repository.
-func (repo *Repository) IsBranchExist(name string) bool {
+func (repo *Repository) IsBranchExist(ctx context.Context, name string) bool {
 	if name == "" {
 		return false
 	}
@@ -60,7 +61,7 @@ func (repo *Repository) IsBranchExist(name string) bool {
 // Branches are returned with sort of `-committerdate` as the nogogit
 // implementation. This requires full fetch, sort and then the
 // skip/limit applies later as gogit returns in undefined order.
-func (repo *Repository) GetBranchNames(skip, limit int) ([]string, int, error) {
+func (repo *Repository) GetBranchNames(ctx context.Context, skip, limit int) ([]string, int, error) {
 	type BranchData struct {
 		name          string
 		committerDate int64
@@ -136,7 +137,7 @@ func (repo *Repository) WalkReferences(arg ObjectType, skip, limit int, walkfn f
 }
 
 // GetRefsBySha returns all references filtered with prefix that belong to a sha commit hash
-func (repo *Repository) GetRefsBySha(sha, prefix string) ([]string, error) {
+func (repo *Repository) GetRefsBySha(ctx context.Context, sha, prefix string) ([]string, error) {
 	var revList []string
 	iter, err := repo.gogitRepo.References()
 	if err != nil {
diff --git a/modules/git/repo_commit_gogit.go b/modules/git/repo_commit_gogit.go
@@ -7,6 +7,7 @@
 package git
 
 import (
+	"context"
 	"strings"
 
 	"code.gitea.io/gitea/modules/git/gitcmd"
@@ -17,7 +18,7 @@ import (
 )
 
 // GetRefCommitID returns the last commit ID string of given reference.
-func (repo *Repository) GetRefCommitID(name string) (string, error) {
+func (repo *Repository) GetRefCommitID(ctx context.Context, name string) (string, error) {
 	if plumbing.IsHash(name) {
 		return name, nil
 	}
@@ -39,8 +40,8 @@ func (repo *Repository) GetRefCommitID(name string) (string, error) {
 }
 
 // ConvertToHash returns a Hash object from a potential ID string
-func (repo *Repository) ConvertToGitID(commitID string) (ObjectID, error) {
-	objectFormat, err := repo.GetObjectFormat()
+func (repo *Repository) ConvertToGitID(ctx context.Context, commitID string) (ObjectID, error) {
+	objectFormat, err := repo.GetObjectFormat(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -54,7 +55,7 @@ func (repo *Repository) ConvertToGitID(commitID string) (ObjectID, error) {
 	actualCommitID, _, err := gitcmd.NewCommand("rev-parse", "--verify").
 		AddDynamicArguments(commitID).
 		WithDir(repo.Path).
-		RunStdString(repo.Ctx)
+		RunStdString(ctx)
 	actualCommitID = strings.TrimSpace(actualCommitID)
 	if err != nil {
 		if strings.Contains(err.Error(), "unknown revision or path") ||
@@ -68,16 +69,16 @@ func (repo *Repository) ConvertToGitID(commitID string) (ObjectID, error) {
 }
 
 // IsCommitExist returns true if given commit exists in current repository.
-func (repo *Repository) IsCommitExist(name string) bool {
-	hash, err := repo.ConvertToGitID(name)
+func (repo *Repository) IsCommitExist(ctx context.Context, name string) bool {
+	hash, err := repo.ConvertToGitID(ctx, name)
 	if err != nil {
 		return false
 	}
 	_, err = repo.gogitRepo.CommitObject(plumbing.Hash(hash.RawValue()))
 	return err == nil
 }
 
-func (repo *Repository) getCommit(id ObjectID) (*Commit, error) {
+func (repo *Repository) getCommit(ctx context.Context, id ObjectID) (*Commit, error) {
 	var tagObject *object.Tag
 
 	commitID := plumbing.Hash(id.RawValue())
diff --git a/modules/git/repo_ref_gogit.go b/modules/git/repo_ref_gogit.go
@@ -6,14 +6,15 @@
 package git
 
 import (
+	"context"
 	"strings"
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
 )
 
 // GetRefsFiltered returns all references of the repository that matches patterm exactly or starting with.
-func (repo *Repository) GetRefsFiltered(pattern string) ([]*Reference, error) {
+func (repo *Repository) GetRefsFiltered(ctx context.Context, pattern string) ([]*Reference, error) {
 	r, err := git.PlainOpen(repo.Path)
 	if err != nil {
 		return nil, err
@@ -30,7 +31,7 @@ func (repo *Repository) GetRefsFiltered(pattern string) ([]*Reference, error) {
 			refType := string(ObjectCommit)
 			if ref.Name().IsTag() {
 				// tags can be of type `commit` (lightweight) or `tag` (annotated)
-				if tagType, _ := repo.GetTagType(ParseGogitHash(ref.Hash())); err == nil {
+				if tagType, _ := repo.GetTagType(ctx, ParseGogitHash(ref.Hash())); err == nil {
 					refType = tagType
 				}
 			}
diff --git a/modules/git/repo_tag_gogit.go b/modules/git/repo_tag_gogit.go
@@ -7,19 +7,21 @@
 package git
 
 import (
+	"context"
+
 	"code.gitea.io/gitea/modules/log"
 
 	"github.com/go-git/go-git/v5/plumbing"
 )
 
 // IsTagExist returns true if given tag exists in the repository.
-func (repo *Repository) IsTagExist(name string) bool {
+func (repo *Repository) IsTagExist(ctx context.Context, name string) bool {
 	_, err := repo.gogitRepo.Reference(plumbing.ReferenceName(TagPrefix+name), true)
 	return err == nil
 }
 
 // GetTagType gets the type of the tag, either commit (simple) or tag (annotated)
-func (repo *Repository) GetTagType(id ObjectID) (string, error) {
+func (repo *Repository) GetTagType(ctx context.Context, id ObjectID) (string, error) {
 	// Get tag type
 	obj, err := repo.gogitRepo.Object(plumbing.AnyObject, plumbing.Hash(id.RawValue()))
 	if err != nil {
@@ -32,7 +34,7 @@ func (repo *Repository) GetTagType(id ObjectID) (string, error) {
 	return obj.Type().String(), nil
 }
 
-func (repo *Repository) getTag(tagID ObjectID, name string) (*Tag, error) {
+func (repo *Repository) getTag(ctx context.Context, tagID ObjectID, name string) (*Tag, error) {
 	t, ok := repo.tagCache.Get(tagID.String())
 	if ok {
 		log.Debug("Hit cache: %s", tagID)
@@ -41,13 +43,13 @@ func (repo *Repository) getTag(tagID ObjectID, name string) (*Tag, error) {
 		return &tagClone, nil
 	}
 
-	tp, err := repo.GetTagType(tagID)
+	tp, err := repo.GetTagType(ctx, tagID)
 	if err != nil {
 		return nil, err
 	}
 
 	// Get the commit ID and tag ID (may be different for annotated tag) for the returned tag object
-	commitIDStr, err := repo.GetTagCommitID(name)
+	commitIDStr, err := repo.GetTagCommitID(ctx, name)
 	if err != nil {
 		// every tag should have a commit ID so return all errors
 		return nil, err
@@ -59,7 +61,7 @@ func (repo *Repository) getTag(tagID ObjectID, name string) (*Tag, error) {
 
 	// If type is "commit, the tag is a lightweight tag
 	if ObjectType(tp) == ObjectCommit {
-		commit, err := repo.GetCommit(commitIDStr)
+		commit, err := repo.GetCommit(ctx, commitIDStr)
 		if err != nil {
 			return nil, err
 		}
diff --git a/modules/git/repo_tree_gogit.go b/modules/git/repo_tree_gogit.go
diff --git a/modules/git/tree_blob_gogit.go b/modules/git/tree_blob_gogit.go
diff --git a/modules/git/tree_entry_gogit.go b/modules/git/tree_entry_gogit.go
diff --git a/modules/git/tree_gogit.go b/modules/git/tree_gogit.go

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func (c *Commit) recursiveCache(ctx context.Context, index cgobject.CommitNode,`
`32`	`32`	`return nil`
`33`	`33`	`}`
`34`	`34`
`35`		`- entries, err := tree.ListEntries()`
	`35`	`+ entries, err := tree.ListEntries(ctx)`
`36`	`36`	`if err != nil {`
`37`	`37`	`return err`
`38`	`38`	`}`
`@@ -51,7 +51,7 @@ func (c *Commit) recursiveCache(ctx context.Context, index cgobject.CommitNode,`
`51`	`51`
`52`	`52`	`for entry := range commits {`
`53`	`53`	`if entryMap[entry].IsDir() {`
`54`		`- subTree, err := tree.SubTree(entry)`
	`54`	`+ subTree, err := tree.SubTree(ctx, entry)`
`55`	`55`	`if err != nil {`
`56`	`56`	`return err`
`57`	`57`	`}`