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>
|
1 year ago |
| .. |
|
check.go
|
Add force_merge to merge request and fix checking mergable (#23010)
|
1 year ago |
|
check_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
comment.go
|
Rename almost all Ctx functions (#22071)
|
2 years ago |
|
commit_status.go
|
Supports wildcard protected branch (#20825)
|
2 years ago |
|
edits.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
lfs.go
|
Use context parameter in models/git (#22367)
|
2 years ago |
|
main_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
merge.go
|
Use `--message=%s` for git commit message (#23028)
|
1 year ago |
|
merge_test.go
|
Support template for merge message description (#22248)
|
2 years ago |
|
patch.go
|
Refactor git command package to improve security and maintainability (#22678)
|
1 year ago |
|
patch_unmerged.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
pull.go
|
Fix cannot reopen after pushing commits to a closed PR (#23189)
|
1 year ago |
|
pull_test.go
|
Support template for merge message description (#22248)
|
2 years ago |
|
review.go
|
some refactor about code comments (#20821)
|
2 years ago |
|
temp_repo.go
|
Do not create commit graph for temporary repos (#23219)
|
1 year ago |
|
update.go
|
Fix update by rebase being wrongly disabled by protected base branch (#22825)
|
1 year ago |
