Fix wrong display of recently pushed notification

models/git/branch.go

@@ -102,8 +102,9 @@ func (err ErrBranchesEqual) Unwrap() error {
 // for pagination, keyword search and filtering
 type Branch struct {
 	ID            int64
-	RepoID        int64  `xorm:"UNIQUE(s)"`
-	Name          string `xorm:"UNIQUE(s) NOT NULL"` // git's ref-name is case-sensitive internally, however, in some databases (mssql, mysql, by default), it's case-insensitive at the moment
+	RepoID        int64                  `xorm:"UNIQUE(s)"`
+	Repo          *repo_model.Repository `xorm:"-"`
+	Name          string                 `xorm:"UNIQUE(s) NOT NULL"` // git's ref-name is case-sensitive internally, however, in some databases (mssql, mysql, by default), it's case-insensitive at the moment
 	CommitID      string
 	CommitMessage string `xorm:"TEXT"` // it only stores the message summary (the first line)
 	PusherID      int64
@@ -139,6 +140,16 @@ func (b *Branch) LoadPusher(ctx context.Context) (err error) {
 	return err
 }
 
+func (b *Branch) LoadRepo(ctx context.Context) (err error) {
+	if b.Repo == nil && b.RepoID > 0 {
+		b.Repo, err = repo_model.GetRepositoryByID(ctx, b.RepoID)
+		if repo_model.IsErrRepoNotExist(err) {
+			err = nil
+		}
+	}
+	return err
+}
+
 func init() {
 	db.RegisterModel(new(Branch))
 	db.RegisterModel(new(RenamedBranch))
@@ -382,22 +393,38 @@ func RenameBranch(ctx context.Context, repo *repo_model.Repository, from, to str
 }
 
 // FindRecentlyPushedNewBranches return at most 2 new branches pushed by the user in 6 hours which has no opened PRs created
-// except the indicate branch
-func FindRecentlyPushedNewBranches(ctx context.Context, repoID, userID int64, excludeBranchName string) (BranchList, error) {
+// doer should not be nil
+// TODO use options to find the branches
+func FindRecentlyPushedNewBranches(ctx context.Context, baseRepo *repo_model.Repository, doer *user_model.User) (BranchList, error) {
 	branches := make(BranchList, 0, 2)
-	subQuery := builder.Select("head_branch").From("pull_request").
+	baseBranch, err := GetBranch(ctx, baseRepo.ID, baseRepo.DefaultBranch)
+	if err != nil {
+		return nil, err
+	}
+	// search all related repos
+	repoCond := builder.Select("id").From("repository").
+		Where(builder.Or(
+			builder.Eq{"id": baseRepo.ID},
+			builder.Eq{"is_fork": true, "fork_id": baseRepo.ID},
+		))
+	// avoid check branches which have already created PRs
+	// TODO add head_branch_id in pull_request table then we can get the branch id from pull_request table directly
+	invalidBranchCond := builder.Select("branch.id").From("branch").
+		InnerJoin("pull_request", "branch.name = pull_request.head_branch AND branch.repo_id = pull_request.head_repo_id").
 		InnerJoin("issue", "issue.id = pull_request.issue_id").
-		Where(builder.Eq{
-			"pull_request.head_repo_id": repoID,
-			"issue.is_closed":           false,
-		})
-	err := db.GetEngine(ctx).
-		Where("pusher_id=? AND is_deleted=?", userID, false).
-		And("name <> ?", excludeBranchName).
-		And("updated_unix >= ?", time.Now().Add(-time.Hour*6).Unix()).
-		NotIn("name", subQuery).
-		OrderBy("branch.updated_unix DESC").
-		Limit(2).
-		Find(&branches)
+		Where(builder.Or(
+			builder.Eq{"pull_request.has_merged": true},
+			builder.In("pull_request.head_repo_id", repoCond),
+			builder.Eq{"branch.id": baseBranch.ID},
+		))
+	cond := builder.And(
+		builder.Neq{"commit_id": baseBranch.CommitID}, // newly created branch have no changes, so skip them
+		builder.Eq{"pusher_id": doer.ID},
+		builder.Eq{"is_deleted": false},
+		builder.Gte{"updated_unix": time.Now().Add(-time.Hour * 6).Unix()},
+		builder.In("repo_id", repoCond),
+		builder.NotIn("id", invalidBranchCond),
+	)
+	err = db.GetEngine(ctx).Where(cond).OrderBy("branch.updated_unix DESC").Limit(2).Find(&branches)
 	return branches, err
 }

models/git/branch_list.go

@@ -7,6 +7,7 @@ import (
 	"context"
 
 	"code.gitea.io/gitea/models/db"
+	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/container"
 	"code.gitea.io/gitea/modules/util"
@@ -64,6 +65,26 @@ func (branches BranchList) LoadPusher(ctx context.Context) error {
 	return nil
 }
 
+func (branches BranchList) LoadRepo(ctx context.Context) error {
+	ids := container.Set[int64]{}
+	for _, branch := range branches {
+		if branch.RepoID > 0 {
+			ids.Add(branch.RepoID)
+		}
+	}
+	reposMap := make(map[int64]*repo_model.Repository, len(ids))
+	if err := db.GetEngine(ctx).In("id", ids.Values()).Find(&reposMap); err != nil {
+		return err
+	}
+	for _, branch := range branches {
+		if branch.RepoID <= 0 {
+			continue
+		}
+		branch.Repo = reposMap[branch.RepoID]
+	}
+	return nil
+}
+
 type FindBranchOptions struct {
 	db.ListOptions
 	RepoID             int64

routers/web/repo/view.go

@@ -982,11 +982,21 @@ func renderCode(ctx *context.Context) {
 			ctx.ServerError("GetBaseRepo", err)
 			return
 		}
-		ctx.Data["RecentlyPushedNewBranches"], err = git_model.FindRecentlyPushedNewBranches(ctx, ctx.Repo.Repository.ID, ctx.Doer.ID, ctx.Repo.Repository.DefaultBranch)
+
+		baseRepo := ctx.Repo.Repository
+		if ctx.Repo.Repository.IsFork {
+			baseRepo = ctx.Repo.Repository.BaseRepo
+		}
+		branches, err := git_model.FindRecentlyPushedNewBranches(ctx, baseRepo, ctx.Doer)
 		if err != nil {
-			ctx.ServerError("GetRecentlyPushedBranches", err)
+			ctx.ServerError("FindRecentlyPushedNewBranches", err)
+			return
+		}
+		if err := branches.LoadRepo(ctx); err != nil {
+			ctx.ServerError("branches.LoadRepo", err)
 			return
 		}
+		ctx.Data["RecentlyPushedNewBranches"] = branches
 	}
 
 	var treeNames []string

templates/repo/code/recently_pushed_new_branches.tmpl

@@ -1,10 +1,22 @@
 {{range .RecentlyPushedNewBranches}}
+	{{$pullRepo := $.Repository}}
+	{{$baseRepo := $.Repository}}
+	{{$branchName := .Name}}
+	{{if .Repo}}
+		{{$pullRepo = .Repo}}
+		{{if and $.Repository.IsFork}}
+			{{$baseRepo = $.Repository.BaseRepo}}
+		{{end}}
+		{{if not (eq .Repo.ID $.Repository.ID)}}
+			{{$branchName = (print .Repo.FullName ":" .Name)}}
+		{{end}}
+	{{end}}
 	<div class="ui positive message gt-df gt-ac">
 		<div class="gt-f1">
 			{{$timeSince := TimeSince .UpdatedUnix.AsTime $.locale}}
-			{{$.locale.Tr "repo.pulls.recently_pushed_new_branches" (PathEscapeSegments .Name) $timeSince | Safe}}
+			{{$.locale.Tr "repo.pulls.recently_pushed_new_branches" (PathEscapeSegments $branchName) $timeSince | Safe}}
 		</div>
-		<a aria-role="button" class="ui compact positive button gt-m-0" href="{{$.Repository.ComposeBranchCompareURL $.Repository.BaseRepo (PathEscapeSegments .Name)}}">
+		<a aria-role="button" class="ui compact positive button gt-m-0" href="{{$pullRepo.ComposeBranchCompareURL $baseRepo (PathEscapeSegments .Name)}}">
 			{{$.locale.Tr "repo.pulls.compare_changes"}}
 		</a>
 	</div>