add context to commitsByRange

add context to commitsBetweenNotBase
go-gitea · TheFox0x7 · Mar 14, 2025 · Mar 14, 2025 · Mar 14, 2025 · Mar 14, 2025
commit 7fbf350d57e3d56e8dff9ccd359f844117d2258d
diff --git a/modules/git/commit.go b/modules/git/commit.go
@@ -199,8 +199,8 @@ func (c *Commit) CommitsCount() (int64, error) {
 }
 
 // CommitsByRange returns the specific page commits before current revision, every page's number default by CommitsRangeSize
-func (c *Commit) CommitsByRange(page, pageSize int, not string) ([]*Commit, error) {
-	return c.repo.commitsByRange(c.ID, page, pageSize, not)
+func (c *Commit) CommitsByRange(ctx context.Context, page, pageSize int, not string) ([]*Commit, error) {
+	return c.repo.commitsByRange(ctx, c.ID, page, pageSize, not)
 }
 
 // CommitsBefore returns all the commits before current revision

diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
@@ -90,7 +90,7 @@ func (repo *Repository) GetCommitByPath(ctx context.Context, relpath string) (*C
 	return commits[0], nil
 }
 
-func (repo *Repository) commitsByRange(id ObjectID, page, pageSize int, not string) ([]*Commit, error) {
+func (repo *Repository) commitsByRange(ctx context.Context, id ObjectID, page, pageSize int, not string) ([]*Commit, error) {
 	cmd := NewCommand("log").
 		AddOptionFormat("--skip=%d", (page-1)*pageSize).
 		AddOptionFormat("--max-count=%d", pageSize).
@@ -101,7 +101,7 @@ func (repo *Repository) commitsByRange(id ObjectID, page, pageSize int, not stri
 		cmd.AddOptionValues("--not", not)
 	}
 
-	stdout, _, err := cmd.RunStdBytes(repo.Ctx, &RunOpts{Dir: repo.Path})
+	stdout, _, err := cmd.RunStdBytes(ctx, &RunOpts{Dir: repo.Path})
 	if err != nil {
 		return nil, err
 	}
@@ -340,17 +340,17 @@ func (repo *Repository) CommitsBetweenLimit(ctx context.Context, last, before *C
 
 // CommitsBetweenNotBase returns a list that contains commits between [before, last), excluding commits in baseBranch.
 // If before is detached (removed by reset + push) it is not included.
-func (repo *Repository) CommitsBetweenNotBase(last, before *Commit, baseBranch string) ([]*Commit, error) {
+func (repo *Repository) CommitsBetweenNotBase(ctx context.Context, last, before *Commit, baseBranch string) ([]*Commit, error) {
 	var stdout []byte
 	var err error
 	if before == nil {
-		stdout, _, err = NewCommand("rev-list").AddDynamicArguments(last.ID.String()).AddOptionValues("--not", baseBranch).RunStdBytes(repo.Ctx, &RunOpts{Dir: repo.Path})
+		stdout, _, err = NewCommand("rev-list").AddDynamicArguments(last.ID.String()).AddOptionValues("--not", baseBranch).RunStdBytes(ctx, &RunOpts{Dir: repo.Path})
 	} else {
-		stdout, _, err = NewCommand("rev-list").AddDynamicArguments(before.ID.String()+".."+last.ID.String()).AddOptionValues("--not", baseBranch).RunStdBytes(repo.Ctx, &RunOpts{Dir: repo.Path})
+		stdout, _, err = NewCommand("rev-list").AddDynamicArguments(before.ID.String()+".."+last.ID.String()).AddOptionValues("--not", baseBranch).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()).AddOptionValues("--not", baseBranch).RunStdBytes(repo.Ctx, &RunOpts{Dir: repo.Path})
+			stdout, _, err = NewCommand("rev-list").AddDynamicArguments(before.ID.String(), last.ID.String()).AddOptionValues("--not", baseBranch).RunStdBytes(ctx, &RunOpts{Dir: repo.Path})
 		}
 	}
 	if err != nil {

diff --git a/routers/api/v1/repo/commits.go b/routers/api/v1/repo/commits.go
@@ -212,7 +212,7 @@ func GetAllCommits(ctx *context.APIContext) {
 		}
 
 		// Query commits
-		commits, err = baseCommit.CommitsByRange(listOptions.Page, listOptions.PageSize, not)
+		commits, err = baseCommit.CommitsByRange(ctx, listOptions.Page, listOptions.PageSize, not)
 		if err != nil {
 			ctx.APIErrorInternal(err)
 			return

diff --git a/routers/web/feed/branch.go b/routers/web/feed/branch.go
@@ -16,7 +16,7 @@ import (
 
 // ShowBranchFeed shows tags and/or releases on the repo as RSS / Atom feed
 func ShowBranchFeed(ctx *context.Context, repo *repo.Repository, formatType string) {
-	commits, err := ctx.Repo.Commit.CommitsByRange(0, 10, "")
+	commits, err := ctx.Repo.Commit.CommitsByRange(ctx, 0, 10, "")
 	if err != nil {
 		ctx.ServerError("ShowBranchFeed", err)
 		return

diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go
@@ -77,7 +77,7 @@ func Commits(ctx *context.Context) {
 	}
 
 	// Both `git log branchName` and `git log commitId` work.
-	commits, err := ctx.Repo.Commit.CommitsByRange(page, pageSize, "")
+	commits, err := ctx.Repo.Commit.CommitsByRange(ctx, page, pageSize, "")
 	if err != nil {
 		ctx.ServerError("CommitsByRange", err)
 		return

diff --git a/services/pull/comment.go b/services/pull/comment.go
@@ -47,7 +47,7 @@ func getCommitIDsFromRepo(ctx context.Context, repo *repo_model.Repository, oldC
 	}
 
 	// Find commits between new and old commit excluding base branch commits
-	commits, err := gitRepo.CommitsBetweenNotBase(newCommit, oldCommit, baseBranch)
+	commits, err := gitRepo.CommitsBetweenNotBase(ctx, newCommit, oldCommit, baseBranch)
 	if err != nil {
 		return nil, false, err
 	}