Merge branch 'main' into fix-push-tag-err

Author: wxiaoguang

modules/gitrepo/gitrepo.go

@@ -69,3 +69,8 @@ func RepositoryFromRequestContextOrOpen(ctx reqctx.RequestContext, repo Reposito
 	ctx.SetContextValue(ck, gitRepo)
 	return gitRepo, nil
 }
+
+// IsRepositoryExist returns true if the repository directory exists in the disk
+func IsRepositoryExist(ctx context.Context, repo Repository) (bool, error) {
+	return util.IsExist(repoPath(repo))
+}

modules/markup/markdown/markdown.go

@@ -159,27 +159,27 @@ func render(ctx *markup.RenderContext, input io.Reader, output io.Writer) error
 		limit: setting.UI.MaxDisplayFileSize * 3,
 	}
 
+	// FIXME: Don't read all to memory, but goldmark doesn't support
+	buf, err := io.ReadAll(input)
+	if err != nil {
+		log.Error("Unable to ReadAll: %v", err)
+		return err
+	}
+	buf = giteautil.NormalizeEOL(buf)
+
 	// FIXME: should we include a timeout to abort the renderer if it takes too long?
 	defer func() {
 		err := recover()
 		if err == nil {
 			return
 		}
 
-		log.Warn("Unable to render markdown due to panic in goldmark: %v", err)
-		if (!setting.IsProd && !setting.IsInTesting) || log.IsDebug() {
-			log.Error("Panic in markdown: %v\n%s", err, log.Stack(2))
-		}
+		log.Error("Panic in markdown: %v\n%s", err, log.Stack(2))
+		escapedHTML := template.HTMLEscapeString(giteautil.UnsafeBytesToString(buf))
+		_, _ = output.Write(giteautil.UnsafeStringToBytes(escapedHTML))
 	}()
 
-	// FIXME: Don't read all to memory, but goldmark doesn't support
 	pc := newParserContext(ctx)
-	buf, err := io.ReadAll(input)
-	if err != nil {
-		log.Error("Unable to ReadAll: %v", err)
-		return err
-	}
-	buf = giteautil.NormalizeEOL(buf)
 
 	// Preserve original length.
 	bufWithMetadataLength := len(buf)

modules/markup/markdown/markdown_attention_test.go

