You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gitea/services
sillyguodong e8e871b44e
Fix cannot reopen after pushing commits to a closed PR (#23189) (#23324)
Backport: #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()`.

067b0c2664/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>
2 years ago
..
actions Avoid panic caused by broken payload when creating commit status (#23216) (#23294) 2 years ago
agit Rename almost all Ctx functions (#22071) 2 years ago
asymkey Add context cache as a request level cache (#22294) 2 years ago
attachment Add API management for issue/pull and comment attachments (#21783) 2 years ago
auth Add context cache as a request level cache (#22294) 2 years ago
automerge Add force_merge to merge request and fix checking mergable (#23010) 2 years ago
context Support org/user level projects (#22235) 2 years ago
convert Fix SyncOnCommit always return false in API of push_mirrors (#23088) (#23100) 2 years ago
cron Add Cargo package registry (#21888) 2 years ago
externalaccount Implement FSFE REUSE for golang files (#21840) 2 years ago
forms Add force_merge to merge request and fix checking mergable (#23010) 2 years ago
gitdiff Fix broken code editor diff preview (#23307) (#23320) 2 years ago
issue Webhooks: for issue close/reopen action, add commit ID that caused it (#22583) 2 years ago
lfs Use context parameter in models/git (#22367) 2 years ago
mailer fix permission check for creating comment while mail (#22524) 2 years ago
markup Implement FSFE REUSE for golang files (#21840) 2 years ago
migrations Add loading yaml label template files (#22976) (#23232) 2 years ago
mirror Fill head commit to in payload when notifying push commits for mirroring (#23215) (#23292) 2 years ago
org Implement FSFE REUSE for golang files (#21840) 2 years ago
packages Use import of OCI structs (#22765) 2 years ago
pull Fix cannot reopen after pushing commits to a closed PR (#23189) (#23324) 2 years ago
release Add context cache as a request level cache (#22294) 2 years ago
repository Return empty url for submodule tree entries (#23043) 2 years ago
task Implement FSFE REUSE for golang files (#21840) 2 years ago
user Add context cache as a request level cache (#22294) 2 years ago
webhook Fix intermittent panic in notify issue change content (#23019) 2 years ago
wiki Improve utils of slices (#22379) 2 years ago