Skip to content

Exclude default branch from pushed branch hint #25795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 10, 2023
Merged

Exclude default branch from pushed branch hint #25795

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7bdeccd
Exclude default branch from pushed branch hint
lunny Jul 10, 2023
bdadff0
Merge branch 'main' into lunny/exclude_default_branch
GiteaBot Jul 10, 2023
3e3207d
fix check
lunny Jul 10, 2023
f99a3a3
Merge branch 'main' into lunny/exclude_default_branch
lunny Jul 10, 2023
5f04f8b
Merge branch 'lunny/exclude_default_branch' of github.com:lunny/gitea…
lunny Jul 10, 2023
b77e958
Merge branch 'main' into lunny/exclude_default_branch
GiteaBot Jul 10, 2023
28ce554
Merge branch 'main' into lunny/exclude_default_branch
GiteaBot Jul 10, 2023
bed9e36
Merge branch 'main' into lunny/exclude_default_branch
GiteaBot Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions models/git/branch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,17 +382,21 @@ 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
func FindRecentlyPushedNewBranches(ctx context.Context, repoID, userID int64) (BranchList, error) {
// except the indicate branch
func FindRecentlyPushedNewBranches(ctx context.Context, repoID, userID int64, excludeBranchName string) (BranchList, error) {
branches := make(BranchList, 0, 2)
subQuery := builder.Select("head_branch").From("pull_request").
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("updated_unix >= ?", time.Now().Add(-time.Hour*6).Unix()).
sess := db.GetEngine(ctx).
Where("pusher_id=? AND is_deleted=?", userID, false)
if excludeBranchName != "" {
sess.And("name <> ?", excludeBranchName)
}
err := sess.And("updated_unix >= ?", time.Now().Add(-time.Hour*6).Unix()).
NotIn("name", subQuery).
OrderBy("branch.updated_unix DESC").
Limit(2).
Expand Down
2 changes: 1 addition & 1 deletion routers/web/repo/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,7 @@ 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.Data["RecentlyPushedNewBranches"], err = git_model.FindRecentlyPushedNewBranches(ctx, ctx.Repo.Repository.ID, ctx.Doer.ID, ctx.Repo.Repository.DefaultBranch)
if err != nil {
ctx.ServerError("GetRecentlyPushedBranches", err)
return
Expand Down