add context to GetTree

Author: TheFox0x7

modules/git/repo_tree_gogit.go

@@ -7,6 +7,7 @@
 package git
 
 import (
+	"context"
 	"errors"
 
 	"github.com/go-git/go-git/v5/plumbing"
@@ -29,14 +30,14 @@ func (repo *Repository) getTree(id ObjectID) (*Tree, error) {
 }
 
 // GetTree find the tree object in the repository.
-func (repo *Repository) GetTree(idStr string) (*Tree, error) {
+func (repo *Repository) GetTree(ctx context.Context, idStr string) (*Tree, error) {
 	objectFormat, err := repo.GetObjectFormat()
 	if err != nil {
 		return nil, err
 	}
 
 	if len(idStr) != objectFormat.FullLength() {
-		res, _, err := NewCommand("rev-parse", "--verify").AddDynamicArguments(idStr).RunStdString(repo.Ctx, &RunOpts{Dir: repo.Path})
+		res, _, err := NewCommand("rev-parse", "--verify").AddDynamicArguments(idStr).RunStdString(ctx, &RunOpts{Dir: repo.Path})
 		if err != nil {
 			return nil, err
 		}

modules/git/repo_tree_nogogit.go

@@ -6,6 +6,7 @@
 package git
 
 import (
+	"context"
 	"io"
 )
 
@@ -75,7 +76,7 @@ func (repo *Repository) getTree(id ObjectID) (*Tree, error) {
 }
 
 // GetTree find the tree object in the repository.
-func (repo *Repository) GetTree(idStr string) (*Tree, error) {
+func (repo *Repository) GetTree(_ context.Context,idStr string) (*Tree, error) {
 	objectFormat, err := repo.GetObjectFormat()
 	if err != nil {
 		return nil, err

services/pull/patch.go

@@ -330,7 +330,7 @@ func checkConflicts(ctx context.Context, pr *issues_model.PullRequest, gitRepo *
 			return false, fmt.Errorf("unable to write unconflicted tree: %w\n`git ls-files -u`:\n%s", err, lsfiles)
 		}
 		treeHash = strings.TrimSpace(treeHash)
-		baseTree, err := gitRepo.GetTree("base")
+		baseTree, err := gitRepo.GetTree(ctx, "base")
 		if err != nil {
 			return false, err
 		}

services/repository/files/tree.go

@@ -36,7 +36,7 @@ func (err ErrSHANotFound) Unwrap() error {
 
 // GetTreeBySHA get the GitTreeResponse of a repository using a sha hash.
 func GetTreeBySHA(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, sha string, page, perPage int, recursive bool) (*api.GitTreeResponse, error) {
-	gitTree, err := gitRepo.GetTree(sha)
+	gitTree, err := gitRepo.GetTree(ctx, sha)
 	if err != nil || gitTree == nil {
 		return nil, ErrSHANotFound{ // TODO: this error has never been catch outside of this function
 			SHA: sha,

services/wiki/wiki_test.go

@@ -170,7 +170,7 @@ func TestRepository_AddWikiPage(t *testing.T) {
 			require.NoError(t, err)
 
 			defer gitRepo.Close()
-			masterTree, err := gitRepo.GetTree(repo.DefaultWikiBranch)
+			masterTree, err := gitRepo.GetTree(t.Context(), repo.DefaultWikiBranch)
 			assert.NoError(t, err)
 			gitPath := WebPathToGitPath(webPath)
 			entry, err := masterTree.GetTreeEntryByPath(gitPath)
@@ -215,7 +215,7 @@ func TestRepository_EditWikiPage(t *testing.T) {
 		// Now need to show that the page has been added:
 		gitRepo, err := gitrepo.OpenWikiRepository(git.DefaultContext, repo)
 		assert.NoError(t, err)
-		masterTree, err := gitRepo.GetTree(repo.DefaultWikiBranch)
+		masterTree, err := gitRepo.GetTree(t.Context(), repo.DefaultWikiBranch)
 		assert.NoError(t, err)
 		gitPath := WebPathToGitPath(webPath)
 		entry, err := masterTree.GetTreeEntryByPath(gitPath)
@@ -241,7 +241,7 @@ func TestRepository_DeleteWikiPage(t *testing.T) {
 	require.NoError(t, err)
 
 	defer gitRepo.Close()
-	masterTree, err := gitRepo.GetTree(repo.DefaultWikiBranch)
+	masterTree, err := gitRepo.GetTree(t.Context(), repo.DefaultWikiBranch)
 	assert.NoError(t, err)
 	gitPath := WebPathToGitPath("Home")
 	_, err = masterTree.GetTreeEntryByPath(gitPath)