Revert change of ConcatenateError

lunny · lunny · commit ace647d1b454 · 2025-03-22T23:06:43.000-07:00
diff --git a/modules/git/batch_reader.go b/modules/git/batch_reader.go
@@ -13,7 +13,6 @@ import (
 	"strings"
 
 	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/util"
 
 	"github.com/djherbis/buffer"
 	"github.com/djherbis/nio/v3"
@@ -36,7 +35,7 @@ func ensureValidGitRepository(ctx context.Context, repoPath string) error {
 			Stderr: &stderr,
 		})
 	if err != nil {
-		return util.ConcatenateError(err, (&stderr).String())
+		return ConcatenateError(err, (&stderr).String())
 	}
 	return nil
 }
@@ -72,8 +71,8 @@ func catFileBatchCheck(ctx context.Context, repoPath string) (WriteCloserError,
 				UseContextTimeout: true,
 			})
 		if err != nil {
-			_ = batchStdoutWriter.CloseWithError(util.ConcatenateError(err, (&stderr).String()))
-			_ = batchStdinReader.CloseWithError(util.ConcatenateError(err, (&stderr).String()))
+			_ = batchStdoutWriter.CloseWithError(ConcatenateError(err, (&stderr).String()))
+			_ = batchStdinReader.CloseWithError(ConcatenateError(err, (&stderr).String()))
 		} else {
 			_ = batchStdoutWriter.Close()
 			_ = batchStdinReader.Close()
@@ -120,8 +119,8 @@ func catFileBatch(ctx context.Context, repoPath string) (WriteCloserError, *bufi
 				UseContextTimeout: true,
 			})
 		if err != nil {
-			_ = batchStdoutWriter.CloseWithError(util.ConcatenateError(err, (&stderr).String()))
-			_ = batchStdinReader.CloseWithError(util.ConcatenateError(err, (&stderr).String()))
+			_ = batchStdoutWriter.CloseWithError(ConcatenateError(err, (&stderr).String()))
+			_ = batchStdinReader.CloseWithError(ConcatenateError(err, (&stderr).String()))
 		} else {
 			_ = batchStdoutWriter.Close()
 			_ = batchStdinReader.Close()
diff --git a/modules/git/command.go b/modules/git/command.go
@@ -380,7 +380,7 @@ type runStdError struct {
 func (r *runStdError) Error() string {
 	// the stderr must be in the returned error text, some code only checks `strings.Contains(err.Error(), "git error")`
 	if r.errMsg == "" {
-		r.errMsg = util.ConcatenateError(r.err, r.stderr).Error()
+		r.errMsg = ConcatenateError(r.err, r.stderr).Error()
 	}
 	return r.errMsg
 }
diff --git a/modules/git/commit.go b/modules/git/commit.go
@@ -448,7 +448,7 @@ func GetCommitFileStatus(ctx context.Context, repoPath, commitID string) (*Commi
 	})
 	w.Close() // Close writer to exit parsing goroutine
 	if err != nil {
-		return nil, util.ConcatenateError(err, stderr.String())
+		return nil, ConcatenateError(err, stderr.String())
 	}
 
 	<-done
diff --git a/modules/git/log_name_status.go b/modules/git/log_name_status.go
@@ -14,7 +14,6 @@ import (
 	"strings"
 
 	"code.gitea.io/gitea/modules/container"
-	"code.gitea.io/gitea/modules/util"
 
 	"github.com/djherbis/buffer"
 	"github.com/djherbis/nio/v3"
@@ -71,7 +70,7 @@ func LogNameStatusRepo(ctx context.Context, repository, head, treepath string, p
 			Stderr: &stderr,
 		})
 		if err != nil {
-			_ = stdoutWriter.CloseWithError(util.ConcatenateError(err, (&stderr).String()))
+			_ = stdoutWriter.CloseWithError(ConcatenateError(err, (&stderr).String()))
 			return
 		}
 
diff --git a/modules/git/pipeline/lfs_nogogit.go b/modules/git/pipeline/lfs_nogogit.go
@@ -14,7 +14,6 @@ import (
 	"sync"
 
 	"code.gitea.io/gitea/modules/git"
-	"code.gitea.io/gitea/modules/util"
 )
 
 // FindLFSFile finds commits that contain a provided pointer file hash
@@ -39,7 +38,7 @@ func FindLFSFile(repo *git.Repository, objectID git.ObjectID) ([]*LFSResult, err
 			Stderr: &stderr,
 		})
 		if err != nil {
-			_ = revListWriter.CloseWithError(util.ConcatenateError(err, (&stderr).String()))
+			_ = revListWriter.CloseWithError(git.ConcatenateError(err, (&stderr).String()))
 		} else {
 			_ = revListWriter.Close()
 		}
