forgejo/models
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
..
activities Don't return duplicated users who can create org repo (#22560) (#22562) 2023-01-30 16:59:20 +00:00
admin Make every not exist error unwrappable to a fs.ErrNotExist (#20891) 2022-10-18 07:50:37 +02:00
asymkey Fix key signature error page (#22229) (#22230) 2022-12-30 12:53:23 +08:00
auth Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2022-10-24 20:29:17 +01:00
avatars Fix get system setting bug when enabled redis cache (#22298) 2023-01-01 23:24:01 +08:00
db some refactor about code comments(#20821) (#22707) 2023-02-16 21:21:25 +08:00
fixtures Use beforeCommit instead of baseCommit (#22949) (#22996) 2023-02-21 10:51:02 -05:00
foreignreference Make every not exist error unwrappable to a fs.ErrNotExist (#20891) 2022-10-18 07:50:37 +02:00
git Use complete SHA to create and query commit status (#22244) (#22257) 2022-12-28 11:03:21 +01:00
issues Fix cannot reopen after pushing commits to a closed PR (#23189) (#23322) 2023-03-06 11:38:45 -06:00
migrations Init git module before database migration (#21764) (#21765) 2022-11-10 14:22:41 +00:00
organization Don't return duplicated users who can create org repo (#22560) (#22562) 2023-01-30 16:59:20 +00:00
packages Fix container blob mount (#22226) (#22476) 2023-01-17 14:50:45 +08:00
perm Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2022-10-24 20:29:17 +01:00
project Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2022-10-24 20:29:17 +01:00
pull Make every not exist error unwrappable to a fs.ErrNotExist (#20891) 2022-10-18 07:50:37 +02:00
repo Fix error when calculate the repository size (#22392) (#22474) 2023-01-16 16:07:06 -06:00
system Set disable_gravatar/enable_federated_avatar when offline mode is true (#22479) (#22496) 2023-01-18 10:30:34 -06:00
unit Add more linters to improve code readability (#19989) 2022-06-20 12:02:49 +02:00
unittest Add system setting table with cache and also add cache supports for user setting (#18058) 2022-10-17 07:29:26 +08:00
user Provide the ability to set password hash algorithm parameters (#22942) (#22943) 2023-02-19 15:35:52 +08:00
webhook Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2022-10-24 20:29:17 +01:00
error.go Make every not exist error unwrappable to a fs.ErrNotExist (#20891) 2022-10-18 07:50:37 +02:00
fixture_generation.go Move access and repo permission to models/perm/access (#19350) 2022-05-11 12:09:36 +02:00
fixture_test.go
main_test.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 Add generic set type (#21408) 2022-10-12 13:18:26 +08:00
migrate_test.go Move some files into models' sub packages (#20262) 2022-08-25 10:31:57 +08:00
org.go Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2022-10-24 20:29:17 +01:00
org_team.go Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2022-10-24 20:29:17 +01:00
org_team_test.go Move some files into models' sub packages (#20262) 2022-08-25 10:31:57 +08:00
org_test.go Refactor AssertExistsAndLoadBean to use generics (#20797) 2022-08-16 10:22:25 +08:00
repo.go Fix issue/PR numbers (#22037) (#22044) 2022-12-07 14:20:12 +08:00
repo_collaboration.go Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2022-10-24 20:29:17 +01:00
repo_collaboration_test.go Move some files into models' sub packages (#20262) 2022-08-25 10:31:57 +08:00
repo_test.go Move tests as seperate sub packages to reduce duplicated file names (#19951) 2022-06-15 09:02:00 +02:00
repo_transfer.go Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551) 2022-10-24 20:29:17 +01:00
repo_transfer_test.go Refactor AssertExistsAndLoadBean to use generics (#20797) 2022-08-16 10:22:25 +08:00
user.go Prevent dangling user redirects (#21856) (#21858) 2022-11-18 22:25:00 +08:00