diff options
| author | sillyguodong <33891828+sillyguodong@users.noreply.github.com> | 2023-03-03 21:16:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-03 21:16:58 +0800 |
| commit | 2f49b55c193faf7a1ab59d91fc707f2010143483 (patch) | |
| tree | 5bb2d29adf6c2b748aac2e06a4f5ed6e9d250f83 /routers/web/repo/issue.go | |
| parent | 699f20234b9f7cdbbeeee3be004470c598fa1147 (diff) | |
| download | gitea-2f49b55c193faf7a1ab59d91fc707f2010143483.tar.gz gitea-2f49b55c193faf7a1ab59d91fc707f2010143483.zip | |
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.
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.
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.
e.g.
1). The initial status of the PR is opened.
2). Then I click the button of `Close`. PR is closed now.
3). I try to push a commit to this PR, even though its current status is
closed.
But in comments list, this commit do not display.This is as expected ：）
4). Click the `Reopen` button, the commit which is pushed after closing
PR display now.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'routers/web/repo/issue.go')
| -rw-r--r-- | routers/web/repo/issue.go | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 47b499a3cc..3715320f10 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -1420,11 +1420,12 @@ func ViewIssue(ctx *context.Context) { } var ( - role issues_model.RoleDescriptor - ok bool - marked = make(map[int64]issues_model.RoleDescriptor) - comment *issues_model.Comment - participants = make([]*user_model.User, 1, 10) + role issues_model.RoleDescriptor + ok bool + marked = make(map[int64]issues_model.RoleDescriptor) + comment *issues_model.Comment + participants = make([]*user_model.User, 1, 10) + latestCloseCommentID int64 ) if ctx.Repo.Repository.IsTimetrackerEnabled(ctx) { if ctx.IsSigned { @@ -1622,9 +1623,15 @@ func ViewIssue(ctx *context.Context) { comment.Type == issues_model.CommentTypeStopTracking { // drop error since times could be pruned from DB.. _ = comment.LoadTime() + } else if comment.Type == issues_model.CommentTypeClose { + // record ID of latest closed comment. + // if PR is closed, the comments whose type is CommentTypePullRequestPush(29) after latestCloseCommentID won't be rendered. + latestCloseCommentID = comment.ID } } + ctx.Data["LatestCloseCommentID"] = latestCloseCommentID + // Combine multiple label assignments into a single comment combineLabelComments(issue) |