Merge branch 'main' into fix-textarea

Author: GiteaBot

models/unittest/testdb.go

@@ -206,7 +206,7 @@ func CreateTestEngine(opts FixturesOptions) error {
 x, err := xorm.NewEngine("sqlite3", "file::memory:?cache=shared&_txlock=immediate")
 if err != nil {
 if strings.Contains(err.Error(), "unknown driver") {
-return fmt.Errorf(`sqlite3 requires: import _ "github.com/mattn/go-sqlite3" or -tags sqlite,sqlite_unlock_notify%s%w`, "\n", err)
+return fmt.Errorf(`sqlite3 requires: -tags sqlite,sqlite_unlock_notify%s%w`, "\n", err)
 }
 return err
 }

modules/git/repo_compare.go

@@ -233,72 +233,34 @@ func parseDiffStat(stdout string) (numFiles, totalAdditions, totalDeletions int,
 return numFiles, totalAdditions, totalDeletions, err
 }
 
-// GetDiffOrPatch generates either diff or formatted patch data between given revisions
-func (repo *Repository) GetDiffOrPatch(base, head string, w io.Writer, patch, binary bool) error {
-if patch {
-return repo.GetPatch(base, head, w)
-}
-if binary {
-return repo.GetDiffBinary(base, head, w)
-}
-return repo.GetDiff(base, head, w)
-}
-
 // GetDiff generates and returns patch data between given revisions, optimized for human readability
-func (repo *Repository) GetDiff(base, head string, w io.Writer) error {
+func (repo *Repository) GetDiff(compareArg string, w io.Writer) error {
 stderr := new(bytes.Buffer)
-err := NewCommand(repo.Ctx, "diff", "-p").AddDynamicArguments(base + "..." + head).
+return NewCommand(repo.Ctx, "diff", "-p").AddDynamicArguments(compareArg).
 Run(&RunOpts{
 Dir: repo.Path,
 Stdout: w,
 Stderr: stderr,
 })
-if err != nil && bytes.Contains(stderr.Bytes(), []byte("no merge base")) {
-return NewCommand(repo.Ctx, "diff", "-p").AddDynamicArguments(base, head).
-Run(&RunOpts{
-Dir: repo.Path,
-Stdout: w,
-})
-}
-return err
 }
 
 // GetDiffBinary generates and returns patch data between given revisions, including binary diffs.
-func (repo *Repository) GetDiffBinary(base, head string, w io.Writer) error {
-stderr := new(bytes.Buffer)
-err := NewCommand(repo.Ctx, "diff", "-p", "--binary", "--histogram").AddDynamicArguments(base + "..." + head).
-Run(&RunOpts{
-Dir: repo.Path,
-Stdout: w,
-Stderr: stderr,
-})
-if err != nil && bytes.Contains(stderr.Bytes(), []byte("no merge base")) {
-return NewCommand(repo.Ctx, "diff", "-p", "--binary", "--histogram").AddDynamicArguments(base, head).
-Run(&RunOpts{
-Dir: repo.Path,
-Stdout: w,
-})
-}
-return err
+func (repo *Repository) GetDiffBinary(compareArg string, w io.Writer) error {
+return NewCommand(repo.Ctx, "diff", "-p", "--binary", "--histogram").AddDynamicArguments(compareArg).Run(&RunOpts{
+Dir: repo.Path,
+Stdout: w,
+})
 }
 
 // GetPatch generates and returns format-patch data between given revisions, able to be used with `git apply`
-func (repo *Repository) GetPatch(base, head string, w io.Writer) error {
+func (repo *Repository) GetPatch(compareArg string, w io.Writer) error {
 stderr := new(bytes.Buffer)
-err := NewCommand(repo.Ctx, "format-patch", "--binary", "--stdout").AddDynamicArguments(base + "..." + head).
+return NewCommand(repo.Ctx, "format-patch", "--binary", "--stdout").AddDynamicArguments(compareArg).
 Run(&RunOpts{
 Dir: repo.Path,
 Stdout: w,
 Stderr: stderr,
 })
-if err != nil && bytes.Contains(stderr.Bytes(), []byte("no merge base")) {
-return NewCommand(repo.Ctx, "format-patch", "--binary", "--stdout").AddDynamicArguments(base, head).
-Run(&RunOpts{
-Dir: repo.Path,
-Stdout: w,
-})
-}
-return err
 }
 
 // GetFilesChangedBetween returns a list of all files that have been changed between the given commits
@@ -329,21 +291,6 @@ func (repo *Repository) GetFilesChangedBetween(base, head string) ([]string, err
 return split, err
 }
 
-// GetDiffFromMergeBase generates and return patch data from merge base to head
-func (repo *Repository) GetDiffFromMergeBase(base, head string, w io.Writer) error {
-stderr := new(bytes.Buffer)
-err := NewCommand(repo.Ctx, "diff", "-p", "--binary").AddDynamicArguments(base + "..." + head).
-Run(&RunOpts{
-Dir: repo.Path,
-Stdout: w,
-Stderr: stderr,
-})
-if err != nil && bytes.Contains(stderr.Bytes(), []byte("no merge base")) {
-return repo.GetDiffBinary(base, head, w)
-}
-return err
-}
-
 // ReadPatchCommit will check if a diff patch exists and return stats
 func (repo *Repository) ReadPatchCommit(prID int64) (commitSHA string, err error) {
 // Migrated repositories download patches to "pulls" location

modules/git/repo_compare_test.go

@@ -28,7 +28,7 @@ func TestGetFormatPatch(t *testing.T) {
 defer repo.Close()
 
 rd := &bytes.Buffer{}
-err = repo.GetPatch("8d92fc95^", "8d92fc95", rd)
+err = repo.GetPatch("8d92fc95^...8d92fc95", rd)
 if err != nil {
 assert.NoError(t, err)
 return

modules/gitrepo/gitrepo.go

@@ -10,6 +10,7 @@ import (
 "strings"
 
 "code.gitea.io/gitea/modules/git"
+"code.gitea.io/gitea/modules/reqctx"
 "code.gitea.io/gitea/modules/setting"
 "code.gitea.io/gitea/modules/util"
 )
@@ -38,63 +39,32 @@ func OpenWikiRepository(ctx context.Context, repo Repository) (*git.Repository,
 
 // contextKey is a value for use with context.WithValue.
 type contextKey struct {
-name string
-}
-
-// RepositoryContextKey is a context key. It is used with context.Value() to get the current Repository for the context
-var RepositoryContextKey = &contextKey{"repository"}
-
-// RepositoryFromContext attempts to get the repository from the context
-func repositoryFromContext(ctx context.Context, repo Repository) *git.Repository {
-value := ctx.Value(RepositoryContextKey)
-if value == nil {
-return nil
-}
-
-if gitRepo, ok := value.(*git.Repository); ok && gitRepo != nil {
-if gitRepo.Path == repoPath(repo) {
-return gitRepo
-}
-}
-
-return nil
+repoPath string
 }
 
 // RepositoryFromContextOrOpen attempts to get the repository from the context or just opens it
 func RepositoryFromContextOrOpen(ctx context.Context, repo Repository) (*git.Repository, io.Closer, error) {
-gitRepo := repositoryFromContext(ctx, repo)
-if gitRepo != nil {
-return gitRepo, util.NopCloser{}, nil
+ds := reqctx.GetRequestDataStore(ctx)
+if ds != nil {
+gitRepo, err := RepositoryFromRequestContextOrOpen(ctx, ds, repo)
+return gitRepo, util.NopCloser{}, err
 }
-
 gitRepo, err := OpenRepository(ctx, repo)
 return gitRepo, gitRepo, err
 }
 
-// repositoryFromContextPath attempts to get the repository from the context
-func repositoryFromContextPath(ctx context.Context, path string) *git.Repository {
-value := ctx.Value(RepositoryContextKey)
-if value == nil {
-return nil
+// RepositoryFromRequestContextOrOpen opens the repository at the given relative path in the provided request context
+// The repo will be automatically closed when the request context is done
+func RepositoryFromRequestContextOrOpen(ctx context.Context, ds reqctx.RequestDataStore, repo Repository) (*git.Repository, error) {
+ck := contextKey{repoPath: repoPath(repo)}
+if gitRepo, ok := ctx.Value(ck).(*git.Repository); ok {
+return gitRepo, nil
 }
-
-if repo, ok := value.(*git.Repository); ok && repo != nil {
-if repo.Path == path {
-return repo
-}
+gitRepo, err := git.OpenRepository(ctx, ck.repoPath)
+if err != nil {
+return nil, err
 }
-
-return nil
-}
-
-// RepositoryFromContextOrOpenPath attempts to get the repository from the context or just opens it
-// Deprecated: Use RepositoryFromContextOrOpen instead
-func RepositoryFromContextOrOpenPath(ctx context.Context, path string) (*git.Repository, io.Closer, error) {
-gitRepo := repositoryFromContextPath(ctx, path)
-if gitRepo != nil {
-return gitRepo, util.NopCloser{}, nil
-}
-
-gitRepo, err := git.OpenRepository(ctx, path)
-return gitRepo, gitRepo, err
+ds.AddCloser(gitRepo)
+ds.SetContextValue(ck, gitRepo)
+return gitRepo, nil
 }

modules/gitrepo/walk_gogit.go

@@ -14,15 +14,11 @@ import (
 // WalkReferences walks all the references from the repository
 // refname is empty, ObjectTag or ObjectBranch. All other values should be treated as equivalent to empty.
 func WalkReferences(ctx context.Context, repo Repository, walkfn func(sha1, refname string) error) (int, error) {
-gitRepo := repositoryFromContext(ctx, repo)
-if gitRepo == nil {
-var err error
-gitRepo, err = OpenRepository(ctx, repo)
-if err != nil {
-return 0, err
-}
-defer gitRepo.Close()
+gitRepo, closer, err := RepositoryFromContextOrOpen(ctx, repo)
+if err != nil {
+return 0, err
 }
+defer closer.Close()
 
 i := 0
 iter, err := gitRepo.GoGitRepo().References()

modules/markup/html_commit.go

@@ -8,6 +8,7 @@ import (
 "strings"
 
 "code.gitea.io/gitea/modules/base"
+"code.gitea.io/gitea/modules/references"
 "code.gitea.io/gitea/modules/util"
 
 "golang.org/x/net/html"
@@ -194,3 +195,21 @@ func hashCurrentPatternProcessor(ctx *RenderContext, node *html.Node) {
 node = node.NextSibling.NextSibling
 }
 }
+
+func commitCrossReferencePatternProcessor(ctx *RenderContext, node *html.Node) {
+next := node.NextSibling
+
+for node != nil && node != next {
+found, ref := references.FindRenderizableCommitCrossReference(node.Data)
+if !found {
+return
+}
+
+reftext := ref.Owner + "/" + ref.Name + "@" + base.ShortSha(ref.CommitSha)
+linkHref := ctx.RenderHelper.ResolveLink(util.URLJoin(ref.Owner, ref.Name, "commit", ref.CommitSha), LinkTypeApp)
+link := createLink(ctx, linkHref, reftext, "commit")
+
+replaceContent(node, ref.RefLocation.Start, ref.RefLocation.End, link)
+node = node.NextSibling.NextSibling
+}
+}