Make commit_info cancellable

Signed-off-by: Andrew Thornton <art27@cantab.net>
go-gitea · May 30, 2021 · 47c6c41 · 47c6c41
1 parent a4839a0
commit 47c6c41
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/modules/git/commit_info_gogit.go b/modules/git/commit_info_gogit.go
@@ -193,6 +193,11 @@ func GetLastCommitForPaths(ctx context.Context, c cgobject.CommitNode, treePath
 	heap.Push(&commitAndPaths{c, paths, initialHashes})
 
 	for {
+		select {
+		case <-ctx.Done():
+			return nil, ctx.Err()
+		default:
+		}
 		cIn, ok := heap.Pop()
 		if !ok {
 			break

diff --git a/modules/git/commit_info_nogogit.go b/modules/git/commit_info_nogogit.go
@@ -137,7 +137,7 @@ func GetLastCommitForPaths(ctx context.Context, commit *Commit, treePath string,
 
 	go func() {
 		stderr := strings.Builder{}
-		err := NewCommand("rev-list", "--format=%T", commit.ID.String()).RunInDirPipeline(commit.repo.Path, revListWriter, &stderr)
+		err := NewCommand("rev-list", "--format=%T", commit.ID.String()).SetParentContext(ctx).RunInDirPipeline(commit.repo.Path, revListWriter, &stderr)
 		if err != nil {
 			_ = revListWriter.CloseWithError(ConcatenateError(err, (&stderr).String()))
 		} else {
@@ -203,6 +203,11 @@ revListLoop:
 
 	treeReadingLoop:
 		for {
+			select {
+			case <-ctx.Done():
+				return nil, ctx.Err()
+			default:
+			}
 			_, _, size, err := ReadBatchLine(batchReader)
 			if err != nil {
 				return nil, err
@@ -322,6 +327,9 @@ revListLoop:
 			}
 		}
 	}
+	if scan.Err() != nil {
+		return nil, scan.Err()
+	}
 
 	commitsMap := make(map[string]*Commit, len(commits))
 	commitsMap[commit.ID.String()] = commit