Merge branch 'main' into feat/add-searchbar-in-workflow-dropdown

Author: GiteaBot

models/actions/run.go

@@ -8,7 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
-	"strings"
+	"strconv"
 	"time"
 
 	"gitea.dev/models/db"
@@ -123,7 +123,9 @@ func (run *ActionRun) RefLink() string {
 func (run *ActionRun) PrettyRef() string {
 	refName := git.RefName(run.Ref)
 	if refName.IsPull() {
-		return "#" + strings.TrimSuffix(strings.TrimPrefix(run.Ref, git.PullPrefix), "/head")
+		if pullIndex, ok := refName.PullIndex(); ok {
+			return "#" + strconv.FormatInt(pullIndex, 10)
+		}
 	}
 	return refName.ShortName()
 }

models/issues/pull.go

@@ -415,7 +415,7 @@ func (pr *PullRequest) getReviewedByLines(ctx context.Context, writer io.Writer)
 
 // GetGitHeadRefName returns git ref for hidden pull request branch
 func (pr *PullRequest) GetGitHeadRefName() string { // TODO: make it return RefName but not string
-	return fmt.Sprintf("%s%d/head", git.PullPrefix, pr.Index)
+	return git.RefNameFromPullIndex(pr.Index).String()
 }
 
 // GetReviewCommentsCount returns the number of review comments made on the diff of a PR review (not including comments on commits or issues in a PR)

models/pull/automerge.go

@@ -80,6 +80,12 @@ func GetScheduledMergeByPullID(ctx context.Context, pullID int64) (bool, *AutoMe
 	return true, scheduledPRM, err
 }
 
+func GetScheduledMergePullIDsSince(ctx context.Context, since timeutil.TimeStamp) ([]int64, error) {
+	var pullIDs []int64
+	err := db.GetEngine(ctx).Table(&AutoMerge{}).Where("created_unix >= ?", since).Cols("pull_id").Find(&pullIDs)
+	return pullIDs, err
+}
+
 // DeleteScheduledAutoMerge delete a scheduled pull request
 func DeleteScheduledAutoMerge(ctx context.Context, pullID int64) error {
 	exist, scheduledPRM, err := GetScheduledMergeByPullID(ctx, pullID)

modules/git/ref.go

@@ -6,6 +6,7 @@ package git
 import (
 	"context"
 	"regexp"
+	"strconv"
 	"strings"
 
 	"gitea.dev/modules/git/gitcmd"
@@ -18,6 +19,7 @@ const (
 	RemotePrefix = "refs/remotes/"
 	// PullPrefix is the base directory of the pull information of git.
 	PullPrefix = "refs/pull/"
+	pullSuffix = "/head"
 )
 
 // refNamePatternInvalid is regular expression with unallowed characters in git reference name
@@ -93,6 +95,10 @@ func RefNameFromCommit(shortName string) RefName {
 	return RefName(shortName)
 }
 
+func RefNameFromPullIndex(prIndex int64) RefName {
+	return RefName(PullPrefix + strconv.FormatInt(prIndex, 10) + pullSuffix)
+}
+
 func (ref RefName) String() string {
 	return string(ref)
 }
@@ -134,14 +140,21 @@ func (ref RefName) BranchName() string {
 	return ref.nameWithoutPrefix(BranchPrefix)
 }
 
-// PullName returns the pull request name part of refs like refs/pull/<pull_name>/head
-func (ref RefName) PullName() string {
+func (ref RefName) PullIndex() (int64, bool) {
 	refName := string(ref)
-	lastIdx := strings.LastIndexByte(refName[len(PullPrefix):], '/')
-	if strings.HasPrefix(refName, PullPrefix) && lastIdx > -1 {
-		return refName[len(PullPrefix) : lastIdx+len(PullPrefix)]
+	s, ok := strings.CutPrefix(refName, PullPrefix)
+	if !ok {
+		return 0, false
 	}
-	return ""
+	pullStr, last, ok := strings.CutLast(s, "/")
+	if !ok || last != "head" {
+		return 0, false
+	}
+	pullIndex, err := strconv.ParseInt(pullStr, 10, 64)
+	if err != nil {
+		return 0, false
+	}
+	return pullIndex, true
 }
 
 // ForBranchName returns the branch name part of refs like refs/for/<branch_name>
@@ -165,7 +178,7 @@ func (ref RefName) ShortName() string {
 		return ref.RemoteName()
 	}
 	if ref.IsPull() {
-		return ref.PullName()
+		return strings.TrimSuffix(ref.nameWithoutPrefix(PullPrefix), pullSuffix)
 	}
 	if ref.IsFor() {
 		return ref.ForBranchName()

modules/git/ref_test.go

@@ -19,10 +19,12 @@ func TestRefName(t *testing.T) {
 	assert.Equal(t, "release/foo", RefName("refs/tags/release/foo").TagName())
 
 	// Test pull names
-	assert.Equal(t, "1", RefName("refs/pull/1/head").PullName())
+	pullIndex, ok := RefName("refs/pull/1/head").PullIndex()
+	assert.True(t, ok)
+	assert.EqualValues(t, 1, pullIndex)
 	assert.True(t, RefName("refs/pull/1/head").IsPull())
 	assert.True(t, RefName("refs/pull/1/merge").IsPull())
-	assert.Equal(t, "my/pull", RefName("refs/pull/my/pull/head").PullName())
+	assert.Equal(t, "my/pull", RefName("refs/pull/my/pull/head").ShortName())
 
 	// Test for branch names
 	assert.Equal(t, "main", RefName("refs/for/main").ForBranchName())

routers/init.go

@@ -152,7 +152,7 @@ func InitWebInstalled(ctx context.Context) {
 	mirror_service.InitSyncMirrors()
 	mustInit(webhook.Init)
 	mustInit(pull_service.Init)
-	mustInit(automerge.Init)
+	mustInitCtx(ctx, automerge.Init)
 	mustInit(task.Init)
 	mustInit(repo_migrations.Init)
 	mustInit(websocket_service.Init)