2019-10-30 15:33:10 -05:00
|
|
|
// Copyright 2019 The Gitea Authors. All rights reserved.
|
2022-11-27 13:20:29 -05:00
|
|
|
// SPDX-License-Identifier: MIT
|
2019-10-30 15:33:10 -05:00
|
|
|
|
2022-06-13 04:37:59 -05:00
|
|
|
package issues
|
2019-10-30 15:33:10 -05:00
|
|
|
|
|
|
|
import (
|
2022-04-28 06:48:48 -05:00
|
|
|
"context"
|
2019-10-30 15:33:10 -05:00
|
|
|
"fmt"
|
|
|
|
|
2021-09-19 06:49:59 -05:00
|
|
|
"code.gitea.io/gitea/models/db"
|
2022-05-11 05:09:36 -05:00
|
|
|
access_model "code.gitea.io/gitea/models/perm/access"
|
|
|
|
"code.gitea.io/gitea/models/unit"
|
2021-11-24 04:49:20 -05:00
|
|
|
user_model "code.gitea.io/gitea/models/user"
|
2019-10-30 15:33:10 -05:00
|
|
|
"code.gitea.io/gitea/modules/log"
|
2023-02-05 06:57:38 -05:00
|
|
|
"code.gitea.io/gitea/modules/util"
|
2019-12-06 21:44:10 -05:00
|
|
|
|
2019-10-30 15:33:10 -05:00
|
|
|
"xorm.io/xorm"
|
|
|
|
)
|
|
|
|
|
|
|
|
// PullRequestsOptions holds the options for PRs
|
|
|
|
type PullRequestsOptions struct {
|
2021-09-24 06:32:56 -05:00
|
|
|
db.ListOptions
|
2019-10-30 15:33:10 -05:00
|
|
|
State string
|
|
|
|
SortType string
|
2024-03-21 10:07:35 -05:00
|
|
|
Labels []int64
|
2019-10-30 15:33:10 -05:00
|
|
|
MilestoneID int64
|
|
|
|
}
|
|
|
|
|
2023-09-15 01:13:19 -05:00
|
|
|
func listPullRequestStatement(ctx context.Context, baseRepoID int64, opts *PullRequestsOptions) (*xorm.Session, error) {
|
|
|
|
sess := db.GetEngine(ctx).Where("pull_request.base_repo_id=?", baseRepoID)
|
2019-10-30 15:33:10 -05:00
|
|
|
|
|
|
|
sess.Join("INNER", "issue", "pull_request.issue_id = issue.id")
|
|
|
|
switch opts.State {
|
|
|
|
case "closed", "open":
|
|
|
|
sess.And("issue.is_closed=?", opts.State == "closed")
|
|
|
|
}
|
|
|
|
|
2024-03-21 10:07:35 -05:00
|
|
|
if len(opts.Labels) > 0 {
|
2019-10-30 15:33:10 -05:00
|
|
|
sess.Join("INNER", "issue_label", "issue.id = issue_label.issue_id").
|
2024-03-21 10:07:35 -05:00
|
|
|
In("issue_label.label_id", opts.Labels)
|
2019-10-30 15:33:10 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
if opts.MilestoneID > 0 {
|
|
|
|
sess.And("issue.milestone_id=?", opts.MilestoneID)
|
|
|
|
}
|
|
|
|
|
|
|
|
return sess, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetUnmergedPullRequestsByHeadInfo returns all pull requests that are open and has not been merged
|
2023-07-22 09:14:27 -05:00
|
|
|
func GetUnmergedPullRequestsByHeadInfo(ctx context.Context, repoID int64, branch string) ([]*PullRequest, error) {
|
2019-10-30 15:33:10 -05:00
|
|
|
prs := make([]*PullRequest, 0, 2)
|
2023-07-22 09:14:27 -05:00
|
|
|
sess := db.GetEngine(ctx).
|
2019-10-30 15:33:10 -05:00
|
|
|
Join("INNER", "issue", "issue.id = pull_request.issue_id").
|
2023-05-08 01:39:32 -05:00
|
|
|
Where("head_repo_id = ? AND head_branch = ? AND has_merged = ? AND issue.is_closed = ? AND flow = ?", repoID, branch, false, false, PullRequestFlowGithub)
|
Fix cannot reopen after pushing commits to a closed PR (#23189)
Close: #22784
1. On GH, we can reopen a PR which was closed before after pushing
commits. After reopening PR, we can see the commits that were pushed
after closing PR in the time line. So the case of
[issue](https://github.com/go-gitea/gitea/issues/22784) is a bug which
needs to be fixed.
2. After closing a PR and pushing commits, `headBranchSha` is not equal
to `sha`(which is the last commit ID string of reference). If the
judgement exists, the button of reopen will not display. So, skip the
judgement if the status of PR is closed.
![image](https://user-images.githubusercontent.com/33891828/222037529-651fccf9-0bba-433e-b2f0-79c17e0cc812.png)
3. Even if PR is already close, we should still insert comment record
into DB when we push commits.
So we should still call function `CreatePushPullComment()`.
https://github.com/go-gitea/gitea/blob/067b0c2664d127c552ccdfd264257caca4907a77/services/pull/pull.go#L260-L282
So, I add a switch(`includeClosed`) to the
`GetUnmergedPullRequestsByHeadInfo` func to control whether the status
of PR must be open. In this case, by setting `includeClosed` to `true`,
we can query the closed PR.
![image](https://user-images.githubusercontent.com/33891828/222621045-bb80987c-10c5-4eac-aa0c-1fb9c6aefb51.png)
4. In the loop of comments, I use the`latestCloseCommentID` variable to
record the last occurrence of the close comment.
In the go template, if the status of PR is closed, the comments whose
type is `CommentTypePullRequestPush(29)` after `latestCloseCommentID`
won't be rendered.
![image](https://user-images.githubusercontent.com/33891828/222058913-c91cf3e3-819b-40c5-8015-654b31eeccff.png)
e.g.
1). The initial status of the PR is opened.
![image](https://user-images.githubusercontent.com/33891828/222453617-33c5093e-f712-4cd6-8489-9f87e2075869.png)
2). Then I click the button of `Close`. PR is closed now.
![image](https://user-images.githubusercontent.com/33891828/222453694-25c588a9-c121-4897-9ae5-0b13cf33d20b.png)
3). I try to push a commit to this PR, even though its current status is
closed.
![image](https://user-images.githubusercontent.com/33891828/222453916-361678fb-7321-410d-9e37-5a26e8095638.png)
But in comments list, this commit do not display.This is as expected :)
![image](https://user-images.githubusercontent.com/33891828/222454169-7617a791-78d2-404e-be5e-77d555f93313.png)
4). Click the `Reopen` button, the commit which is pushed after closing
PR display now.
![image](https://user-images.githubusercontent.com/33891828/222454533-897893b6-b96e-4701-b5cb-b1800f382b8f.png)
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-03-03 08:16:58 -05:00
|
|
|
return prs, sess.Find(&prs)
|
2019-10-30 15:33:10 -05:00
|
|
|
}
|
|
|
|
|
Fix various typos (#20338)
* Fix various typos
Found via `codespell -q 3 -S ./options/locale,./options/license,./public/vendor -L actived,allways,attachements,ba,befores,commiter,pullrequest,pullrequests,readby,splitted,te,unknwon`
Co-authored-by: zeripath <art27@cantab.net>
2022-07-12 16:32:37 -05:00
|
|
|
// CanMaintainerWriteToBranch check whether user is a maintainer and could write to the branch
|
2023-07-22 09:14:27 -05:00
|
|
|
func CanMaintainerWriteToBranch(ctx context.Context, p access_model.Permission, branch string, user *user_model.User) bool {
|
2022-05-11 05:09:36 -05:00
|
|
|
if p.CanWrite(unit.TypeCode) {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(p.Units) < 1 {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
2023-07-22 09:14:27 -05:00
|
|
|
prs, err := GetUnmergedPullRequestsByHeadInfo(ctx, p.Units[0].RepoID, branch)
|
2022-05-11 05:09:36 -05:00
|
|
|
if err != nil {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, pr := range prs {
|
|
|
|
if pr.AllowMaintainerEdit {
|
2023-07-22 09:14:27 -05:00
|
|
|
err = pr.LoadBaseRepo(ctx)
|
2022-05-11 05:09:36 -05:00
|
|
|
if err != nil {
|
|
|
|
continue
|
|
|
|
}
|
2023-07-22 09:14:27 -05:00
|
|
|
prPerm, err := access_model.GetUserRepoPermission(ctx, pr.BaseRepo, user)
|
2022-05-11 05:09:36 -05:00
|
|
|
if err != nil {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if prPerm.CanWrite(unit.TypeCode) {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
2022-01-03 14:45:58 -05:00
|
|
|
// HasUnmergedPullRequestsByHeadInfo checks if there are open and not merged pull request
|
|
|
|
// by given head information (repo and branch)
|
2022-05-03 14:46:28 -05:00
|
|
|
func HasUnmergedPullRequestsByHeadInfo(ctx context.Context, repoID int64, branch string) (bool, error) {
|
|
|
|
return db.GetEngine(ctx).
|
2022-01-03 14:45:58 -05:00
|
|
|
Where("head_repo_id = ? AND head_branch = ? AND has_merged = ? AND issue.is_closed = ? AND flow = ?",
|
|
|
|
repoID, branch, false, false, PullRequestFlowGithub).
|
|
|
|
Join("INNER", "issue", "issue.id = pull_request.issue_id").
|
|
|
|
Exist(&PullRequest{})
|
|
|
|
}
|
|
|
|
|
2019-10-30 15:33:10 -05:00
|
|
|
// GetUnmergedPullRequestsByBaseInfo returns all pull requests that are open and has not been merged
|
|
|
|
// by given base information (repo and branch).
|
2023-07-22 09:14:27 -05:00
|
|
|
func GetUnmergedPullRequestsByBaseInfo(ctx context.Context, repoID int64, branch string) ([]*PullRequest, error) {
|
2019-10-30 15:33:10 -05:00
|
|
|
prs := make([]*PullRequest, 0, 2)
|
2023-07-22 09:14:27 -05:00
|
|
|
return prs, db.GetEngine(ctx).
|
2019-10-30 15:33:10 -05:00
|
|
|
Where("base_repo_id=? AND base_branch=? AND has_merged=? AND issue.is_closed=?",
|
|
|
|
repoID, branch, false, false).
|
2023-03-01 14:14:02 -05:00
|
|
|
OrderBy("issue.updated_unix DESC").
|
2019-10-30 15:33:10 -05:00
|
|
|
Join("INNER", "issue", "issue.id=pull_request.issue_id").
|
|
|
|
Find(&prs)
|
|
|
|
}
|
|
|
|
|
2019-12-15 04:51:28 -05:00
|
|
|
// GetPullRequestIDsByCheckStatus returns all pull requests according the special checking status.
|
2023-09-15 01:13:19 -05:00
|
|
|
func GetPullRequestIDsByCheckStatus(ctx context.Context, status PullRequestStatus) ([]int64, error) {
|
2019-12-15 04:51:28 -05:00
|
|
|
prs := make([]int64, 0, 10)
|
2023-09-15 01:13:19 -05:00
|
|
|
return prs, db.GetEngine(ctx).Table("pull_request").
|
2019-12-06 21:44:10 -05:00
|
|
|
Where("status=?", status).
|
2019-12-15 04:51:28 -05:00
|
|
|
Cols("pull_request.id").
|
2019-12-06 21:44:10 -05:00
|
|
|
Find(&prs)
|
|
|
|
}
|
|
|
|
|
2019-10-30 15:33:10 -05:00
|
|
|
// PullRequests returns all pull requests for a base Repo by the given conditions
|
2023-09-15 01:13:19 -05:00
|
|
|
func PullRequests(ctx context.Context, baseRepoID int64, opts *PullRequestsOptions) ([]*PullRequest, int64, error) {
|
2019-10-30 15:33:10 -05:00
|
|
|
if opts.Page <= 0 {
|
|
|
|
opts.Page = 1
|
|
|
|
}
|
|
|
|
|
2023-09-15 01:13:19 -05:00
|
|
|
countSession, err := listPullRequestStatement(ctx, baseRepoID, opts)
|
2019-10-30 15:33:10 -05:00
|
|
|
if err != nil {
|
|
|
|
log.Error("listPullRequestStatement: %v", err)
|
|
|
|
return nil, 0, err
|
|
|
|
}
|
|
|
|
maxResults, err := countSession.Count(new(PullRequest))
|
|
|
|
if err != nil {
|
|
|
|
log.Error("Count PRs: %v", err)
|
|
|
|
return nil, maxResults, err
|
|
|
|
}
|
|
|
|
|
2023-09-15 01:13:19 -05:00
|
|
|
findSession, err := listPullRequestStatement(ctx, baseRepoID, opts)
|
2023-05-18 05:45:25 -05:00
|
|
|
applySorts(findSession, opts.SortType, 0)
|
2019-10-30 15:33:10 -05:00
|
|
|
if err != nil {
|
|
|
|
log.Error("listPullRequestStatement: %v", err)
|
|
|
|
return nil, maxResults, err
|
|
|
|
}
|
2021-09-24 06:32:56 -05:00
|
|
|
findSession = db.SetSessionPagination(findSession, opts)
|
2020-01-24 14:00:29 -05:00
|
|
|
prs := make([]*PullRequest, 0, opts.PageSize)
|
2019-10-30 15:33:10 -05:00
|
|
|
return prs, maxResults, findSession.Find(&prs)
|
|
|
|
}
|
|
|
|
|
|
|
|
// PullRequestList defines a list of pull requests
|
|
|
|
type PullRequestList []*PullRequest
|
|
|
|
|
2023-07-22 09:14:27 -05:00
|
|
|
func (prs PullRequestList) LoadAttributes(ctx context.Context) error {
|
2019-10-30 15:33:10 -05:00
|
|
|
if len(prs) == 0 {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Load issues.
|
2023-01-17 16:03:44 -05:00
|
|
|
issueIDs := prs.GetIssueIDs()
|
2019-10-30 15:33:10 -05:00
|
|
|
issues := make([]*Issue, 0, len(issueIDs))
|
2022-05-20 09:08:52 -05:00
|
|
|
if err := db.GetEngine(ctx).
|
2019-10-30 15:33:10 -05:00
|
|
|
Where("id > 0").
|
|
|
|
In("id", issueIDs).
|
|
|
|
Find(&issues); err != nil {
|
2022-10-24 14:29:17 -05:00
|
|
|
return fmt.Errorf("find issues: %w", err)
|
2019-10-30 15:33:10 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
set := make(map[int64]*Issue)
|
|
|
|
for i := range issues {
|
|
|
|
set[issues[i].ID] = issues[i]
|
|
|
|
}
|
2023-02-01 22:49:28 -05:00
|
|
|
for _, pr := range prs {
|
|
|
|
pr.Issue = set[pr.IssueID]
|
2023-02-05 06:57:38 -05:00
|
|
|
/*
|
|
|
|
Old code:
|
|
|
|
pr.Issue.PullRequest = pr // panic here means issueIDs and prs are not in sync
|
|
|
|
|
|
|
|
It's worth panic because it's almost impossible to happen under normal use.
|
|
|
|
But in integration testing, an asynchronous task could read a database that has been reset.
|
|
|
|
So returning an error would make more sense, let the caller has a choice to ignore it.
|
|
|
|
*/
|
|
|
|
if pr.Issue == nil {
|
|
|
|
return fmt.Errorf("issues and prs may be not in sync: cannot find issue %v for pr %v: %w", pr.IssueID, pr.ID, util.ErrNotExist)
|
|
|
|
}
|
2023-02-05 09:24:43 -05:00
|
|
|
pr.Issue.PullRequest = pr
|
2019-10-30 15:33:10 -05:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2023-01-17 16:03:44 -05:00
|
|
|
// GetIssueIDs returns all issue ids
|
|
|
|
func (prs PullRequestList) GetIssueIDs() []int64 {
|
2019-10-30 15:33:10 -05:00
|
|
|
issueIDs := make([]int64, 0, len(prs))
|
|
|
|
for i := range prs {
|
|
|
|
issueIDs = append(issueIDs, prs[i].IssueID)
|
|
|
|
}
|
|
|
|
return issueIDs
|
|
|
|
}
|
2023-08-24 00:06:17 -05:00
|
|
|
|
|
|
|
// HasMergedPullRequestInRepo returns whether the user(poster) has merged pull-request in the repo
|
|
|
|
func HasMergedPullRequestInRepo(ctx context.Context, repoID, posterID int64) (bool, error) {
|
|
|
|
return db.GetEngine(ctx).
|
|
|
|
Join("INNER", "pull_request", "pull_request.issue_id = issue.id").
|
|
|
|
Where("repo_id=?", repoID).
|
|
|
|
And("poster_id=?", posterID).
|
|
|
|
And("is_pull=?", true).
|
|
|
|
And("pull_request.has_merged=?", true).
|
|
|
|
Select("issue.id").
|
|
|
|
Limit(1).
|
|
|
|
Get(new(Issue))
|
|
|
|
}
|
2024-03-21 08:13:08 -05:00
|
|
|
|
|
|
|
// GetPullRequestByIssueIDs returns all pull requests by issue ids
|
|
|
|
func GetPullRequestByIssueIDs(ctx context.Context, issueIDs []int64) (PullRequestList, error) {
|
|
|
|
prs := make([]*PullRequest, 0, len(issueIDs))
|
|
|
|
return prs, db.GetEngine(ctx).
|
|
|
|
Where("issue_id > 0").
|
|
|
|
In("issue_id", issueIDs).
|
|
|
|
Find(&prs)
|
|
|
|
}
|