mirror of
https://gitea.com/gitea/tea.git
synced 2026-04-26 02:03:30 +02:00
## Summary - Add `tea pulls review-comments <pull-index>` subcommand to list PR review comments with configurable fields (supports table/json/csv/yaml output) - Add `tea pulls resolve <comment-id>` subcommand to mark a review comment as resolved - Add `tea pulls unresolve <comment-id>` subcommand to unmark a review comment as resolved - Follow existing approve/reject pattern with shared `runResolveComment` helper in `review_helpers.go` ## Usage ```bash # List review comments for PR #42 tea pulls review-comments 42 # Resolve comment #789 tea pulls resolve 789 # Unresolve comment #789 tea pulls unresolve 789 # Custom output fields tea pulls review-comments 42 --fields id,path,body,resolver --output json ``` ## New Files | File | Description | |------|-------------| | `cmd/pulls/review_comments.go` | `review-comments` subcommand | | `cmd/pulls/resolve.go` | `resolve` subcommand | | `cmd/pulls/unresolve.go` | `unresolve` subcommand | | `modules/task/pull_review_comment.go` | Task layer: list, resolve, unresolve via SDK | | `modules/print/pull_review_comment.go` | Print formatting with `printable` interface | ## Modified Files | File | Description | |------|-------------| | `cmd/pulls.go` | Register 3 new commands | | `cmd/pulls/review_helpers.go` | Add shared `runResolveComment` helper | ## Test Plan - [x] `go build ./...` passes - [x] `go vet ./...` passes - [x] `tea pulls review-comments <PR-index>` lists comments with IDs - [x] `tea pulls resolve <comment-id>` resolves successfully - [x] `tea pulls unresolve <comment-id>` unresolves successfully - [x] `--output json` produces valid JSON output Reviewed-on: https://gitea.com/gitea/tea/pulls/948 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>
188 lines
5.0 KiB
Go
188 lines
5.0 KiB
Go
// Copyright 2018 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package cmd
|
|
|
|
import (
|
|
stdctx "context"
|
|
"fmt"
|
|
"time"
|
|
|
|
"code.gitea.io/sdk/gitea"
|
|
"code.gitea.io/tea/cmd/flags"
|
|
"code.gitea.io/tea/cmd/pulls"
|
|
"code.gitea.io/tea/modules/context"
|
|
"code.gitea.io/tea/modules/interact"
|
|
"code.gitea.io/tea/modules/print"
|
|
"code.gitea.io/tea/modules/utils"
|
|
|
|
"github.com/urfave/cli/v3"
|
|
)
|
|
|
|
type pullLabelData = detailLabelData
|
|
|
|
type pullReviewData = detailReviewData
|
|
|
|
type pullCommentData = detailCommentData
|
|
|
|
type pullData struct {
|
|
ID int64 `json:"id"`
|
|
Index int64 `json:"index"`
|
|
Title string `json:"title"`
|
|
State gitea.StateType `json:"state"`
|
|
Created *time.Time `json:"created"`
|
|
Updated *time.Time `json:"updated"`
|
|
Labels []pullLabelData `json:"labels"`
|
|
User string `json:"user"`
|
|
Body string `json:"body"`
|
|
Assignees []string `json:"assignees"`
|
|
URL string `json:"url"`
|
|
Base string `json:"base"`
|
|
Head string `json:"head"`
|
|
HeadSha string `json:"headSha"`
|
|
DiffURL string `json:"diffUrl"`
|
|
Mergeable bool `json:"mergeable"`
|
|
HasMerged bool `json:"hasMerged"`
|
|
MergedAt *time.Time `json:"mergedAt"`
|
|
MergedBy string `json:"mergedBy,omitempty"`
|
|
ClosedAt *time.Time `json:"closedAt"`
|
|
Reviews []pullReviewData `json:"reviews"`
|
|
Comments []pullCommentData `json:"comments"`
|
|
}
|
|
|
|
// CmdPulls is the main command to operate on PRs
|
|
var CmdPulls = cli.Command{
|
|
Name: "pulls",
|
|
Aliases: []string{"pull", "pr"},
|
|
Category: catEntities,
|
|
Usage: "Manage and checkout pull requests",
|
|
Description: `Lists PRs when called without argument. If PR index is provided, will show it in detail.`,
|
|
ArgsUsage: "[<pull index>]",
|
|
Action: runPulls,
|
|
Flags: append([]cli.Flag{
|
|
&cli.BoolFlag{
|
|
Name: "comments",
|
|
Usage: "Whether to display comments (will prompt if not provided & run interactively)",
|
|
},
|
|
}, pulls.CmdPullsList.Flags...),
|
|
Commands: []*cli.Command{
|
|
&pulls.CmdPullsList,
|
|
&pulls.CmdPullsCheckout,
|
|
&pulls.CmdPullsClean,
|
|
&pulls.CmdPullsCreate,
|
|
&pulls.CmdPullsClose,
|
|
&pulls.CmdPullsReopen,
|
|
&pulls.CmdPullsEdit,
|
|
&pulls.CmdPullsReview,
|
|
&pulls.CmdPullsApprove,
|
|
&pulls.CmdPullsReject,
|
|
&pulls.CmdPullsMerge,
|
|
&pulls.CmdPullsReviewComments,
|
|
&pulls.CmdPullsResolve,
|
|
&pulls.CmdPullsUnresolve,
|
|
},
|
|
}
|
|
|
|
func runPulls(ctx stdctx.Context, cmd *cli.Command) error {
|
|
if cmd.Args().Len() == 1 {
|
|
return runPullDetail(ctx, cmd, cmd.Args().First())
|
|
}
|
|
return pulls.RunPullsList(ctx, cmd)
|
|
}
|
|
|
|
func runPullDetail(_ stdctx.Context, cmd *cli.Command, index string) error {
|
|
ctx, err := context.InitCommand(cmd)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := ctx.Ensure(context.CtxRequirement{RemoteRepo: true}); err != nil {
|
|
return err
|
|
}
|
|
idx, err := utils.ArgToIndex(index)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
client := ctx.Login.Client()
|
|
pr, _, err := client.GetPullRequest(ctx.Owner, ctx.Repo, idx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
reviews, _, err := client.ListPullReviews(ctx.Owner, ctx.Repo, idx, gitea.ListPullReviewsOptions{
|
|
ListOptions: gitea.ListOptions{Page: -1},
|
|
})
|
|
if err != nil {
|
|
fmt.Printf("error while loading reviews: %v\n", err)
|
|
}
|
|
|
|
if ctx.IsSet("output") {
|
|
switch ctx.String("output") {
|
|
case "json":
|
|
return runPullDetailAsJSON(ctx, pr, reviews)
|
|
}
|
|
}
|
|
|
|
ci, _, err := client.GetCombinedStatus(ctx.Owner, ctx.Repo, pr.Head.Sha)
|
|
if err != nil {
|
|
fmt.Printf("error while loading CI: %v\n", err)
|
|
}
|
|
|
|
print.PullDetails(pr, reviews, ci)
|
|
|
|
if pr.Comments > 0 {
|
|
err = interact.ShowCommentsMaybeInteractive(ctx, idx, pr.Comments)
|
|
if err != nil {
|
|
fmt.Printf("error loading comments: %v\n", err)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func runPullDetailAsJSON(ctx *context.TeaContext, pr *gitea.PullRequest, reviews []*gitea.PullReview) error {
|
|
c := ctx.Login.Client()
|
|
opts := gitea.ListIssueCommentOptions{ListOptions: flags.GetListOptions(ctx.Command)}
|
|
|
|
mergedBy := ""
|
|
if pr.MergedBy != nil {
|
|
mergedBy = pr.MergedBy.UserName
|
|
}
|
|
|
|
pullSlice := pullData{
|
|
ID: pr.ID,
|
|
Index: pr.Index,
|
|
Title: pr.Title,
|
|
State: pr.State,
|
|
Created: pr.Created,
|
|
Updated: pr.Updated,
|
|
User: username(pr.Poster),
|
|
Body: pr.Body,
|
|
Labels: buildDetailLabels(pr.Labels),
|
|
Assignees: buildDetailAssignees(pr.Assignees),
|
|
URL: pr.HTMLURL,
|
|
Base: pr.Base.Ref,
|
|
Head: pr.Head.Ref,
|
|
HeadSha: pr.Head.Sha,
|
|
DiffURL: pr.DiffURL,
|
|
Mergeable: pr.Mergeable,
|
|
HasMerged: pr.HasMerged,
|
|
MergedAt: pr.Merged,
|
|
MergedBy: mergedBy,
|
|
ClosedAt: pr.Closed,
|
|
Reviews: buildDetailReviews(reviews),
|
|
Comments: make([]pullCommentData, 0),
|
|
}
|
|
|
|
if ctx.Bool("comments") {
|
|
comments, _, err := c.ListIssueComments(ctx.Owner, ctx.Repo, pr.Index, opts)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
pullSlice.Comments = buildDetailComments(comments)
|
|
}
|
|
|
|
return writeIndentedJSON(ctx.Writer, pullSlice)
|
|
}
|