Notify about recent pushes if a branch has no PR yet

models/recently_pushed.go

@@ -0,0 +1,123 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package models
+
+import (
+	"context"
+	"strings"
+	"time"
+
+	"code.gitea.io/gitea/models/activities"
+	"code.gitea.io/gitea/models/db"
+	"code.gitea.io/gitea/models/repo"
+	"code.gitea.io/gitea/models/user"
+
+	"xorm.io/builder"
+)
+
+type RecentlyPushedBranches struct {
+	Repo       *repo.Repository
+	BaseRepo   *repo.Repository
+	BranchName string
+	Time       time.Time
+}
+
+// GetRecentlyPushedBranches returns all actions where a user recently pushed but no PRs are created yet.
+func GetRecentlyPushedBranches(ctx context.Context, u *user.User) (recentlyPushedBranches []*RecentlyPushedBranches, err error) {
+	limit := time.Now().Add(-2 * time.Hour).Unix()
+
+	actions := []*activities.Action{}
+	// We're fetching the last three commits activity actions within the limit...
+	err = db.GetEngine(ctx).
+		Select("action.ref_name, action.repo_id, action.created_unix").
+		Join("LEFT", "pull_request", "pull_request.head_branch = replace(action.ref_name, 'refs/heads/', '')").
+		Join("LEFT", "issue", "pull_request.issue_id = issue.id").
+		Join("LEFT", "repository", "action.repo_id = repository.id").
+		Where(builder.And(
+			builder.Eq{"action.op_type": activities.ActionCommitRepo},
+			// ...done by the current user
+			builder.Eq{"action.act_user_id": u.ID},
+			// ...which have been pushed to a fork or a branch different from the default branch
+			builder.Or(
+				builder.Expr("repository.default_branch != replace(action.ref_name, 'refs/heads/', '')"),
+				builder.Eq{"repository.is_fork": true},
+			),
+			// ...and don't have an open or closed PR corresponding to that branch.
+			builder.Or(
+				builder.IsNull{"pull_request.id"},
+				builder.And(
+					builder.Eq{"pull_request.has_merged": false},
+					builder.Eq{"issue.is_closed": true},
+					builder.Expr("action.created_unix > issue.closed_unix"),
+				),
+			),
+			builder.Gte{"action.created_unix": limit},
+		)).
+		Limit(3).
+		GroupBy("action.ref_name, action.repo_id, action.created_unix").
+		Desc("action.created_unix").
+		Find(&actions)
+	if err != nil {
+		return nil, err
+	}
+
+	repoIDs := []int64{}
+	for _, a := range actions {
+		repoIDs = append(repoIDs, a.RepoID)
+	}
+
+	// Because we need the repo name and url, we need to fetch all repos from recent pushes
+	// and, if they are forked, the parent repo as well.
+	repos := make(map[int64]*repo.Repository, len(repoIDs))
+	err = db.GetEngine(ctx).
+		Where(builder.Or(
+			builder.In("repository.id", repoIDs),
+			builder.In("repository.id",
+				builder.Select("repository.fork_id").
+					From("repository").
+					Where(builder.In("repository.id", repoIDs)),
+			),
+		)).
+		Find(&repos)
+	if err != nil {
+		return nil, err
+	}
+
+	owners := make(map[int64]*user.User)
+	err = db.GetEngine(ctx).
+		Where(builder.Or(
+			builder.In("repository.id", repoIDs),
+			builder.In("repository.id",
+				builder.Select("repository.fork_id").
+					From("repository").
+					Where(builder.In("repository.id", repoIDs)),
+			),
+		)).
+		Join("LEFT", "repository", "`repository`.owner_id = `user`.id").
+		Find(&owners)
+	if err != nil {
+		return nil, err
+	}
+
+	recentlyPushedBranches = []*RecentlyPushedBranches{}
+	for _, a := range actions {
+		pushed := &RecentlyPushedBranches{
+			Repo:       repos[a.RepoID],
+			BaseRepo:   repos[a.RepoID],
+			BranchName: strings.Replace(a.RefName, "refs/heads/", "", 1),
+			Time:       a.GetCreate(),
+		}
+
+		if pushed.Repo.IsFork {
+			pushed.BaseRepo = repos[pushed.Repo.ForkID]
+			pushed.BaseRepo.Owner = owners[pushed.BaseRepo.OwnerID]
+		}
+
+		pushed.Repo.Owner = owners[pushed.Repo.OwnerID]
+
+		recentlyPushedBranches = append(recentlyPushedBranches, pushed)
+	}
+
+	return recentlyPushedBranches, nil
+}

options/locale/locale_en-US.ini