diff --git a/modules/git/repo.go b/modules/git/repo.go
@@ -18,7 +18,6 @@ import (
 	"time"
 
 	"code.gitea.io/gitea/modules/proxy"
-	"code.gitea.io/gitea/modules/util"
 )
 
 // GPGSettings represents the default GPG settings for this repository
@@ -177,7 +176,7 @@ func CloneWithArgs(ctx context.Context, args TrustedCmdArgs, from, to string, op
 		Stdout:  io.Discard,
 		Stderr:  stderr,
 	}); err != nil {
-		return util.ConcatenateError(err, stderr.String())
+		return ConcatenateError(err, stderr.String())
 	}
 	return nil
 }
diff --git a/modules/git/repo_archive.go b/modules/git/repo_archive.go
@@ -10,8 +10,6 @@ import (
 	"io"
 	"path/filepath"
 	"strings"
-
-	"code.gitea.io/gitea/modules/util"
 )
 
 // ArchiveType archive types
@@ -69,7 +67,7 @@ func (repo *Repository) CreateArchive(ctx context.Context, format ArchiveType, t
 		Stderr: &stderr,
 	})
 	if err != nil {
-		return util.ConcatenateError(err, stderr.String())
+		return ConcatenateError(err, stderr.String())
 	}
 	return nil
 }
diff --git a/modules/git/repo_branch_nogogit.go b/modules/git/repo_branch_nogogit.go
@@ -14,7 +14,6 @@ import (
 	"strings"
 
 	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/util"
 )
 
 // IsObjectExist returns true if the given object exists in the repository.
@@ -120,7 +119,7 @@ func WalkShowRef(ctx context.Context, repoPath string, extraArgs TrustedCmdArgs,
 				_ = stdoutWriter.Close()
 				return
 			}
-			_ = stdoutWriter.CloseWithError(util.ConcatenateError(err, stderrBuilder.String()))
+			_ = stdoutWriter.CloseWithError(ConcatenateError(err, stderrBuilder.String()))
 		} else {
 			_ = stdoutWriter.Close()
 		}
diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
@@ -13,7 +13,6 @@ import (
 
 	"code.gitea.io/gitea/modules/cache"
 	"code.gitea.io/gitea/modules/setting"
-	"code.gitea.io/gitea/modules/util"
 )
 
 // GetBranchCommitID returns last commit ID string of given branch.
@@ -240,7 +239,7 @@ func (repo *Repository) CommitsByFileAndRange(opts CommitsByFileAndRangeOptions)
 			Stderr: &stderr,
 		})
 		if err != nil {
-			_ = stdoutWriter.CloseWithError(util.ConcatenateError(err, (&stderr).String()))
+			_ = stdoutWriter.CloseWithError(ConcatenateError(err, (&stderr).String()))
 		} else {
 			_ = stdoutWriter.Close()
 		}
diff --git a/modules/git/repo_ref_nogogit.go b/modules/git/repo_ref_nogogit.go
@@ -9,8 +9,6 @@ import (
 	"bufio"
 	"io"
 	"strings"
-
-	"code.gitea.io/gitea/modules/util"
 )
 
 // GetRefsFiltered returns all references of the repository that matches patterm exactly or starting with.
@@ -29,7 +27,7 @@ func (repo *Repository) GetRefsFiltered(pattern string) ([]*Reference, error) {
 			Stderr: stderrBuilder,
 		})
 		if err != nil {
-			_ = stdoutWriter.CloseWithError(util.ConcatenateError(err, stderrBuilder.String()))
+			_ = stdoutWriter.CloseWithError(ConcatenateError(err, stderrBuilder.String()))
 		} else {
 			_ = stdoutWriter.Close()
 		}
