feat: vendor gitea 1.16.2

package/gitea/source/services/repository/gitgraph/graph.go

@@ -6,9 +6,6 @@ package gitgraph
 import (
 	"bufio"
 	"bytes"
-	"context"
-	"os"
-	"strings"
 
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/git/gitcmd"
@@ -45,22 +42,14 @@ func GetCommitGraph(r *git.Repository, page, maxAllowedColors int, hidePRRefs bo
 	}
 	graph := NewGraph()
 
-	stderr := new(strings.Builder)
-	stdoutReader, stdoutWriter, err := os.Pipe()
-	if err != nil {
-		return nil, err
-	}
 	commitsToSkip := setting.UI.GraphMaxCommitNum * (page - 1)
 
-	scanner := bufio.NewScanner(stdoutReader)
-
-	if err := graphCmd.Run(r.Ctx, &gitcmd.RunOpts{
-		Dir:    r.Path,
-		Stdout: stdoutWriter,
-		Stderr: stderr,
-		PipelineFunc: func(ctx context.Context, cancel context.CancelFunc) error {
-			_ = stdoutWriter.Close()
-			defer stdoutReader.Close()
+	stdoutReader, stdoutReaderClose := graphCmd.MakeStdoutPipe()
+	defer stdoutReaderClose()
+	if err := graphCmd.
+		WithDir(r.Path).
+		WithPipelineFunc(func(ctx gitcmd.Context) error {
+			scanner := bufio.NewScanner(stdoutReader)
 			parser := &Parser{}
 			parser.firstInUse = -1
 			parser.maxAllowedColors = maxAllowedColors
@@ -92,8 +81,7 @@ func GetCommitGraph(r *git.Repository, page, maxAllowedColors int, hidePRRefs bo
 				line := scanner.Bytes()
 				if bytes.IndexByte(line, '*') >= 0 {
 					if err := parser.AddLineToGraph(graph, row, line); err != nil {
-						cancel()
-						return err
+						return ctx.CancelPipeline(err)
 					}
 					break
 				}
@@ -104,13 +92,12 @@ func GetCommitGraph(r *git.Repository, page, maxAllowedColors int, hidePRRefs bo
 				row++
 				line := scanner.Bytes()
 				if err := parser.AddLineToGraph(graph, row, line); err != nil {
-					cancel()
-					return err
+					return ctx.CancelPipeline(err)
 				}
 			}
 			return scanner.Err()
-		},
-	}); err != nil {
+		}).
+		RunWithStderr(r.Ctx); err != nil {
 		return graph, err
 	}
 	return graph, nil