add context to remaining branch commands

Author: TheFox0x7

modules/git/repo_branch.go

@@ -130,20 +130,20 @@ func (repo *Repository) CreateBranch(ctx context.Context, branch, oldbranchOrCom
 }
 
 // AddRemote adds a new remote to repository.
-func (repo *Repository) AddRemote(name, url string, fetch bool) error {
+func (repo *Repository) AddRemote(ctx context.Context, name, url string, fetch bool) error {
 	cmd := NewCommand("remote", "add")
 	if fetch {
 		cmd.AddArguments("-f")
 	}
 	cmd.AddDynamicArguments(name, url)
 
-	_, _, err := cmd.RunStdString(repo.Ctx, &RunOpts{Dir: repo.Path})
+	_, _, err := cmd.RunStdString(ctx, &RunOpts{Dir: repo.Path})
 	return err
 }
 
 // RemoveRemote removes a remote from repository.
-func (repo *Repository) RemoveRemote(name string) error {
-	_, _, err := NewCommand("remote", "rm").AddDynamicArguments(name).RunStdString(repo.Ctx, &RunOpts{Dir: repo.Path})
+func (repo *Repository) RemoveRemote(ctx context.Context, name string) error {
+	_, _, err := NewCommand("remote", "rm").AddDynamicArguments(name).RunStdString(ctx, &RunOpts{Dir: repo.Path})
 	return err
 }
 
@@ -153,7 +153,7 @@ func (branch *Branch) GetCommit() (*Commit, error) {
 }
 
 // RenameBranch rename a branch
-func (repo *Repository) RenameBranch(from, to string) error {
-	_, _, err := NewCommand("branch", "-m").AddDynamicArguments(from, to).RunStdString(repo.Ctx, &RunOpts{Dir: repo.Path})
+func (repo *Repository) RenameBranch(ctx context.Context, from, to string) error {
+	_, _, err := NewCommand("branch", "-m").AddDynamicArguments(from, to).RunStdString(ctx, &RunOpts{Dir: repo.Path})
 	return err
 }

modules/git/repo_compare.go

@@ -60,11 +60,11 @@ func (repo *Repository) GetCompareInfo(ctx context.Context, basePath, baseBranch
 	if repo.Path != basePath {
 		// Add a temporary remote
 		tmpRemote = strconv.FormatInt(time.Now().UnixNano(), 10)
-		if err = repo.AddRemote(tmpRemote, basePath, false); err != nil {
+		if err = repo.AddRemote(ctx, tmpRemote, basePath, false); err != nil {
 			return nil, fmt.Errorf("AddRemote: %w", err)
 		}
 		defer func() {
-			if err := repo.RemoveRemote(tmpRemote); err != nil {
+			if err := repo.RemoveRemote(ctx, tmpRemote); err != nil {
 				logger.Error("GetPullRequestInfo: RemoveRemote: %v", err)
 			}
 		}()

services/issue/pull.go

@@ -21,11 +21,11 @@ import (
 func getMergeBase(ctx context.Context, repo *git.Repository, pr *issues_model.PullRequest, baseBranch, headBranch string) (string, error) {
 	// Add a temporary remote
 	tmpRemote := fmt.Sprintf("mergebase-%d-%d", pr.ID, time.Now().UnixNano())
-	if err := repo.AddRemote(tmpRemote, repo.Path, false); err != nil {
+	if err := repo.AddRemote(ctx, tmpRemote, repo.Path, false); err != nil {
 		return "", fmt.Errorf("AddRemote: %w", err)
 	}
 	defer func() {
-		if err := repo.RemoveRemote(tmpRemote); err != nil {
+		if err := repo.RemoveRemote(ctx, tmpRemote); err != nil {
 			log.Error("getMergeBase: RemoveRemote: %v", err)
 		}
 	}()

services/migrations/dump.go

@@ -507,7 +507,7 @@ func (g *RepositoryDumper) handlePullRequest(ctx context.Context, pr *base.PullR
 			remote = "head-pr-" + strconv.FormatInt(pr.Number, 10)
 		}
 		// ... now add the remote
-		err := g.gitRepo.AddRemote(remote, pr.Head.CloneURL, true)
+		err := g.gitRepo.AddRemote(ctx, remote, pr.Head.CloneURL, true)
 		if err != nil {
 			log.Error("PR #%d in %s/%s AddRemote[%s] failed: %v", pr.Number, g.repoOwner, g.repoName, remote, err)
 		} else {

services/migrations/gitea_uploader.go

@@ -624,7 +624,7 @@ func (g *GiteaLocalUploader) updateGitForPullRequest(ctx context.Context, pr *ba
 				remote = "head-pr-" + strconv.FormatInt(pr.Number, 10)
 			}
 			// ... now add the remote
-			err := g.gitRepo.AddRemote(remote, pr.Head.CloneURL, true)
+			err := g.gitRepo.AddRemote(ctx, remote, pr.Head.CloneURL, true)
 			if err != nil {
 				log.Error("PR #%d in %s/%s AddRemote[%s] failed: %v", pr.Number, g.repoOwner, g.repoName, remote, err)
 			} else {

services/repository/branch.go

@@ -442,7 +442,7 @@ func RenameBranch(ctx context.Context, repo *repo_model.Repository, doer *user_m
 	}
 
 	if err := git_model.RenameBranch(ctx, repo, from, to, func(ctx context.Context, isDefault bool) error {
-		err2 := gitRepo.RenameBranch(from, to)
+		err2 := gitRepo.RenameBranch(ctx, from, to)
 		if err2 != nil {
 			return err2
 		}

services/wiki/wiki.go

@@ -397,7 +397,7 @@ func ChangeDefaultWikiBranch(ctx context.Context, repo *repo_model.Repository, n
 		}
 		defer gitRepo.Close()
 
-		err = gitRepo.RenameBranch(oldDefBranch, newBranch)
+		err = gitRepo.RenameBranch(ctx, oldDefBranch, newBranch)
 		if err != nil {
 			return fmt.Errorf("unable to rename default branch: %w", err)
 		}