diff --git a/modules/git/repo_tag.go b/modules/git/repo_tag.go
@@ -121,7 +121,7 @@ func (repo *Repository) GetTagInfos(page, pageSize int) ([]*Tag, int, error) {
 			AddOptionFormat("--format=%s", forEachRefFmt.Flag()).
 			AddArguments("--sort", "-*creatordate", "refs/tags").Run(repo.Ctx, rc)
 		if err != nil {
-			_ = stdoutWriter.CloseWithError(util.ConcatenateError(err, stderr.String()))
+			_ = stdoutWriter.CloseWithError(ConcatenateError(err, stderr.String()))
 		} else {
 			_ = stdoutWriter.Close()
 		}
diff --git a/modules/git/repo_tree.go b/modules/git/repo_tree.go
@@ -9,8 +9,6 @@ import (
 	"os"
 	"strings"
 	"time"
-
-	"code.gitea.io/gitea/modules/util"
 )
 
 // CommitTreeOpts represents the possible options to CommitTree
@@ -63,7 +61,7 @@ func (repo *Repository) CommitTree(author, committer *Signature, tree *Tree, opt
 		Stderr: stderr,
 	})
 	if err != nil {
-		return nil, util.ConcatenateError(err, stderr.String())
+		return nil, ConcatenateError(err, stderr.String())
 	}
 	return NewIDFromString(strings.TrimSpace(stdout.String()))
 }
diff --git a/modules/git/utils.go b/modules/git/utils.go
@@ -6,6 +6,7 @@ package git
 import (
 	"crypto/sha1"
 	"encoding/hex"
+	"fmt"
 	"io"
 	"strconv"
 	"strings"
@@ -39,6 +40,14 @@ func (oc *ObjectCache[T]) Get(id string) (T, bool) {
 	return obj, has
 }
 
+// ConcatenateError concatenats an error with stderr string
+func ConcatenateError(err error, stderr string) error {
+	if len(stderr) == 0 {
+		return err
+	}
+	return fmt.Errorf("%w - %s", err, stderr)
+}
+
 // ParseBool returns the boolean value represented by the string as per git's git_config_bool
 // true will be returned for the result if the string is empty, but valid will be false.
 // "true", "yes", "on" are all true, true
diff --git a/modules/util/error.go b/modules/util/error.go
@@ -95,11 +95,3 @@ func ErrorAsLocale(err error) *LocaleWrapper {
 	}
 	return nil
 }
-
-// ConcatenateError concatenats an error with stderr string
-func ConcatenateError(err error, stderr string) error {
-	if len(stderr) == 0 {
-		return err
-	}
-	return fmt.Errorf("%w - %s", err, stderr)
-}
diff --git a/services/pull/patch_unmerged.go b/services/pull/patch_unmerged.go
@@ -15,7 +15,6 @@ import (
 
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/util"
 )
 
 // lsFileLine is a Quadruplet struct (+error) representing a partially parsed line from ls-files
@@ -117,7 +116,7 @@ func readUnmergedLsFileLines(ctx context.Context, tmpBasePath string, outputChan
 			},
 		})
 	if err != nil {
-		outputChan <- &lsFileLine{err: fmt.Errorf("git ls-files -u -z: %w", util.ConcatenateError(err, stderr.String()))}
+		outputChan <- &lsFileLine{err: fmt.Errorf("git ls-files -u -z: %w", git.ConcatenateError(err, stderr.String()))}
 	}
 }
 
