Git with a cup of tea, painless self-hosted git service
Mirror for internal git.with.parts use
https://git.with.parts
You can not 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
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.
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 |
| .. |
|
assignees.go
|
Improve utils of slices (#22379)
|
2 years ago |
|
assignees_test.go
|
refactor some functions to support ctx as first parameter (#21878)
|
2 years ago |
|
comment.go
|
Rename `repo.GetOwner` to `repo.LoadOwner` (#22967)
|
2 years ago |
|
comment_code.go
|
some refactor about code comments (#20821)
|
2 years ago |
|
comment_list.go
|
Implement actions (#21937)
|
2 years ago |
|
comment_test.go
|
Support importing comment types (#22510)
|
2 years ago |
|
content_history.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
content_history_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
dependency.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
dependency_test.go
|
refactor some functions to support ctx as first parameter (#21878)
|
2 years ago |
|
issue.go
|
Fix intermittent panic in notify issue change content (#23019)
|
2 years ago |
|
issue_index.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
issue_list.go
|
Implement actions (#21937)
|
2 years ago |
|
issue_list_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
issue_lock.go
|
Rename almost all Ctx functions (#22071)
|
2 years ago |
|
issue_project.go
|
Improve issues.LoadProject (#22982)
|
2 years ago |
|
issue_test.go
|
Scoped labels (#22585)
|
2 years ago |
|
issue_user.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
issue_user_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
issue_watch.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
issue_watch_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
issue_xref.go
|
Fix more HTMLURL in templates (#22831)
|
2 years ago |
|
issue_xref_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
label.go
|
Add loading yaml label template files (#22976) (#23232)
|
2 years ago |
|
label_test.go
|
Add loading yaml label template files (#22976) (#23232)
|
2 years ago |
|
main_test.go
|
Refactor the setting to make unit test easier (#22405)
|
2 years ago |
|
milestone.go
|
refactor some functions to support ctx as first parameter (#21878)
|
2 years ago |
|
milestone_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
pull.go
|
Rename `repo.GetOwner` to `repo.LoadOwner` (#22967)
|
2 years ago |
|
pull_list.go
|
Fix cannot reopen after pushing commits to a closed PR (#23189) (#23324)
|
2 years ago |
|
pull_test.go
|
Fix cannot reopen after pushing commits to a closed PR (#23189) (#23324)
|
2 years ago |
|
reaction.go
|
refactor some functions to support ctx as first parameter (#21878)
|
2 years ago |
|
reaction_test.go
|
Implement FSFE REUSE for golang files (#21840)
|
2 years ago |
|
review.go
|
Implement actions (#21937)
|
2 years ago |
|
review_test.go
|
Restore previous official review when an official review is deleted (#22449)
|
2 years ago |
|
stopwatch.go
|
Rename almost all Ctx functions (#22071)
|
2 years ago |
|
stopwatch_test.go
|
refactor some functions to support ctx as first parameter (#21878)
|
2 years ago |
|
tracked_time.go
|
Rename almost all Ctx functions (#22071)
|
2 years ago |
|
tracked_time_test.go
|
refactor some functions to support ctx as first parameter (#21878)
|
2 years ago |