@@ -1684,6 +1684,8 @@ pulls.auto_merge_canceled_schedule_comment = `canceled auto merging this pull re
 pulls.delete.title = Delete this pull request?
 pulls.delete.text = Do you really want to delete this pull request? (This will permanently remove all content. Consider closing it instead, if you intend to keep it archived)
 
+pulls.recently_pushed_to_branches = You pushed to <strong>%[1]s/%[2]s</strong> on branch <strong>%[3]s</strong> %[4]s
+
 milestones.new = New Milestone
 milestones.closed = Closed %s
 milestones.update_ago = Updated %s ago

routers/web/repo/issue.go

@@ -17,6 +17,7 @@ import (
 	"strings"
 	"time"
 
+	"code.gitea.io/gitea/models"
 	activities_model "code.gitea.io/gitea/models/activities"
 	"code.gitea.io/gitea/models/db"
 	git_model "code.gitea.io/gitea/models/git"
@@ -456,6 +457,14 @@ func Issues(ctx *context.Context) {
 
 	ctx.Data["CanWriteIssuesOrPulls"] = ctx.Repo.CanWriteIssuesOrPulls(isPullList)
 
+	if ctx.Doer != nil {
+		ctx.Data["RecentlyPushedBranches"], err = models.GetRecentlyPushedBranches(ctx, ctx.Doer)
+		if err != nil {
+			ctx.ServerError("GetRecentlyPushedBranches", err)
+			return
+		}
+	}
+
 	ctx.HTML(http.StatusOK, tplIssues)
 }
 

routers/web/repo/view.go

@@ -16,6 +16,7 @@ import (
 	"strings"
 	"time"
 
+	"code.gitea.io/gitea/models"
 	activities_model "code.gitea.io/gitea/models/activities"
 	admin_model "code.gitea.io/gitea/models/admin"
 	asymkey_model "code.gitea.io/gitea/models/asymkey"
@@ -958,6 +959,14 @@ func renderCode(ctx *context.Context) {
 		}
 	}
 
+	if ctx.Doer != nil {
+		ctx.Data["RecentlyPushedBranches"], err = models.GetRecentlyPushedBranches(ctx, ctx.Doer)
+		if err != nil {
+			ctx.ServerError("GetRecentlyPushedBranches", err)
+			return
+		}
+	}
+
 	ctx.Data["Paths"] = paths
 	ctx.Data["TreeLink"] = treeLink
 	ctx.Data["TreeNames"] = treeNames

routers/web/user/home.go

@@ -13,6 +13,7 @@ import (
 	"strconv"
 	"strings"
 
+	"code.gitea.io/gitea/models"
 	activities_model "code.gitea.io/gitea/models/activities"
 	asymkey_model "code.gitea.io/gitea/models/asymkey"
 	"code.gitea.io/gitea/models/db"
@@ -127,6 +128,12 @@ func Dashboard(ctx *context.Context) {
 		return
 	}
 
+	ctx.Data["RecentlyPushedBranches"], err = models.GetRecentlyPushedBranches(ctx, ctxUser)
+	if err != nil {
+		ctx.ServerError("GetRecentlyPushedBranches", err)
+		return
+	}
+
 	ctx.Data["Feeds"] = feeds
 
 	pager := context.NewPagination(int(count), setting.UI.FeedPagingNum, page, 5)

templates/repo/home.tmpl

@@ -3,6 +3,7 @@
 	{{template "repo/header" .}}
 	<div class="ui container {{if .IsBlame}}fluid padded{{end}}">
 		{{template "base/alert" .}}
+		{{template "user/recently_pushed_branches" .}}
 		{{if and (not .HideRepoInfo) (not .IsBlame)}}
 		<div class="ui repo-description">
 			<div id="repo-desc">

templates/repo/issue/list.tmpl

@@ -2,6 +2,7 @@
 <div role="main" aria-label="{{.Title}}" class="page-content repository">
 	{{template "repo/header" .}}
 	<div class="ui container">
+		{{template "user/recently_pushed_branches" .}}
 		<div class="ui three column grid issue-list-headers">
 			<div class="column">
 				{{template "repo/issue/navbar" .}}

templates/user/dashboard/dashboard.tmpl

@@ -5,6 +5,7 @@
 		{{template "base/alert" .}}
 		<div class="ui mobile reversed stackable grid">
 			<div class="ui container ten wide column">
+				{{template "user/recently_pushed_branches" .}}
 				{{template "user/heatmap" .}}
 				{{template "user/dashboard/feeds" .}}
 			</div>

templates/user/recently_pushed_branches.tmpl

@@ -0,0 +1,11 @@
+{{range .RecentlyPushedBranches}}
+	<div class="ui positive message gt-p-4 gt-df gt-ac gt-tl">
+		<div class="gt-f1">
+			{{$timeSince := TimeSince .Time $.locale}}
+			{{$.locale.Tr "repo.pulls.recently_pushed_to_branches" .Repo.Owner.Name .Repo.LowerName .BranchName $timeSince | Safe}}
+		</div>
+		<a aria-role="button" class="ui compact positive button gt-m-0" href="{{CompareLink .BaseRepo .Repo .BranchName}}">
+			{{$.locale.Tr "repo.pulls.compare_changes"}}
+		</a>
+	</div>
+{{end}}

tests/integration/repo_branch_test.go

@@ -120,9 +120,9 @@ func testCreateBranches(t *testing.T, giteaURL *url.URL) {
 			req := NewRequest(t, "GET", redirectURL)
 			resp := session.MakeRequest(t, req, http.StatusOK)
 			htmlDoc := NewHTMLParser(t, resp.Body)
-			assert.Equal(t,
-				test.FlashMessage,
+			assert.Contains(t,
 				strings.TrimSpace(htmlDoc.doc.Find(".ui.message").Text()),
+				test.FlashMessage,
 			)
 		}
 	}

web_src/css/helpers.css

@@ -6,6 +6,7 @@
 .gt-ab { align-items: baseline !important; }
 .gt-tc { text-align: center !important; }
 .gt-tl { text-align: left !important; }
+.gt-tr { text-align: right !important; }
 .gt-tdn { text-decoration: none !important; }
 .gt-jc { justify-content: center !important; }
 .gt-js { justify-content: flex-start !important; }