mirror of
https://gitea.com/gitea/tea.git
synced 2026-04-25 17:53:37 +02:00
## Summary - Add `"ci"` as a new selectable field for `tea pr list --fields`, allowing users to see CI status across multiple PRs at a glance - Fetch CI status via `GetCombinedStatus` API **only when the `ci` field is explicitly requested** via `--fields`, avoiding unnecessary API calls in default usage - Improve CI status display in both detail and list views: - **Detail view** (`tea pr <index>`): show each CI check with symbol, context name, description, and clickable link to CI run - **List view** (`tea pr list --fields ci`): show symbol + context name per CI check (e.g., `✓ lint, ⏳ build, ❌ test`) - **Machine-readable output**: return raw state string (e.g., `success`, `pending`) - Replace pending CI symbol from `⭮` to `⏳` for better readability - Extract `formatCIStatus` helper and reuse it in `PullDetails` to reduce code duplication - Add comprehensive tests for CI status formatting and PR list integration ## Detail View Example ``` - CI: - ✓ [**lint**](https://ci.example.com/lint): Lint passed - ⏳ [**build**](https://ci.example.com/build): Build is running - ❌ [**test**](https://ci.example.com/test): 3 tests failed ``` ## List View Example ``` INDEX TITLE STATE CI 123 Fix bug open ✓ lint, ⏳ build, ❌ test ``` ## Usage ```bash # Show CI status column in list tea pr list --fields index,title,state,ci # Default output is unchanged (no CI column, no extra API calls) tea pr list ``` ## Files Changed - `cmd/pulls/list.go` — conditionally fetch CI status per PR when `ci` field is selected - `modules/print/pull.go` — add `ci` field, `formatCIStatus` helper, improve detail/list CI display - `modules/print/pull_test.go` — comprehensive tests for CI status formatting ## Test plan - [x] `go build ./...` passes - [x] `go test ./...` passes (11 new tests) - [x] `tea pr list` — default output unchanged, no extra API calls - [x] `tea pr list --fields index,title,state,ci` — CI column with context names - [x] `tea pr <index>` — CI section shows each check with name, description, and link - [x] `tea pr list --fields ci -o csv` — machine-readable output shows raw state strings 🤖 Generated with [Claude Code](https://claude.com/claude-code) Reviewed-on: https://gitea.com/gitea/tea/pulls/956 Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: Bo-Yi Wu <appleboy.tw@gmail.com> Co-committed-by: Bo-Yi Wu <appleboy.tw@gmail.com>
284 lines
6.8 KiB
Go
284 lines
6.8 KiB
Go
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package print
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"code.gitea.io/sdk/gitea"
|
|
)
|
|
|
|
var ciStatusSymbols = map[gitea.StatusState]string{
|
|
gitea.StatusSuccess: "✓ ",
|
|
gitea.StatusPending: "⏳ ",
|
|
gitea.StatusWarning: "⚠ ",
|
|
gitea.StatusError: "✘ ",
|
|
gitea.StatusFailure: "❌ ",
|
|
}
|
|
|
|
// PullDetails print an pull rendered to stdout
|
|
func PullDetails(pr *gitea.PullRequest, reviews []*gitea.PullReview, ciStatus *gitea.CombinedStatus) {
|
|
base := pr.Base.Name
|
|
head := formatPRHead(pr)
|
|
state := formatPRState(pr)
|
|
|
|
out := fmt.Sprintf(
|
|
"# #%d %s (%s)\n@%s created %s\t**%s** <- **%s**\n\n%s\n\n",
|
|
pr.Index,
|
|
pr.Title,
|
|
state,
|
|
pr.Poster.UserName,
|
|
FormatTime(*pr.Created, false),
|
|
base,
|
|
head,
|
|
pr.Body,
|
|
)
|
|
|
|
if ciStatus != nil || len(reviews) != 0 || pr.State == gitea.StateOpen {
|
|
out += "---\n"
|
|
}
|
|
|
|
out += formatReviews(pr, reviews)
|
|
|
|
if ciStatus != nil && len(ciStatus.Statuses) != 0 {
|
|
out += "- CI:\n"
|
|
for _, s := range ciStatus.Statuses {
|
|
symbol := ciStatusSymbols[s.State]
|
|
if s.TargetURL != "" {
|
|
out += fmt.Sprintf(" - %s[**%s**](%s)", symbol, s.Context, s.TargetURL)
|
|
} else {
|
|
out += fmt.Sprintf(" - %s**%s**", symbol, s.Context)
|
|
}
|
|
if s.Description != "" {
|
|
out += fmt.Sprintf(": %s", s.Description)
|
|
}
|
|
out += "\n"
|
|
}
|
|
}
|
|
|
|
if pr.State == gitea.StateOpen {
|
|
if pr.Mergeable {
|
|
out += "- No Conflicts\n"
|
|
} else {
|
|
out += "- **Conflicting files**\n"
|
|
}
|
|
}
|
|
|
|
if pr.AllowMaintainerEdit {
|
|
out += "- Maintainers are allowed to edit\n"
|
|
}
|
|
|
|
outputMarkdown(out, getRepoURL(pr.HTMLURL))
|
|
}
|
|
|
|
func formatPRHead(pr *gitea.PullRequest) string {
|
|
head := pr.Head.Name
|
|
if pr.Head.RepoID != pr.Base.RepoID {
|
|
if pr.Head.Repository != nil {
|
|
head = pr.Head.Repository.Owner.UserName + ":" + head
|
|
} else {
|
|
head = "delete:" + head
|
|
}
|
|
}
|
|
return head
|
|
}
|
|
|
|
func formatPRState(pr *gitea.PullRequest) string {
|
|
if pr.Merged != nil {
|
|
return "merged"
|
|
}
|
|
return string(pr.State)
|
|
}
|
|
|
|
func formatCIStatus(ci *gitea.CombinedStatus, machineReadable bool) string {
|
|
if ci == nil || len(ci.Statuses) == 0 {
|
|
return ""
|
|
}
|
|
if machineReadable {
|
|
return string(ci.State)
|
|
}
|
|
items := make([]string, 0, len(ci.Statuses))
|
|
for _, s := range ci.Statuses {
|
|
items = append(items, fmt.Sprintf("%s%s", ciStatusSymbols[s.State], s.Context))
|
|
}
|
|
return strings.Join(items, ", ")
|
|
}
|
|
|
|
func formatReviews(pr *gitea.PullRequest, reviews []*gitea.PullReview) string {
|
|
result := ""
|
|
if len(reviews) == 0 {
|
|
return result
|
|
}
|
|
|
|
// deduplicate reviews by user (via review time & userID),
|
|
reviewByUserOrTeam := make(map[string]*gitea.PullReview)
|
|
for _, review := range reviews {
|
|
switch review.State {
|
|
case gitea.ReviewStateApproved,
|
|
gitea.ReviewStateRequestChanges,
|
|
gitea.ReviewStateRequestReview:
|
|
if review.Reviewer != nil {
|
|
if r, ok := reviewByUserOrTeam[fmt.Sprintf("user_%d", review.Reviewer.ID)]; !ok || review.Submitted.After(r.Submitted) {
|
|
reviewByUserOrTeam[fmt.Sprintf("user_%d", review.Reviewer.ID)] = review
|
|
}
|
|
} else if review.ReviewerTeam != nil {
|
|
if r, ok := reviewByUserOrTeam[fmt.Sprintf("team_%d", review.ReviewerTeam.ID)]; !ok || review.Submitted.After(r.Submitted) {
|
|
reviewByUserOrTeam[fmt.Sprintf("team_%d", review.ReviewerTeam.ID)] = review
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// group reviews by type
|
|
reviewByState := make(map[gitea.ReviewStateType][]string)
|
|
for _, r := range reviewByUserOrTeam {
|
|
if r.Reviewer != nil {
|
|
reviewByState[r.State] = append(reviewByState[r.State],
|
|
r.Reviewer.UserName,
|
|
)
|
|
} else if r.ReviewerTeam != nil {
|
|
// only pulls to orgs can have team reviews
|
|
org := pr.Base.Repository.Owner
|
|
reviewByState[r.State] = append(reviewByState[r.State],
|
|
fmt.Sprintf("%s/%s", org.UserName, r.ReviewerTeam.Name),
|
|
)
|
|
}
|
|
}
|
|
|
|
// stringify
|
|
for state, user := range reviewByState {
|
|
result += fmt.Sprintf("- %s by @%s\n", state, strings.Join(user, ", @"))
|
|
}
|
|
return result
|
|
}
|
|
|
|
// PullsList prints a listing of pulls
|
|
func PullsList(prs []*gitea.PullRequest, output string, fields []string, ciStatuses map[int64]*gitea.CombinedStatus) error {
|
|
return printPulls(prs, output, fields, ciStatuses)
|
|
}
|
|
|
|
// PullFields are all available fields to print with PullsList()
|
|
var PullFields = []string{
|
|
"index",
|
|
"state",
|
|
"author",
|
|
"author-id",
|
|
"url",
|
|
|
|
"title",
|
|
"body",
|
|
|
|
"mergeable",
|
|
"base",
|
|
"base-commit",
|
|
"head",
|
|
"diff",
|
|
"patch",
|
|
|
|
"created",
|
|
"updated",
|
|
"deadline",
|
|
|
|
"assignees",
|
|
"milestone",
|
|
"labels",
|
|
"comments",
|
|
"ci",
|
|
}
|
|
|
|
func printPulls(pulls []*gitea.PullRequest, output string, fields []string, ciStatuses map[int64]*gitea.CombinedStatus) error {
|
|
labelMap := map[int64]string{}
|
|
printables := make([]printable, len(pulls))
|
|
machineReadable := isMachineReadable(output)
|
|
|
|
for i, x := range pulls {
|
|
// pre-serialize labels for performance
|
|
for _, label := range x.Labels {
|
|
if _, ok := labelMap[label.ID]; !ok {
|
|
labelMap[label.ID] = formatLabel(label, !machineReadable, "")
|
|
}
|
|
}
|
|
// store items with printable interface
|
|
printables[i] = &printablePull{x, &labelMap, &ciStatuses}
|
|
}
|
|
|
|
t := tableFromItems(fields, printables, machineReadable)
|
|
return t.print(output)
|
|
}
|
|
|
|
type printablePull struct {
|
|
*gitea.PullRequest
|
|
formattedLabels *map[int64]string
|
|
ciStatuses *map[int64]*gitea.CombinedStatus
|
|
}
|
|
|
|
func (x printablePull) FormatField(field string, machineReadable bool) string {
|
|
switch field {
|
|
case "index":
|
|
return fmt.Sprintf("%d", x.Index)
|
|
case "state":
|
|
return formatPRState(x.PullRequest)
|
|
case "author":
|
|
return formatUserName(x.Poster)
|
|
case "author-id":
|
|
return x.Poster.UserName
|
|
case "url":
|
|
return x.HTMLURL
|
|
case "title":
|
|
return x.Title
|
|
case "body":
|
|
return x.Body
|
|
case "created":
|
|
return FormatTime(*x.Created, machineReadable)
|
|
case "updated":
|
|
return FormatTime(*x.Updated, machineReadable)
|
|
case "deadline":
|
|
if x.Deadline == nil {
|
|
return ""
|
|
}
|
|
return FormatTime(*x.Deadline, machineReadable)
|
|
case "milestone":
|
|
if x.Milestone != nil {
|
|
return x.Milestone.Title
|
|
}
|
|
return ""
|
|
case "labels":
|
|
labels := make([]string, len(x.Labels))
|
|
for i, l := range x.Labels {
|
|
labels[i] = (*x.formattedLabels)[l.ID]
|
|
}
|
|
return strings.Join(labels, " ")
|
|
case "assignees":
|
|
assignees := make([]string, len(x.Assignees))
|
|
for i, a := range x.Assignees {
|
|
assignees[i] = formatUserName(a)
|
|
}
|
|
return strings.Join(assignees, " ")
|
|
case "comments":
|
|
return fmt.Sprintf("%d", x.Comments)
|
|
case "mergeable":
|
|
isMergeable := x.Mergeable && x.State == gitea.StateOpen
|
|
return formatBoolean(isMergeable, !machineReadable)
|
|
case "base":
|
|
return x.Base.Ref
|
|
case "base-commit":
|
|
return x.MergeBase
|
|
case "head":
|
|
return formatPRHead(x.PullRequest)
|
|
case "diff":
|
|
return x.DiffURL
|
|
case "patch":
|
|
return x.PatchURL
|
|
case "ci":
|
|
if x.ciStatuses != nil {
|
|
if ci, ok := (*x.ciStatuses)[x.Index]; ok {
|
|
return formatCIStatus(ci, machineReadable)
|
|
}
|
|
}
|
|
return ""
|
|
}
|
|
return ""
|
|
}
|