mirror of
https://gitea.com/gitea/tea.git
synced 2026-09-10 15:36:37 -04:00
## Problem `tea pulls create` accepts `--output` (the flag parses successfully) but never reads it — the action always prints glamour-rendered markdown regardless of the requested format. That is a trap for anyone scripting the CLI: `tea pr create --output json | jq .url` quietly feeds jq a markdown document. The current output is also hostile to URL-scraping consumers even without `--output`: glamour autolinks the bare PR URL into an OSC 8 terminal hyperlink, so piped stdout contains ``` \x1b]8;;https://host/owner/repo/pulls/33\x1b\\https://host/owner/repo/pulls/33\x1b]8;;\x1b\\ ``` instead of a plain URL (repro: `tea pr create ... | cat -v`). ## Why the flag parses but does nothing `create` itself does not declare `--output`: its flag set (`IssuePRCreateFlags`) carries no `OutputFlag`. The flag parses anyway because urfave/cli v3 resolves flags through `Command.lookupAppliedFlag`, which searches `appliedFlags` — "local flags for current command **or persistent flags from ancestors**". The parent `pulls` command carries `--output` via `AllDefaultFlags`, so the flag reaches the subcommand's parser while being absent from `create --help` — and was never consulted by the action. ## What this changes - `task.CreatePull` now returns the created `*gitea.PullRequest` instead of printing it. - `runPullsCreate` switches on `--output`, mirroring the existing detail-command precedent (`RunPullsDetails` in `cmd/pulls.go`): `--output json` emits a lean JSON object; any other value (or no flag at all) falls through to the previous `print.PullDetails` rendering, byte-identical to before. - Lean JSON shape, since a freshly created PR has no reviews/comments/CI yet: `index`, `title`, `url`, `state`, `base`, `head`. - `--agit` combined with `--output` now fails fast with an explicit error before any API call or `git push`: the agit flow creates the PR server-side via push and returns no object to print. - The interactive path is untouched — it only triggers when zero flags are set, so `--output` can never be active there. Example: ``` $ tea pr create --output json --title "fix: thing" | jq -r .url https://gitea.example.com/owner/repo/pulls/33 ``` --------- Co-authored-by: Danilo Sousa <code@danilosousa.net> Reviewed-on: https://gitea.com/gitea/tea/pulls/1111 Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: ongolk <238961+ongolk@noreply.gitea.com>
153 lines
2.9 KiB
Go
153 lines
2.9 KiB
Go
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package interact
|
|
|
|
import (
|
|
stdctx "context"
|
|
|
|
gitea "gitea.dev/sdk"
|
|
"gitea.dev/tea/modules/context"
|
|
"gitea.dev/tea/modules/print"
|
|
"gitea.dev/tea/modules/task"
|
|
"gitea.dev/tea/modules/theme"
|
|
|
|
"charm.land/huh/v2"
|
|
)
|
|
|
|
// CreatePull interactively creates a PR
|
|
func CreatePull(requestCtx stdctx.Context, ctx *context.TeaContext) (err error) {
|
|
var (
|
|
base, head string
|
|
allowMaintainerEdits = true
|
|
|
|
agit bool
|
|
)
|
|
|
|
// owner, repo
|
|
if ctx.Owner, ctx.Repo, err = promptRepoSlug(ctx.Owner, ctx.Repo); err != nil {
|
|
return err
|
|
}
|
|
|
|
// base
|
|
if base, err = task.GetDefaultPRBase(requestCtx, ctx.Login, ctx.Owner, ctx.Repo); err != nil {
|
|
return err
|
|
}
|
|
|
|
var headOwner, headBranch string
|
|
validator := huh.ValidateNotEmpty()
|
|
if ctx.LocalRepo != nil {
|
|
headOwner, headBranch, err = task.GetDefaultPRHead(ctx.LocalRepo)
|
|
if err == nil {
|
|
validator = func(string) error { return nil }
|
|
}
|
|
}
|
|
|
|
if err := huh.NewConfirm().
|
|
Title("Do you want to create an agit flow pull request?").
|
|
Value(&agit).
|
|
WithTheme(theme.GetTheme()).
|
|
Run(); err != nil {
|
|
return err
|
|
}
|
|
|
|
if agit {
|
|
var (
|
|
topic string
|
|
baseRemote string
|
|
)
|
|
|
|
topic = headBranch
|
|
|
|
head = "HEAD"
|
|
baseRemote = "origin"
|
|
|
|
if err := huh.NewForm(
|
|
huh.NewGroup(
|
|
huh.NewInput().
|
|
Title("Target branch:").
|
|
Value(&base).
|
|
Validate(huh.ValidateNotEmpty()),
|
|
|
|
huh.NewInput().
|
|
Title("Source repo remote:").
|
|
Value(&baseRemote),
|
|
|
|
huh.NewInput().
|
|
Title("Topic branch:").
|
|
Value(&topic).
|
|
Validate(validator),
|
|
|
|
huh.NewInput().
|
|
Title("Head branch:").
|
|
Value(&head).
|
|
Validate(validator),
|
|
),
|
|
).Run(); err != nil {
|
|
return err
|
|
}
|
|
|
|
opts := gitea.CreateIssueOption{Title: task.GetDefaultPRTitle(head)}
|
|
if err = promptIssueProperties(requestCtx, ctx.Login, ctx.Owner, ctx.Repo, &opts); err != nil {
|
|
return err
|
|
}
|
|
|
|
return task.CreateAgitFlowPull(
|
|
requestCtx,
|
|
ctx,
|
|
baseRemote,
|
|
head,
|
|
base,
|
|
topic,
|
|
&opts,
|
|
PromptPassword,
|
|
)
|
|
}
|
|
|
|
if err := huh.NewForm(
|
|
huh.NewGroup(
|
|
huh.NewInput().
|
|
Title("Target branch:").
|
|
Value(&base).
|
|
Validate(huh.ValidateNotEmpty()),
|
|
|
|
huh.NewInput().
|
|
Title("Source repo owner:").
|
|
Value(&headOwner),
|
|
|
|
huh.NewInput().
|
|
Title("Source branch:").
|
|
Value(&headBranch).
|
|
Validate(validator),
|
|
|
|
huh.NewConfirm().
|
|
Title("Allow maintainers to push to the base branch:").
|
|
Value(&allowMaintainerEdits),
|
|
),
|
|
).Run(); err != nil {
|
|
return err
|
|
}
|
|
|
|
head = task.GetHeadSpec(headOwner, headBranch, ctx.Owner)
|
|
|
|
opts := gitea.CreateIssueOption{Title: task.GetDefaultPRTitle(head)}
|
|
if err = promptIssueProperties(requestCtx, ctx.Login, ctx.Owner, ctx.Repo, &opts); err != nil {
|
|
return err
|
|
}
|
|
|
|
pr, err := task.CreatePull(
|
|
requestCtx,
|
|
ctx,
|
|
base,
|
|
head,
|
|
&allowMaintainerEdits,
|
|
&opts)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
print.PullDetails(pr, nil, nil)
|
|
|
|
return nil
|
|
}
|