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.
sillyguodong
2f49b55c19
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()`.
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.
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>
|
2 years ago |
| .. |
|
actions
|
Require approval to run actions for fork pull request (#22803)
|
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
|
Use minio/sha256-simd for accelerated SHA256 (#23052)
|
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)
|
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
|
Refactor git command package to improve security and maintainability (#22678)
|
2 years ago |
|
issue
|
Webhooks: for issue close/reopen action, add commit ID that caused it (#22583)
|
2 years ago |
|
lfs
|
Use minio/sha256-simd for accelerated SHA256 (#23052)
|
2 years ago |
|
mailer
|
Use minio/sha256-simd for accelerated SHA256 (#23052)
|
2 years ago |
|
markup
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
migrations
|
Add loading yaml label template files (#22976)
|
2 years ago |
|
mirror
|
Use proxy for pull mirror (#22771)
|
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)
|
2 years ago |
|
release
|
Add context cache as a request level cache (#22294)
|
2 years ago |
|
repository
|
Use context parameter in services/repository (#23186)
|
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
|
Use minio/sha256-simd for accelerated SHA256 (#23052)
|
2 years ago |
|
wiki
|
Improve utils of slices (#22379)
|
2 years ago |