diff --git a/services/pull/pull.go b/services/pull/pull.go
@@ -551,7 +551,7 @@ func checkIfPRContentChanged(ctx context.Context, pr *issues_model.PullRequest,
 		if err == util.ErrNotEmpty {
 			return true, nil
 		}
-		err = util.ConcatenateError(err, stderr.String())
+		err = git.ConcatenateError(err, stderr.String())
 
 		log.Error("Unable to run diff on %s %s %s in tempRepo for PR[%d]%s/%s...%s/%s: Error: %v",
 			newCommitID, oldCommitID, base,

Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ type runStdError struct {`
`380`	`380`	`func (r *runStdError) Error() string {`
`381`	`381`	// the stderr must be in the returned error text, some code only checks `strings.Contains(err.Error(), "git error")`
`382`	`382`	`if r.errMsg == "" {`
`383`		`- r.errMsg = util.ConcatenateError(r.err, r.stderr).Error()`
	`383`	`+ r.errMsg = ConcatenateError(r.err, r.stderr).Error()`
`384`	`384`	`}`
`385`	`385`	`return r.errMsg`
`386`	`386`	`}`
Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ func GetCommitFileStatus(ctx context.Context, repoPath, commitID string) (*Commi`
`448`	`448`	`})`
`449`	`449`	`w.Close() // Close writer to exit parsing goroutine`
`450`	`450`	`if err != nil {`
`451`		`- return nil, util.ConcatenateError(err, stderr.String())`
	`451`	`+ return nil, ConcatenateError(err, stderr.String())`
`452`	`452`	`}`
`453`	`453`
`454`	`454`	`<-done`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ import (`
`14`	`14`	`"sync"`
`15`	`15`
`16`	`16`	`"code.gitea.io/gitea/modules/git"`
`17`		`- "code.gitea.io/gitea/modules/util"`
`18`	`17`	`)`
`19`	`18`
`20`	`19`	`// FindLFSFile finds commits that contain a provided pointer file hash`
`@@ -39,7 +38,7 @@ func FindLFSFile(repo git.Repository, objectID git.ObjectID) ([]LFSResult, err`
`39`	`38`	`Stderr: &stderr,`
`40`	`39`	`})`
`41`	`40`	`if err != nil {`
`42`		`- _ = revListWriter.CloseWithError(util.ConcatenateError(err, (&stderr).String()))`
	`41`	`+ _ = revListWriter.CloseWithError(git.ConcatenateError(err, (&stderr).String()))`
`43`	`42`	`} else {`
`44`	`43`	`_ = revListWriter.Close()`
`45`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ import (`
`18`	`18`	`"time"`
`19`	`19`
`20`	`20`	`"code.gitea.io/gitea/modules/proxy"`
`21`		`- "code.gitea.io/gitea/modules/util"`
`22`	`21`	`)`
`23`	`22`
`24`	`23`	`// GPGSettings represents the default GPG settings for this repository`
`@@ -177,7 +176,7 @@ func CloneWithArgs(ctx context.Context, args TrustedCmdArgs, from, to string, op`
`177`	`176`	`Stdout: io.Discard,`
`178`	`177`	`Stderr: stderr,`
`179`	`178`	`}); err != nil {`
`180`		`- return util.ConcatenateError(err, stderr.String())`
	`179`	`+ return ConcatenateError(err, stderr.String())`
`181`	`180`	`}`
`182`	`181`	`return nil`
`183`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@ import (`
`10`	`10`	`"io"`
`11`	`11`	`"path/filepath"`
`12`	`12`	`"strings"`
`13`		`-`
`14`		`- "code.gitea.io/gitea/modules/util"`
`15`	`13`	`)`
`16`	`14`
`17`	`15`	`// ArchiveType archive types`
`@@ -69,7 +67,7 @@ func (repo *Repository) CreateArchive(ctx context.Context, format ArchiveType, t`
`69`	`67`	`Stderr: &stderr,`
`70`	`68`	`})`
`71`	`69`	`if err != nil {`
`72`		`- return util.ConcatenateError(err, stderr.String())`
	`70`	`+ return ConcatenateError(err, stderr.String())`
`73`	`71`	`}`
`74`	`72`	`return nil`
`75`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ import (`
`13`	`13`
`14`	`14`	`"code.gitea.io/gitea/modules/cache"`
`15`	`15`	`"code.gitea.io/gitea/modules/setting"`
`16`		`- "code.gitea.io/gitea/modules/util"`
`17`	`16`	`)`
`18`	`17`
`19`	`18`	`// GetBranchCommitID returns last commit ID string of given branch.`
`@@ -240,7 +239,7 @@ func (repo *Repository) CommitsByFileAndRange(opts CommitsByFileAndRangeOptions)`
`240`	`239`	`Stderr: &stderr,`
`241`	`240`	`})`
`242`	`241`	`if err != nil {`
`243`		`- _ = stdoutWriter.CloseWithError(util.ConcatenateError(err, (&stderr).String()))`
	`242`	`+ _ = stdoutWriter.CloseWithError(ConcatenateError(err, (&stderr).String()))`
`244`	`243`	`} else {`
`245`	`244`	`_ = stdoutWriter.Close()`
`246`	`245`	`}`