@@ -23,6 +23,11 @@ func TestAttention(t *testing.T) {
 	defer svg.MockIcon("octicon-alert")()
 	defer svg.MockIcon("octicon-stop")()
 
+	test := func(input, expected string) {
+		result, err := markdown.RenderString(markup.NewTestRenderContext(), input)
+		assert.NoError(t, err)
+		assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(string(result)))
+	}
 	renderAttention := func(attention, icon string) string {
 		tmpl := `<blockquote class="attention-header attention-{attention}"><p><svg class="attention-icon attention-{attention} svg {icon}" width="16" height="16"></svg><strong class="attention-{attention}">{Attention}</strong></p>`
 		tmpl = strings.ReplaceAll(tmpl, "{attention}", attention)
@@ -31,12 +36,6 @@ func TestAttention(t *testing.T) {
 		return tmpl
 	}
 
-	test := func(input, expected string) {
-		result, err := markdown.RenderString(markup.NewTestRenderContext(), input)
-		assert.NoError(t, err)
-		assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(string(result)))
-	}
-
 	test(`
 > [!NOTE]
 > text
@@ -53,4 +52,7 @@ func TestAttention(t *testing.T) {
 
 	// legacy GitHub style
 	test(`> **warning**`, renderAttention("warning", "octicon-alert")+"\n</blockquote>")
+
+	// edge case (it used to cause panic)
+	test(">\ntext", "<blockquote>\n</blockquote>\n<p>text</p>")
 }

modules/markup/markdown/transform_blockquote.go

@@ -115,6 +115,9 @@ func (g *ASTTransformer) transformBlockquote(v *ast.Blockquote, reader text.Read
 
 	// grab these nodes and make sure we adhere to the attention blockquote structure
 	firstParagraph := v.FirstChild()
+	if firstParagraph == nil {
+		return ast.WalkContinue, nil
+	}
 	g.applyElementDir(firstParagraph)
 
 	attentionType, processedNodes := g.extractBlockquoteAttentionEmphasis(firstParagraph, reader)

modules/markup/renderer_test.go

@@ -13,36 +13,34 @@ var _ Downloader = &RetryDownloader{}
 // RetryDownloader retry the downloads
 type RetryDownloader struct {
 	Downloader
-	ctx        context.Context
 	RetryTimes int // the total execute times
 	RetryDelay int // time to delay seconds
 }
 
 // NewRetryDownloader creates a retry downloader
-func NewRetryDownloader(ctx context.Context, downloader Downloader, retryTimes, retryDelay int) *RetryDownloader {
+func NewRetryDownloader(downloader Downloader, retryTimes, retryDelay int) *RetryDownloader {
 	return &RetryDownloader{
 		Downloader: downloader,
-		ctx:        ctx,
 		RetryTimes: retryTimes,
 		RetryDelay: retryDelay,
 	}
 }
 
-func (d *RetryDownloader) retry(work func() error) error {
+func (d *RetryDownloader) retry(ctx context.Context, work func(context.Context) error) error {
 	var (
 		times = d.RetryTimes
 		err   error
 	)
 	for ; times > 0; times-- {
-		if err = work(); err == nil {
+		if err = work(ctx); err == nil {
 			return nil
 		}
 		if IsErrNotSupported(err) {
 			return err
 		}
 		select {
-		case <-d.ctx.Done():
-			return d.ctx.Err()
+		case <-ctx.Done():
+			return ctx.Err()
 		case <-time.After(time.Second * time.Duration(d.RetryDelay)):
 		}
 	}
@@ -56,7 +54,7 @@ func (d *RetryDownloader) GetRepoInfo(ctx context.Context) (*Repository, error)
 		err  error
 	)
 
-	err = d.retry(func() error {
+	err = d.retry(ctx, func(ctx context.Context) error {
 		repo, err = d.Downloader.GetRepoInfo(ctx)
 		return err
 	})
@@ -71,7 +69,7 @@ func (d *RetryDownloader) GetTopics(ctx context.Context) ([]string, error) {
 		err    error
 	)
 
-	err = d.retry(func() error {
+	err = d.retry(ctx, func(ctx context.Context) error {
 		topics, err = d.Downloader.GetTopics(ctx)
 		return err
 	})
@@ -86,7 +84,7 @@ func (d *RetryDownloader) GetMilestones(ctx context.Context) ([]*Milestone, erro
 		err        error
 	)
 
-	err = d.retry(func() error {
+	err = d.retry(ctx, func(ctx context.Context) error {
 		milestones, err = d.Downloader.GetMilestones(ctx)
 		return err
 	})
@@ -101,7 +99,7 @@ func (d *RetryDownloader) GetReleases(ctx context.Context) ([]*Release, error) {
 		err      error
 	)
 
-	err = d.retry(func() error {
+	err = d.retry(ctx, func(ctx context.Context) error {
 		releases, err = d.Downloader.GetReleases(ctx)
 		return err
 	})
@@ -116,7 +114,7 @@ func (d *RetryDownloader) GetLabels(ctx context.Context) ([]*Label, error) {
 		err    error
 	)
 
-	err = d.retry(func() error {
+	err = d.retry(ctx, func(ctx context.Context) error {
 		labels, err = d.Downloader.GetLabels(ctx)
 		return err
 	})
@@ -132,7 +130,7 @@ func (d *RetryDownloader) GetIssues(ctx context.Context, page, perPage int) ([]*
 		err    error
 	)
 
-	err = d.retry(func() error {
+	err = d.retry(ctx, func(ctx context.Context) error {
 		issues, isEnd, err = d.Downloader.GetIssues(ctx, page, perPage)
 		return err
 	})
@@ -148,7 +146,7 @@ func (d *RetryDownloader) GetComments(ctx context.Context, commentable Commentab
 		err      error
 	)
 
-	err = d.retry(func() error {
+	err = d.retry(ctx, func(context.Context) error {
 		comments, isEnd, err = d.Downloader.GetComments(ctx, commentable)
 		return err
 	})
@@ -164,7 +162,7 @@ func (d *RetryDownloader) GetPullRequests(ctx context.Context, page, perPage int
 		isEnd bool
 	)
 
-	err = d.retry(func() error {
+	err = d.retry(ctx, func(ctx context.Context) error {
 		prs, isEnd, err = d.Downloader.GetPullRequests(ctx, page, perPage)
 		return err
 	})
@@ -178,7 +176,7 @@ func (d *RetryDownloader) GetReviews(ctx context.Context, reviewable Reviewable)
 		reviews []*Review
 		err     error
 	)
-	err = d.retry(func() error {
+	err = d.retry(ctx, func(ctx context.Context) error {
 		reviews, err = d.Downloader.GetReviews(ctx, reviewable)
 		return err
 	})

modules/migration/retry_downloader.go

@@ -13,6 +13,7 @@ import (
 	issues_model "code.gitea.io/gitea/models/issues"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/label"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/options"
@@ -120,25 +121,24 @@ func LoadRepoConfig() error {
 	return nil
 }
 
-func CheckInitRepository(ctx context.Context, owner, name, objectFormatName string) (err error) {
+func CheckInitRepository(ctx context.Context, repo *repo_model.Repository) (err error) {
 	// Somehow the directory could exist.
-	repoPath := repo_model.RepoPath(owner, name)
-	isExist, err := util.IsExist(repoPath)
+	isExist, err := gitrepo.IsRepositoryExist(ctx, repo)
 	if err != nil {
-		log.Error("Unable to check if %s exists. Error: %v", repoPath, err)
+		log.Error("Unable to check if %s exists. Error: %v", repo.FullName(), err)
 		return err
 	}
 	if isExist {
 		return repo_model.ErrRepoFilesAlreadyExist{
-			Uname: owner,
-			Name:  name,
+			Uname: repo.OwnerName,
+			Name:  repo.Name,
 		}
 	}
 
 	// Init git bare new repository.
-	if err = git.InitRepository(ctx, repoPath, true, objectFormatName); err != nil {
+	if err = git.InitRepository(ctx, repo.RepoPath(), true, repo.ObjectFormatName); err != nil {
 		return fmt.Errorf("git.InitRepository: %w", err)
-	} else if err = CreateDelegateHooks(repoPath); err != nil {
+	} else if err = CreateDelegateHooks(repo.RepoPath()); err != nil {
 		return fmt.Errorf("createDelegateHooks: %w", err)
 	}
 	return nil

modules/repository/init.go

@@ -1407,6 +1407,7 @@ commits.signed_by_untrusted_user_unmatched = Signed by untrusted user who does n
 commits.gpg_key_id = GPG Key ID
 commits.ssh_key_fingerprint = SSH Key Fingerprint
 commits.view_path=View at this point in history
+commits.view_file_diff = View changes to this file in this commit
 
 commit.operations = Operations
 commit.revert = Revert

options/locale/locale_en-US.ini

@@ -1463,6 +1463,8 @@ issues.filter_milestones=Filtrer le jalon
 issues.filter_projects=Filtrer par projet
 issues.filter_labels=Filtrer par labels
 issues.filter_reviewers=Filtrer par évaluateur
+issues.filter_no_results=Aucun résultat
+issues.filter_no_results_placeholder=Essayez d’ajuster vos filtres de recherche.
 issues.new=Nouveau ticket
 issues.new.title_empty=Le titre ne peut pas être vide
 issues.new.labels=Labels
@@ -1935,6 +1937,7 @@ pulls.outdated_with_base_branch=Cette branche est désynchronisée avec la branc
 pulls.close=Fermer la demande d’ajout
 pulls.closed_at=`a fermé cette demande d'ajout <a id="%[1]s" href="#%[1]s">%[2]s</a>.`
 pulls.reopened_at=`a rouvert cette demande d'ajout <a id="%[1]s" href="#%[1]s">%[2]s</a>.`
+pulls.cmd_instruction_hint=Voir les instructions en ligne de commande
 pulls.cmd_instruction_checkout_title=Basculer
 pulls.cmd_instruction_checkout_desc=Depuis votre dépôt, basculer sur une nouvelle branche et tester des modifications.
 pulls.cmd_instruction_merge_title=Fusionner
@@ -2376,6 +2379,9 @@ settings.event_pull_request_review_request=Demande d’évaluation
 settings.event_pull_request_review_request_desc=Création ou suppresion de demandes d’évaluation.
 settings.event_pull_request_approvals=Approbations de demande d'ajout
 settings.event_pull_request_merge=Fusion de demande d'ajout
+settings.event_header_workflow=Événements du flux de travail
+settings.event_workflow_job=Tâches du flux de travail
+settings.event_workflow_job_desc=Tâche du flux de travail Gitea Actions en file d’attente, en attente, en cours ou terminée.
 settings.event_package=Paquet
 settings.event_package_desc=Paquet créé ou supprimé.
 settings.branch_filter=Filtre de branche
@@ -2454,7 +2460,7 @@ settings.protect_whitelist_teams=Équipes autorisées à pousser :
 settings.protect_force_push_allowlist_users=Utilisateurs autorisés à pousser en force :
 settings.protect_force_push_allowlist_teams=Équipes autorisées à pousser en force :
 settings.protect_force_push_allowlist_deploy_keys=Clés de déploiement pouvant pousser autorisées à pousser en force.
-settings.protect_merge_whitelist_committers=Activer la liste d’autorisés pour la fusion
+settings.protect_merge_whitelist_committers=Fusion sur autorisation uniquement
 settings.protect_merge_whitelist_committers_desc=N’autoriser que les utilisateurs et les équipes listés à appliquer les demandes de fusion sur cette branche.
 settings.protect_merge_whitelist_users=Utilisateurs autorisés à fusionner :
 settings.protect_merge_whitelist_teams=Équipes autorisées à fusionner :
@@ -2468,7 +2474,7 @@ settings.protect_invalid_status_check_pattern=Motif de vérification des statuts
 settings.protect_no_valid_status_check_patterns=Aucun motif de vérification des statuts valide.
 settings.protect_required_approvals=Minimum d'approbations requis :
 settings.protect_required_approvals_desc=Permet de fusionner les demandes d’ajout lorsque suffisamment d’évaluation sont positives.
-settings.protect_approvals_whitelist_enabled=Restreindre les approbations aux utilisateurs ou aux équipes sur liste d’autorisés
+settings.protect_approvals_whitelist_enabled=Restreindre les approbations sur autorisation uniquement
 settings.protect_approvals_whitelist_enabled_desc=Seuls les évaluations des utilisateurs ou des équipes suivantes compteront dans les approbations requises. Si laissé vide, les évaluations de toute personne ayant un accès en écriture seront comptabilisées à la place.
 settings.protect_approvals_whitelist_users=Évaluateurs autorisés :
 settings.protect_approvals_whitelist_teams=Équipes d’évaluateurs autorisés :

options/locale/locale_fr-FR.ini

@@ -2379,6 +2379,9 @@ settings.event_pull_request_review_request=Iarratas ar Athbhreithniú Tarraingth
 settings.event_pull_request_review_request_desc=Tarraing athbhreithniú iarratais iarrtha nó baineadh iarratas athbhreithnithe.
 settings.event_pull_request_approvals=Ceaduithe Iarratais Tarraing
 settings.event_pull_request_merge=Cumaisc Iarratas Tarraing
+settings.event_header_workflow=Imeachtaí Sreabhadh Oibre
+settings.event_workflow_job=Poist Sreabhadh Oibre
+settings.event_workflow_job_desc=Gitea Actions Sreabhadh oibre post ciúáilte, ag fanacht, ar siúl, nó críochnaithe.
 settings.event_package=Pacáiste
 settings.event_package_desc=Pacáiste a cruthaíodh nó a scriosadh i stóras.
 settings.branch_filter=Scagaire brainse