Merge remote-tracking branch 'giteaofficial/main'

* giteaofficial/main:
  Notify the user when the file path contains leading or trailing spaces and fix the error message for invalid file names. (go-gitea#31507)
  Fix wrong status of `Set up Job` when first step is skipped (go-gitea#32120)
  Fix bug when deleting a migrated branch (go-gitea#32075)
  Include collaboration repositories on dashboard source/forks/mirrors list (go-gitea#31946)
  Display head branch more comfortable on pull request view (go-gitea#32000)
  Truncate commit message during Discord webhook push events (go-gitea#31970)
  Fix template bug of pull request view (go-gitea#32072)

models/issues/pull.go

@@ -268,6 +268,10 @@ func (pr *PullRequest) LoadAttributes(ctx context.Context) (err error) {
  return nil
 }
 
+func (pr *PullRequest) IsAgitFlow() bool {
+ return pr.Flow == PullRequestFlowAGit
+}
+
 // LoadHeadRepo loads the head repository, pr.HeadRepo will remain nil if it does not exist
 // and thus ErrRepoNotExist will never be returned
 func (pr *PullRequest) LoadHeadRepo(ctx context.Context) (err error) {

modules/actions/task_state.go

@@ -18,8 +18,32 @@ func FullSteps(task *actions_model.ActionTask) []*actions_model.ActionTaskStep {
  return fullStepsOfEmptySteps(task)
  }
 
- firstStep := task.Steps[0]
+ // firstStep is the first step that has run or running, not include preStep.
+ // For example,
+ // 1. preStep(Success) -> step1(Success) -> step2(Running) -> step3(Waiting) -> postStep(Waiting): firstStep is step1.
+ // 2. preStep(Success) -> step1(Skipped) -> step2(Success) -> postStep(Success): firstStep is step2.
+ // 3. preStep(Success) -> step1(Running) -> step2(Waiting) -> postStep(Waiting): firstStep is step1.
+ // 4. preStep(Success) -> step1(Skipped) -> step2(Skipped) -> postStep(Skipped): firstStep is nil.
+ // 5. preStep(Success) -> step1(Cancelled) -> step2(Cancelled) -> postStep(Cancelled): firstStep is nil.
+ var firstStep *actions_model.ActionTaskStep
+ // lastHasRunStep is the last step that has run.
+ // For example,
+ // 1. preStep(Success) -> step1(Success) -> step2(Running) -> step3(Waiting) -> postStep(Waiting): lastHasRunStep is step1.
+ // 2. preStep(Success) -> step1(Success) -> step2(Success) -> step3(Success) -> postStep(Success): lastHasRunStep is step3.
+ // 3. preStep(Success) -> step1(Success) -> step2(Failure) -> step3 -> postStep(Waiting): lastHasRunStep is step2.
+ // So its Stopped is the Started of postStep when there are no more steps to run.
+ var lastHasRunStep *actions_model.ActionTaskStep
+
  var logIndex int64
+ for _, step := range task.Steps {
+ if firstStep == nil && (step.Status.HasRun() || step.Status.IsRunning()) {
+ firstStep = step
+ }
+ if step.Status.HasRun() {
+ lastHasRunStep = step
+ }
+ logIndex += step.LogLength
+ }
 
  preStep := &actions_model.ActionTaskStep{
  Name: preStepName,
@@ -28,32 +52,17 @@ func FullSteps(task *actions_model.ActionTask) []*actions_model.ActionTaskStep {
  Status: actions_model.StatusRunning,
  }
 
- if firstStep.Status.HasRun() || firstStep.Status.IsRunning() {
+ // No step has run or is running, so preStep is equal to the task
+ if firstStep == nil {
+ preStep.Stopped = task.Stopped
+ preStep.Status = task.Status
+ } else {
  preStep.LogLength = firstStep.LogIndex
  preStep.Stopped = firstStep.Started
  preStep.Status = actions_model.StatusSuccess
- } else if task.Status.IsDone() {
- preStep.Stopped = task.Stopped
- preStep.Status = actions_model.StatusFailure
- if task.Status.IsSkipped() {
- preStep.Status = actions_model.StatusSkipped
- }
  }
  logIndex += preStep.LogLength
 
- // lastHasRunStep is the last step that has run.
- // For example,
- // 1. preStep(Success) -> step1(Success) -> step2(Running) -> step3(Waiting) -> postStep(Waiting): lastHasRunStep is step1.
- // 2. preStep(Success) -> step1(Success) -> step2(Success) -> step3(Success) -> postStep(Success): lastHasRunStep is step3.
- // 3. preStep(Success) -> step1(Success) -> step2(Failure) -> step3 -> postStep(Waiting): lastHasRunStep is step2.
- // So its Stopped is the Started of postStep when there are no more steps to run.
- var lastHasRunStep *actions_model.ActionTaskStep
- for _, step := range task.Steps {
- if step.Status.HasRun() {
- lastHasRunStep = step
- }
- logIndex += step.LogLength
- }
  if lastHasRunStep == nil {
  lastHasRunStep = preStep
  }

modules/actions/task_state_test.go

@@ -137,6 +137,25 @@ func TestFullSteps(t *testing.T) {
  {Name: postStepName, Status: actions_model.StatusSkipped, LogIndex: 0, LogLength: 0, Started: 0, Stopped: 0},
  },
  },
+ {
+ name: "first step is skipped",
+ task: &actions_model.ActionTask{
+ Steps: []*actions_model.ActionTaskStep{
+ {Status: actions_model.StatusSkipped, LogIndex: 0, LogLength: 0, Started: 0, Stopped: 0},
+ {Status: actions_model.StatusSuccess, LogIndex: 10, LogLength: 80, Started: 10010, Stopped: 10090},
+ },
+ Status: actions_model.StatusSuccess,
+ Started: 10000,
+ Stopped: 10100,
+ LogLength: 100,
+ },
+ want: []*actions_model.ActionTaskStep{
+ {Name: preStepName, Status: actions_model.StatusSuccess, LogIndex: 0, LogLength: 10, Started: 10000, Stopped: 10010},
+ {Status: actions_model.StatusSkipped, LogIndex: 0, LogLength: 0, Started: 0, Stopped: 0},
+ {Status: actions_model.StatusSuccess, LogIndex: 10, LogLength: 80, Started: 10010, Stopped: 10090},
+ {Name: postStepName, Status: actions_model.StatusSuccess, LogIndex: 90, LogLength: 10, Started: 10090, Stopped: 10100},
+ },
+ },
  }
  for _, tt := range tests {
  t.Run(tt.name, func(t *testing.T) {

options/locale/locale_en-US.ini

@@ -1927,6 +1927,7 @@ pulls.delete.text = Do you really want to delete this pull request? (This will p
 pulls.recently_pushed_new_branches = You pushed on branch <strong>%[1]s</strong> %[2]s
 
 pull.deleted_branch = (deleted):%s
+pull.agit_documentation = Review documentation about AGit
 
 comments.edit.already_changed = Unable to save changes to the comment. It appears the content has already been changed by another user. Please refresh the page and try editing again to avoid overwriting their changes
 

routers/web/repo/editor.go

@@ -317,7 +317,7 @@ func editFilePost(ctx *context.Context, form forms.EditRepoFileForm, isNewFile b
  case git.EntryModeBlob:
  ctx.RenderWithErr(ctx.Tr("repo.editor.directory_is_a_file", fileErr.Path), tplEditFile, &form)
  default:
- ctx.Error(http.StatusInternalServerError, err.Error())
+ ctx.RenderWithErr(ctx.Tr("repo.editor.filename_is_invalid", fileErr.Path), tplEditFile, &form)
  }
  } else {
  ctx.Error(http.StatusInternalServerError, err.Error())

routers/web/repo/pull.go

@@ -164,7 +164,19 @@ func setMergeTarget(ctx *context.Context, pull *issues_model.PullRequest) {
  ctx.Data["HeadTarget"] = pull.MustHeadUserName(ctx) + "/" + pull.HeadRepo.Name + ":" + pull.HeadBranch
  }
  ctx.Data["BaseTarget"] = pull.BaseBranch
- ctx.Data["HeadBranchLink"] = pull.GetHeadBranchLink(ctx)
+ headBranchLink := ""
+ if pull.Flow == issues_model.PullRequestFlowGithub {
+ b, err := git_model.GetBranch(ctx, ctx.Repo.Repository.ID, pull.HeadBranch)
+ switch {
+ case err == nil:
+ if !b.IsDeleted {
+ headBranchLink = pull.GetHeadBranchLink(ctx)
+ }
+ case !git_model.IsErrBranchNotExist(err):
+ log.Error("GetBranch: %v", err)
+ }
+ }
+ ctx.Data["HeadBranchLink"] = headBranchLink
  ctx.Data["BaseBranchLink"] = pull.GetBaseBranchLink(ctx)
 }
 

services/repository/branch.go

@@ -483,22 +483,23 @@ func DeleteBranch(ctx context.Context, doer *user_model.User, repo *repo_model.R
  }
 
  rawBranch, err := git_model.GetBranch(ctx, repo.ID, branchName)
- if err != nil {
+ if err != nil && !git_model.IsErrBranchNotExist(err) {
  return fmt.Errorf("GetBranch: %vc", err)
  }
 
- if rawBranch.IsDeleted {
- return nil
- }
+ // database branch record not exist or it's a deleted branch
+ notExist := git_model.IsErrBranchNotExist(err) || rawBranch.IsDeleted
 
  commit, err := gitRepo.GetBranchCommit(branchName)
  if err != nil {
  return err
  }
 
  if err := db.WithTx(ctx, func(ctx context.Context) error {
- if err := git_model.AddDeletedBranch(ctx, repo.ID, branchName, doer.ID); err != nil {
- return err
+ if !notExist {
+ if err := git_model.AddDeletedBranch(ctx, repo.ID, branchName, doer.ID); err != nil {
+ return err
+ }
  }
 
  return gitRepo.DeleteBranch(branchName, git.DeleteBranchOptions{

services/webhook/discord.go

@@ -11,6 +11,7 @@ import (
  "net/url"
  "strconv"
  "strings"
+ "unicode/utf8"
 
  webhook_model "code.gitea.io/gitea/models/webhook"
  "code.gitea.io/gitea/modules/git"
@@ -154,8 +155,14 @@ func (d discordConvertor) Push(p *api.PushPayload) (DiscordPayload, error) {
  var text string
  // for each commit, generate attachment text
  for i, commit := range p.Commits {
- text += fmt.Sprintf("[%s](%s) %s - %s", commit.ID[:7], commit.URL,
- strings.TrimRight(commit.Message, "\r\n"), commit.Author.Name)
+ // limit the commit message display to just the summary, otherwise it would be hard to read
+ message := strings.TrimRight(strings.SplitN(commit.Message, "\n", 1)[0], "\r")
+
+ // a limit of 50 is set because GitHub does the same
+ if utf8.RuneCountInString(message) > 50 {
+ message = fmt.Sprintf("%.47s...", message)
+ }
+ text += fmt.Sprintf("[%s](%s) %s - %s", commit.ID[:7], commit.URL, message, commit.Author.Name)
  // add linebreak to each commit but the last
  if i < len(p.Commits)-1 {
  text += "\n"

services/webhook/discord_test.go

@@ -80,6 +80,20 @@ func TestDiscordPayload(t *testing.T) {
  assert.Equal(t, p.Sender.AvatarURL, pl.Embeds[0].Author.IconURL)
  })
 
+ t.Run("PushWithLongCommitMessage", func(t *testing.T) {
+ p := pushTestMultilineCommitMessagePayload()
+
+ pl, err := dc.Push(p)
+ require.NoError(t, err)
+
+ assert.Len(t, pl.Embeds, 1)
+ assert.Equal(t, "[test/repo:test] 2 new commits", pl.Embeds[0].Title)
+ assert.Equal(t, "[2020558](http://localhost:3000/test/repo/commit/2020558fe2e34debb818a514715839cabd25e778) This is a commit summary ⚠️⚠️⚠️⚠️ containing 你好... - user1\n[2020558](http://localhost:3000/test/repo/commit/2020558fe2e34debb818a514715839cabd25e778) This is a commit summary ⚠️⚠️⚠️⚠️ containing 你好... - user1", pl.Embeds[0].Description)
+ assert.Equal(t, p.Sender.UserName, pl.Embeds[0].Author.Name)
+ assert.Equal(t, setting.AppURL+p.Sender.UserName, pl.Embeds[0].Author.URL)
+ assert.Equal(t, p.Sender.AvatarURL, pl.Embeds[0].Author.IconURL)
+ })
+
  t.Run("Issue", func(t *testing.T) {
  p := issueTestPayload()
 

services/webhook/general_test.go

@@ -64,9 +64,17 @@ func forkTestPayload() *api.ForkPayload {
 }
 
 func pushTestPayload() *api.PushPayload {
+ return pushTestPayloadWithCommitMessage("commit message")
+}
+
+func pushTestMultilineCommitMessagePayload() *api.PushPayload {
+ return pushTestPayloadWithCommitMessage("This is a commit summary ⚠️⚠️⚠️⚠️ containing 你好 ⚠️⚠️️\n\nThis is the message body.")
+}
+
+func pushTestPayloadWithCommitMessage(message string) *api.PushPayload {
  commit := &api.PayloadCommit{
  ID: "2020558fe2e34debb818a514715839cabd25e778",
- Message: "commit message",
+ Message: message,
  URL: "http://localhost:3000/test/repo/commit/2020558fe2e34debb818a514715839cabd25e778",
  Author: &api.PayloadUser{
  Name: "user1",

templates/repo/issue/view_content/sidebar.tmpl

@@ -109,7 +109,7 @@
  </a>
  </div>
  <div class="tw-flex tw-items-center tw-gap-2">
- <span {{if .Review.TooltipContent}}data-tooltip-content="{{ctx.Locale.Tr .Review.TooltipContent}}"{{end}}>
+ <span {{if .TooltipContent}}data-tooltip-content="{{ctx.Locale.Tr .TooltipContent}}"{{end}}>
  {{svg (printf "octicon-%s" .Type.Icon) 16 (printf "text %s" (.HTMLTypeColorName))}}
  </span>
  </div>

templates/repo/issue/view_title.tmpl

@@ -50,9 +50,14 @@
  {{if .Issue.IsPull}}
  {{$headHref := .HeadTarget}}
  {{if .HeadBranchLink}}
- {{$headHref = HTMLFormat `<a href="%s">%s</a>` .HeadBranchLink $headHref}}
+ {{$headHref = HTMLFormat `<a href="%s">%s</a> <button class="btn interact-fg" data-tooltip-content="%s" data-clipboard-text="%s">%s</button>` .HeadBranchLink $headHref (ctx.Locale.Tr "copy_branch") .HeadTarget (svg "octicon-copy" 14)}}
+ {{else}}
+ {{if .Issue.PullRequest.IsAgitFlow}}
+ {{$headHref = HTMLFormat `%s <a href="%s" target="_blank"><span class="ui label basic tiny" data-tooltip-content="%s">AGit</span></a>` $headHref "https://docs.gitea.com/usage/agit" (ctx.Locale.Tr "repo.pull.agit_documentation")}}
+ {{else}}
+ {{$headHref = HTMLFormat `<span data-tooltip-content="%s">%s</span>` (ctx.Locale.Tr "form.target_branch_not_exist") $headHref}}
+ {{end}}
  {{end}}
- {{$headHref = HTMLFormat `%s <button class="btn interact-fg" data-tooltip-content="%s" data-clipboard-text="%s">%s</button>` $headHref (ctx.Locale.Tr "copy_branch") .HeadTarget (svg "octicon-copy" 14)}}
  {{$baseHref := .BaseTarget}}
  {{if .BaseBranchLink}}
  {{$baseHref = HTMLFormat `<a href="%s">%s</a>` .BaseBranchLink $baseHref}}

web_src/js/components/DashboardRepoList.vue

@@ -78,7 +78,6 @@ const sfc = {
  searchURL() {
  return `${this.subUrl}/repo/search?sort=updated&order=desc&uid=${this.uid}&team_id=${this.teamId}&q=${this.searchQuery
  }&page=${this.page}&limit=${this.searchLimit}&mode=${this.repoTypes[this.reposFilter].searchMode
- }${this.reposFilter !== 'all' ? '&exclusive=1' : ''
  }${this.archivedFilter === 'archived' ? '&archived=true' : ''}${this.archivedFilter === 'unarchived' ? '&archived=false' : ''
  }${this.privateFilter === 'private' ? '&is_private=true' : ''}${this.privateFilter === 'public' ? '&is_private=false' : ''
  }`;

web_src/js/features/repo-editor.ts

@@ -75,23 +75,62 @@ export function initRepoEditor() {
  }
  filenameInput.addEventListener('input', function () {
  const parts = filenameInput.value.split('/');
+ const links = Array.from(document.querySelectorAll('.breadcrumb span.section'));
+ const dividers = Array.from(document.querySelectorAll('.breadcrumb .breadcrumb-divider'));
+ let warningDiv = document.querySelector('.ui.warning.message.flash-message.flash-warning.space-related');
+ let containSpace = false;
  if (parts.length > 1) {
  for (let i = 0; i < parts.length; ++i) {
  const value = parts[i];
+ const trimValue = value.trim();
+ if (trimValue === '..') {
+ // remove previous tree path
+ if (links.length > 0) {
+ const link = links.pop();
+ const divider = dividers.pop();
+ link.remove();
+ divider.remove();
+ }
+ continue;
+ }
  if (i < parts.length - 1) {
- if (value.length) {
- filenameInput.before(createElementFromHTML(
+ if (trimValue.length) {
+ const linkElement = createElementFromHTML(
  `<span class="section"><a href="#">${htmlEscape(value)}</a></span>`,
- ));
- filenameInput.before(createElementFromHTML(
+ );
+ const dividerElement = createElementFromHTML(
  `<div class="breadcrumb-divider">/</div>`,
- ));
+ );
+ links.push(linkElement);
+ dividers.push(dividerElement);
+ filenameInput.before(linkElement);
+ filenameInput.before(dividerElement);
  }
  } else {
  filenameInput.value = value;
  }
  this.setSelectionRange(0, 0);
+ containSpace |= (trimValue !== value && trimValue !== '');
+ }
+ }
+ containSpace |= Array.from(links).some((link) => {
+ const value = link.querySelector('a').textContent;
+ return value.trim() !== value;
+ });
+ containSpace |= parts[parts.length - 1].trim() !== parts[parts.length - 1];
+ if (containSpace) {
+ if (!warningDiv) {
+ warningDiv = document.createElement('div');
+ warningDiv.classList.add('ui', 'warning', 'message', 'flash-message', 'flash-warning', 'space-related');
+ warningDiv.innerHTML = '<p>File path contains leading or trailing whitespace.</p>';
+ // Add display 'block' because display is set to 'none' in formantic\build\semantic.css
+ warningDiv.style.display = 'block';
+ const inputContainer = document.querySelector('.repo-editor-header');
+ inputContainer.insertAdjacentElement('beforebegin', warningDiv);
  }
+ showElem(warningDiv);
+ } else if (warningDiv) {
+ hideElem(warningDiv);
  }
  joinTreePath();
  });