entrouvert
/
gitea-eo-custom
16
0
Fork 0
Code Issues Pull Requests Releases Activity

reviews: ignore official status, check pull request status (#77434) #5

Merged
fpeters merged 1 commits from wip/77434-fix-reviews into main 2023-05-10 14:54:27 +02:00
Conversation 1 Commits 1 Files Changed 1 +1 -1
fpeters commented 2023-05-10 13:33:47 +02:00
Owner
Copy Link
No description provided.
fpeters added 1 commit 2023-05-10 13:33:48 +02:00
gitea/gitea-eo-custom/pipeline/head This commit looks good Details
ba3e0e098e reviews: ignore official status, check pull request status (#77434)
fpeters reviewed 2023-05-10 13:37:04 +02:00
scripts/reviews.py Outdated
@ -18,8 +18,8 @@ cursor.execute(
and review.type = 4
and review.issue_id = issue.id
and issue.repo_id = repository.id
and review.official = true
fpeters commented 2023-05-10 13:34:42 +02:00
Author
Owner
Copy Link

Je ne sais pas comment j'étais tombé sur le truc de relecture officielle, ça m'avait semblé exclure correctement quelque chose mais à la lecture du code gitea mainteannt ça n'avait pas de rapport.

Je ne sais pas comment j'étais tombé sur le truc de relecture officielle, ça m'avait semblé exclure correctement quelque chose mais à la lecture du code gitea mainteannt ça n'avait pas de rapport.
scripts/reviews.py Outdated
@ -20,3 +20,3 @@
and issue.repo_id = repository.id
and review.official = true
and issue.index = pull_request.index
and pull_request.status not in (3, 6)
fpeters commented 2023-05-10 13:37:01 +02:00
Author
Owner
Copy Link

3 c'est PullRequestStatusManuallyMerged et 6 c'est PullRequestStatusAncestor (via models/issues/pull.go), si ça amène des faux positifs la liste pourra être étendue.

via models/issues/pull.go,

// Enumerate all the pull request status
const (
        PullRequestStatusConflict PullRequestStatus = iota
        PullRequestStatusChecking
        PullRequestStatusMergeable
        PullRequestStatusManuallyMerged
        PullRequestStatusError
        PullRequestStatusEmpty
        PullRequestStatusAncestor
)
3 c'est PullRequestStatusManuallyMerged et 6 c'est PullRequestStatusAncestor (via models/issues/pull.go), si ça amène des faux positifs la liste pourra être étendue. via models/issues/pull.go, ``` // Enumerate all the pull request status const ( PullRequestStatusConflict PullRequestStatus = iota PullRequestStatusChecking PullRequestStatusMergeable PullRequestStatusManuallyMerged PullRequestStatusError PullRequestStatusEmpty PullRequestStatusAncestor ) ```
fpeters marked this conversation as resolved
fpeters changed title from reviews: ignore official status, check pull request status (#77434) to WIP: reviews: ignore official status, check pull request status (#77434) 2023-05-10 13:53:48 +02:00
fpeters commented 2023-05-10 13:54:09 +02:00
Author
Owner
Copy Link

Ça n'est pas correct, ça inclut entrouvert/authentic#26 qui est fermée.

Ça n'est pas correct, ça inclut https://git.entrouvert.org/entrouvert/authentic/pulls/26 qui est fermée.
fpeters force-pushed wip/77434-fix-reviews from ba3e0e098e to 41ebe2196b 2023-05-10 13:58:01 +02:00 Compare
fpeters reviewed 2023-05-10 14:00:35 +02:00
scripts/reviews.py
@ -20,3 +20,3 @@
and issue.repo_id = repository.id
and review.official = true
and issue.index = pull_request.index
and issue.is_closed = false
fpeters commented 2023-05-10 14:00:35 +02:00
Author
Owner
Copy Link

Au final, en partant du code de gitea qui affiche l'état d'une PR, il y a en fait un mélange issue/pull request et ça fait qu'il faut se baser sur le flag en question.

C'est dans templates/repo/issue/view_title.tmpl,

                {{if .HasMerged}}
                        <div class="ui purple label issue-state-label">{{svg "octicon-git-merge" 16 "gt-mr-2"}} {{if eq .Issue.PullRequest.Status 3}}{{.locale.Tr "repo.pulls.manually_merged"}}{{else}}{{.locale.Tr "repo.pulls.merged"}}{{end}}</div>
                {{else if .Issue.IsClosed}}
                        <div class="ui red label issue-state-label">{{if .Issue.IsPull}}{{svg "octicon-git-pull-request"}}{{else}}{{svg "octicon-issue-closed"}}{{end}} {{.locale.Tr "repo.issues.closed_title"}}</div>
                        ...
Au final, en partant du code de gitea qui affiche l'état d'une PR, il y a en fait un mélange issue/pull request et ça fait qu'il faut se baser sur le flag en question. C'est dans templates/repo/issue/view_title.tmpl, ``` {{if .HasMerged}} <div class="ui purple label issue-state-label">{{svg "octicon-git-merge" 16 "gt-mr-2"}} {{if eq .Issue.PullRequest.Status 3}}{{.locale.Tr "repo.pulls.manually_merged"}}{{else}}{{.locale.Tr "repo.pulls.merged"}}{{end}}</div> {{else if .Issue.IsClosed}} <div class="ui red label issue-state-label">{{if .Issue.IsPull}}{{svg "octicon-git-pull-request"}}{{else}}{{svg "octicon-issue-closed"}}{{end}} {{.locale.Tr "repo.issues.closed_title"}}</div> ... ```
fpeters changed title from WIP: reviews: ignore official status, check pull request status (#77434) to reviews: ignore official status, check pull request status (#77434) 2023-05-10 14:00:56 +02:00
aberriot approved these changes 2023-05-10 14:38:50 +02:00
fpeters merged commit 41ebe2196b into main 2023-05-10 14:54:27 +02:00
fpeters deleted branch wip/77434-fix-reviews 2023-05-10 14:54:27 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
aberriot
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: entrouvert/gitea-eo-custom#5
No description provided.
Delete Branch "wip/77434-fix-reviews"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?