forked from gitea/gitea
1
0
Fork 0
gitea/models/issues
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.

![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>
2023-03-03 21:16:58 +08:00
..
assignees.go Improve utils of slices (#22379) 2023-01-11 13:31:16 +08:00
assignees_test.go refactor some functions to support ctx as first parameter (#21878) 2022-12-03 10:48:26 +08:00
comment.go Rename `repo.GetOwner` to `repo.LoadOwner` (#22967) 2023-02-18 20:11:03 +08:00
comment_code.go some refactor about code comments (#20821) 2023-01-17 15:03:44 -06:00
comment_list.go Implement actions (#21937) 2023-01-31 09:45:19 +08:00
comment_test.go Support importing comment types (#22510) 2023-01-18 21:14:56 -05:00
content_history.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
content_history_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
dependency.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
dependency_test.go refactor some functions to support ctx as first parameter (#21878) 2022-12-03 10:48:26 +08:00
issue.go Add "Reviewed by you" filter for pull requests (#22927) 2023-02-24 21:55:50 -05:00
issue_index.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
issue_list.go Implement actions (#21937) 2023-01-31 09:45:19 +08:00
issue_list_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
issue_lock.go Rename almost all Ctx functions (#22071) 2022-12-10 10:46:31 +08:00
issue_project.go Improve issues.LoadProject (#22982) 2023-02-20 13:21:56 -06:00
issue_test.go Scoped labels (#22585) 2023-02-18 21:17:39 +02:00
issue_user.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
issue_user_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
issue_watch.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
issue_watch_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
issue_xref.go Fix more HTMLURL in templates (#22831) 2023-02-09 11:31:30 -05:00
issue_xref_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
label.go Add loading yaml label template files (#22976) 2023-03-02 01:44:23 +02:00
label_test.go Add loading yaml label template files (#22976) 2023-03-02 01:44:23 +02:00
main_test.go Refactor the setting to make unit test easier (#22405) 2023-02-20 00:12:01 +08:00
milestone.go refactor some functions to support ctx as first parameter (#21878) 2022-12-03 10:48:26 +08:00
milestone_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
pull.go Rename `repo.GetOwner` to `repo.LoadOwner` (#22967) 2023-02-18 20:11:03 +08:00
pull_list.go Fix cannot reopen after pushing commits to a closed PR (#23189) 2023-03-03 21:16:58 +08:00
pull_test.go Fix cannot reopen after pushing commits to a closed PR (#23189) 2023-03-03 21:16:58 +08:00
reaction.go refactor some functions to support ctx as first parameter (#21878) 2022-12-03 10:48:26 +08:00
reaction_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
review.go Implement actions (#21937) 2023-01-31 09:45:19 +08:00
review_test.go Restore previous official review when an official review is deleted (#22449) 2023-01-15 07:00:09 +02:00
stopwatch.go Speed up HasUserStopwatch & GetActiveStopwatch (#23051) 2023-02-27 13:46:00 -05:00
stopwatch_test.go Speed up HasUserStopwatch & GetActiveStopwatch (#23051) 2023-02-27 13:46:00 -05:00
tracked_time.go Rename almost all Ctx functions (#22071) 2022-12-10 10:46:31 +08:00
tracked_time_test.go refactor some functions to support ctx as first parameter (#21878) 2022-12-03 10:48:26 +08:00