gitea/routers/web/repo
sillyguodong 3dc2724d36
Fix cannot reopen after pushing commits to a closed PR (#23189) (#23322)
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)
2023-03-06 11:38:45 -06:00
..
activity.go Respect user's locale when rendering the date range in the repo activity page (#21410) 2022-10-13 00:14:14 +03:00
attachment.go Move some repository related code into sub package (#19711) 2022-06-06 16:01:49 +08:00
blame.go Refactor git command arguments and make all arguments to be safe to be used (#21535) 2022-10-23 22:44:45 +08:00
branch.go Prevent NPE if trying to restore an already restored deleted branch (#21940) (#21944) 2022-11-25 17:28:03 -06:00
cherry_pick.go Remove `RequireHighlightJS` field, update plantuml example. (#19615) 2022-05-05 10:53:38 +03:00
commit.go Use complete SHA to create and query commit status (#22244) (#22257) 2022-12-28 11:03:21 +01:00
compare.go Use beforeCommit instead of baseCommit (#22949) (#22996) 2023-02-21 10:51:02 -05:00
download.go Slightly simplify LastCommitCache (#20444) 2022-07-25 16:39:42 +01:00
editor.go Move some files into models' sub packages (#20262) 2022-08-25 10:31:57 +08:00
editor_test.go Add more linters to improve code readability (#19989) 2022-06-20 12:02:49 +02:00
find.go Feature: Find files in repo (#15028) 2022-06-09 14:15:08 +03:00
http.go Refactor git command arguments and make all arguments to be safe to be used (#21535) 2022-10-23 22:44:45 +08:00
http_test.go Fix http path bug (#16117) 2021-06-09 14:53:12 +02:00
issue.go Fix cannot reopen after pushing commits to a closed PR (#23189) (#23322) 2023-03-06 11:38:45 -06:00
issue_content_history.go Multiple improvements for comment edit diff (#21990) (#22007) 2022-12-02 15:42:41 -05:00
issue_dependency.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
issue_label.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
issue_label_test.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
issue_lock.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
issue_stopwatch.go Stop spurious APIFormat stopwatches logs (#20008) 2022-06-17 22:47:15 +01:00
issue_test.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
issue_timetrack.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
issue_watch.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
lfs.go Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2022-10-24 20:29:17 +01:00
main_test.go Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
middlewares.go Add system setting table with cache and also add cache supports for user setting (#18058) 2022-10-17 07:29:26 +08:00
migrate.go Unify repo settings & show better error (#19828) 2022-06-12 13:43:27 +08:00
milestone.go Move milestone to models/issues/ (#19278) 2022-04-08 17:11:15 +08:00
packages.go Show hint to link package to repo when viewing empty repo package list (#20504) 2022-07-27 19:58:21 +08:00
patch.go Remove `RequireHighlightJS` field, update plantuml example. (#19615) 2022-05-05 10:53:38 +03:00
projects.go Check if project has the same repository id with issue when assign project to issue (#20133) 2022-06-30 23:55:08 +08:00
projects_test.go Decouple unit test code from business code (#17623) 2021-11-12 22:36:47 +08:00
pull.go Fix cannot reopen after pushing commits to a closed PR (#23189) (#23322) 2023-03-06 11:38:45 -06:00
pull_review.go Dismiss prior pull reviews if done via web in review dismiss (#20197) 2022-07-19 15:20:28 +02:00
release.go Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2022-10-24 20:29:17 +01:00
release_test.go Move some files into models' sub packages (#20262) 2022-08-25 10:31:57 +08:00
render.go Allow render HTML with css/js external links (#19017) 2022-06-16 11:33:23 +08:00
repo.go Add support for HEAD requests in Maven registry (#21834) (#21929) 2022-11-25 13:46:28 +02:00
search.go Add user/organization code search (#19977) 2022-10-11 00:12:03 +01:00
setting.go Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2022-10-24 20:29:17 +01:00
setting_protected_branch.go Move some code into models/git (#19879) 2022-06-12 23:51:54 +08:00
settings_test.go test: use `T.TempDir` to create temporary test directory (#21043) 2022-09-04 16:14:53 +01:00
tag.go Move some code into models/git (#19879) 2022-06-12 23:51:54 +08:00
topic.go Renamed ctx.User to ctx.Doer. (#19161) 2022-03-22 15:03:22 +08:00
treelist.go Refactor parseTreeEntries, speed up tree list (#21368) 2022-10-08 01:20:53 +08:00
view.go Ensure that plain files are rendered correctly even when containing ambiguous characters (#22017) (#22160) 2022-12-19 23:51:21 +08:00
view_test.go adapt README_{Country}.md stype name in localizedExtensions (#21486) 2022-10-24 14:12:15 +08:00
webhook.go Decouple HookTask from Repository (#17940) 2022-10-21 18:21:56 +02:00
wiki.go [refactor] Use const for wiki DefaultBranch (#21466) 2022-10-15 16:40:32 +02:00
wiki_test.go Make git.OpenRepository accept Context (#19260) 2022-03-30 03:13:41 +08:00