add context to IsCommitInBranch and CommitsBetweenIDs

Author: TheFox0x7

modules/git/commit.go

@@ -254,12 +254,12 @@ func (c *Commit) CommitsBeforeLimit(ctx context.Context, num int) ([]*Commit, er
 }
 
 // CommitsBeforeUntil returns the commits between commitID to current revision
-func (c *Commit) CommitsBeforeUntil(commitID string) ([]*Commit, error) {
+func (c *Commit) CommitsBeforeUntil(ctx context.Context, commitID string) ([]*Commit, error) {
 	endCommit, err := c.repo.GetCommit(commitID)
 	if err != nil {
 		return nil, err
 	}
-	return c.repo.CommitsBetween(c, endCommit)
+	return c.repo.CommitsBetween(ctx, c, endCommit)
 }
 
 // SearchCommitsOptions specify the parameters for SearchCommits

modules/git/repo_commit.go

@@ -290,17 +290,17 @@ func (repo *Repository) FilesCountBetween(ctx context.Context, startCommitID, en
 
 // CommitsBetween returns a list that contains commits between [before, last).
 // If before is detached (removed by reset + push) it is not included.
-func (repo *Repository) CommitsBetween(last, before *Commit) ([]*Commit, error) {
+func (repo *Repository) CommitsBetween(ctx context.Context, last, before *Commit) ([]*Commit, error) {
 	var stdout []byte
 	var err error
 	if before == nil {
-		stdout, _, err = NewCommand("rev-list").AddDynamicArguments(last.ID.String()).RunStdBytes(repo.Ctx, &RunOpts{Dir: repo.Path})
+		stdout, _, err = NewCommand("rev-list").AddDynamicArguments(last.ID.String()).RunStdBytes(ctx, &RunOpts{Dir: repo.Path})
 	} else {
-		stdout, _, err = NewCommand("rev-list").AddDynamicArguments(before.ID.String()+".."+last.ID.String()).RunStdBytes(repo.Ctx, &RunOpts{Dir: repo.Path})
+		stdout, _, err = NewCommand("rev-list").AddDynamicArguments(before.ID.String()+".."+last.ID.String()).RunStdBytes(ctx, &RunOpts{Dir: repo.Path})
 		if err != nil && strings.Contains(err.Error(), "no merge base") {
 			// future versions of git >= 2.28 are likely to return an error if before and last have become unrelated.
 			// previously it would return the results of git rev-list before last so let's try that...
-			stdout, _, err = NewCommand("rev-list").AddDynamicArguments(before.ID.String(), last.ID.String()).RunStdBytes(repo.Ctx, &RunOpts{Dir: repo.Path})
+			stdout, _, err = NewCommand("rev-list").AddDynamicArguments(before.ID.String(), last.ID.String()).RunStdBytes(ctx, &RunOpts{Dir: repo.Path})
 		}
 	}
 	if err != nil {
@@ -359,20 +359,20 @@ func (repo *Repository) CommitsBetweenNotBase(ctx context.Context, last, before
 	return repo.parsePrettyFormatLogToList(bytes.TrimSpace(stdout))
 }
 
-// CommitsBetweenIDs return commits between twoe commits
-func (repo *Repository) CommitsBetweenIDs(last, before string) ([]*Commit, error) {
+// CommitsBetweenIDs return commits between two commits
+func (repo *Repository) CommitsBetweenIDs(ctx context.Context, last, before string) ([]*Commit, error) {
 	lastCommit, err := repo.GetCommit(last)
 	if err != nil {
 		return nil, err
 	}
 	if before == "" {
-		return repo.CommitsBetween(lastCommit, nil)
+		return repo.CommitsBetween(ctx, lastCommit, nil)
 	}
 	beforeCommit, err := repo.GetCommit(before)
 	if err != nil {
 		return nil, err
 	}
-	return repo.CommitsBetween(lastCommit, beforeCommit)
+	return repo.CommitsBetween(ctx, lastCommit, beforeCommit)
 }
 
 // CommitsCountBetween return numbers of commits between two commits
@@ -495,8 +495,8 @@ func (repo *Repository) GetCommitsFromIDs(commitIDs []string) []*Commit {
 }
 
 // IsCommitInBranch check if the commit is on the branch
-func (repo *Repository) IsCommitInBranch(commitID, branch string) (r bool, err error) {
-	stdout, _, err := NewCommand("branch", "--contains").AddDynamicArguments(commitID, branch).RunStdString(repo.Ctx, &RunOpts{Dir: repo.Path})
+func (repo *Repository) IsCommitInBranch(ctx context.Context, commitID, branch string) (r bool, err error) {
+	stdout, _, err := NewCommand("branch", "--contains").AddDynamicArguments(commitID, branch).RunStdString(ctx, &RunOpts{Dir: repo.Path})
 	if err != nil {
 		return false, err
 	}

modules/git/repo_commit_test.go

@@ -75,11 +75,11 @@ func TestIsCommitInBranch(t *testing.T) {
 	assert.NoError(t, err)
 	defer bareRepo1.Close()
 
-	result, err := bareRepo1.IsCommitInBranch("2839944139e0de9737a044f78b0e4b40d989a9e3", "branch1")
+	result, err := bareRepo1.IsCommitInBranch(t.Context(), "2839944139e0de9737a044f78b0e4b40d989a9e3", "branch1")
 	assert.NoError(t, err)
 	assert.True(t, result)
 
-	result, err = bareRepo1.IsCommitInBranch("2839944139e0de9737a044f78b0e4b40d989a9e3", "branch2")
+	result, err = bareRepo1.IsCommitInBranch(t.Context(), "2839944139e0de9737a044f78b0e4b40d989a9e3", "branch2")
 	assert.NoError(t, err)
 	assert.False(t, result)
 }
@@ -100,7 +100,7 @@ func TestRepository_CommitsBetweenIDs(t *testing.T) {
 		{"78a445db1eac62fe15e624e1137965969addf344", "a78e5638b66ccfe7e1b4689d3d5684e42c97d7ca", 1}, // com2 -> com2_new
 	}
 	for i, c := range cases {
-		commits, err := bareRepo1.CommitsBetweenIDs(c.NewID, c.OldID)
+		commits, err := bareRepo1.CommitsBetweenIDs(t.Context(), c.NewID, c.OldID)
 		assert.NoError(t, err)
 		assert.Len(t, commits, c.ExpectedCommits, "case %d", i)
 	}

services/asymkey/sign.go

@@ -388,7 +388,7 @@ Loop:
 			if err != nil {
 				return false, "", nil, err
 			}
-			commitList, err := commit.CommitsBeforeUntil(mergeBaseCommit)
+			commitList, err := commit.CommitsBeforeUntil(ctx, mergeBaseCommit)
 			if err != nil {
 				return false, "", nil, err
 			}

services/mirror/mirror_pull.go

@@ -530,7 +530,7 @@ func SyncPullMirror(ctx context.Context, repoID int64) bool {
 			log.Error("SyncMirrors [repo: %-v]: unable to get GetFullCommitID [%s]: %v", m.Repo, result.newCommitID, err)
 			continue
 		}
-		commits, err := gitRepo.CommitsBetweenIDs(newCommitID, oldCommitID)
+		commits, err := gitRepo.CommitsBetweenIDs(ctx, newCommitID, oldCommitID)
 		if err != nil {
 			log.Error("SyncMirrors [repo: %-v]: unable to get CommitsBetweenIDs [new_commit_id: %s, old_commit_id: %s]: %v", m.Repo, newCommitID, oldCommitID, err)
 			continue

services/pull/merge.go

@@ -633,7 +633,7 @@ func MergedManually(ctx context.Context, pr *issues_model.PullRequest, doer *use
 		}
 		commitID = commit.ID.String()
 
-		ok, err := baseGitRepo.IsCommitInBranch(commitID, pr.BaseBranch)
+		ok, err := baseGitRepo.IsCommitInBranch(ctx, commitID, pr.BaseBranch)
 		if err != nil {
 			return err
 		}

services/pull/merge_squash.go

@@ -32,7 +32,7 @@ func getAuthorSignatureSquash(ctx *mergeContext) (*git.Signature, error) {
 	}
 	defer gitRepo.Close()
 
-	commits, err := gitRepo.CommitsBetweenIDs(trackingBranch, "HEAD")
+	commits, err := gitRepo.CommitsBetweenIDs(ctx, trackingBranch, "HEAD")
 	if err != nil {
 		log.Error("%-v Unable to get commits between: %s %s: %v", ctx.pr, "HEAD", trackingBranch, err)
 		return nil, err

services/repository/push.go

@@ -201,7 +201,7 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
 					}
 					notify_service.CreateRef(ctx, pusher, repo, opts.RefFullName, opts.NewCommitID)
 				} else {
-					l, err = newCommit.CommitsBeforeUntil(opts.OldCommitID)
+					l, err = newCommit.CommitsBeforeUntil(ctx, opts.OldCommitID)
 					if err != nil {
 						return fmt.Errorf("newCommit.CommitsBeforeUntil: %w", err)
 					}