mirror of
https://gitea.com/gitea/tea.git
synced 2026-10-26 19:11:25 +01:00
feat(pr): merge with the repository's defaults, ready, gh flags and ✓ lines for pr mutations
pr merge takes the method from the repository's default merge style instead of always merging (D22), accepts gh's --merge, --squash and --rebase next to -s/--method, refuses methods the repository disables, and adds -d/--delete-branch (defaulting to the repository setting), --auto, -t, -b, -F and -e. On a terminal it asks for the method and branch deletion with the defaults preselected, without a picker when the current branch has a pull request. It reports "✓ Squashed and merged pull request alice/x#3 (title)", the deleted remote branch, and switches off and deletes the local head branch; --json returns the merged pull request. Merged, closed and draft pull requests are reported before anything is asked. -s without a value points at --squash. pr checkout names the local branch after the head branch when that name is free or already at the head, falling back to OWNER/BRANCH for forks and pr/NUMBER (D13), fetches and switches quietly, reports "✓ Checked out #1 into feat/one", and has the alias co. pr clean reports what it deleted and that a remote branch was already gone. pr create asks for the title and body, then "What's next?": submit, submit as a draft, add metadata or change the branches, without the AGit question up front or a final confirmation. It pushes an unpushed head with --set-upstream --quiet ("✓ Pushed feat/one to origin"), prints "✓ Created pull request alice/x#9 (title)" and the URL, and adds --fill, --web, the alias new, the gh shorthands, and milestones by title. New tea pr ready [--undo]. pr close and reopen take -c/--comment, close takes -d/--delete-branch, and both say when the pull request already is in that state. pr edit reports "✓ Edited", takes the singular gh reviewer flags (the plurals still work), milestones by title and --remove-milestone. pr diff is colored and paged on a terminal and byte-exact when piped, with --name-only, --color and --web. Every pull request argument accepts #N, URLs and branch names and defaults to the current branch's pull request. Signed-off-by: bircni <bircni@icloud.com>
This commit is contained in:
28 files changed
+1169
-504
No files matched your search
@@ -7,7 +7,6 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
@@ -26,73 +25,73 @@ func TestDefaultPullTitle(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestPullFormMarksRequiredFields(t *testing.T) {
|
||||
func TestPullFormAsksTitleBodyThenWhatsNext(t *testing.T) {
|
||||
known := PullFormChoices{Repo: "alice/x", BaseOwner: "alice", Base: "main", HeadOwner: "alice", HeadBranch: "feature", Title: "Seeded", Body: "Seeded body", AllowMaintainerEdits: true}
|
||||
for _, tc := range []struct {
|
||||
name, input string
|
||||
choices PullFormChoices
|
||||
want, without []string
|
||||
name, input string
|
||||
choices PullFormChoices
|
||||
want PullFormValues
|
||||
err error
|
||||
rendered []string
|
||||
hidden []string
|
||||
}{
|
||||
{
|
||||
"without head", "n\nmain\nalice\nfeature\ny\nTitle\n",
|
||||
PullFormChoices{},
|
||||
[]string{"Target branch (required):", "Source branch (required):", "Title (required):"},
|
||||
nil,
|
||||
name: "submit", input: "Seeded\n\n1\n", choices: known,
|
||||
want: PullFormValues{IssueFormValues: IssueFormValues{Title: "Seeded", Body: "Seeded body"}, Base: "main", Head: "feature", Topic: "feature", AllowMaintainerEdits: true},
|
||||
rendered: []string{"Creating pull request for feature into main in alice/x", "Title (required):", BodyTitle, "What's next?", "Change branches"},
|
||||
hidden: []string{"Base branch", "AGit", "Issue", "Add metadata"},
|
||||
},
|
||||
{
|
||||
"with head", "n\n\n\n\n\nTitle\n",
|
||||
PullFormChoices{Base: "main", HeadOwner: "alice", HeadBranch: "feature"},
|
||||
[]string{"Source branch:", "Allow maintainers to push to the source branch:"},
|
||||
[]string{"Source branch (required)"},
|
||||
name: "submit as draft", input: "Add login\n\n2\n", choices: known,
|
||||
want: PullFormValues{IssueFormValues: IssueFormValues{Title: "Add login", Body: "Seeded body"}, Base: "main", Head: "feature", Topic: "feature", AllowMaintainerEdits: true, AsDraft: true},
|
||||
},
|
||||
{name: "cancel", input: "Seeded\n\n4\n", choices: known, err: ErrCanceled},
|
||||
{
|
||||
name: "unknown head asks the branches first", input: "main\nn\nbob\nfix-typo\n\n\nFix Typo\n\n1\n", choices: PullFormChoices{Repo: "alice/x", BaseOwner: "alice", Base: "main"},
|
||||
want: PullFormValues{IssueFormValues: IssueFormValues{Title: "Fix Typo"}, Base: "main", Head: "bob:fix-typo"},
|
||||
rendered: []string{"Base branch (required):", "Push through AGit", "Head branch (required):", "Creating pull request for bob:fix-typo into main in alice/x"},
|
||||
},
|
||||
{
|
||||
name: "metadata", input: "Seeded\n\n3\n2\n2026-12-24\n1\n", choices: func() PullFormChoices {
|
||||
c := known
|
||||
c.CanPush, c.Milestones = true, []IssueMilestoneChoice{{Title: "v1.0", ID: 4}}
|
||||
return c
|
||||
}(),
|
||||
want: PullFormValues{IssueFormValues: IssueFormValues{Title: "Seeded", Body: "Seeded body", Milestone: 4, Deadline: mustDueDate(t, "2026-12-24")}, Base: "main", Head: "feature", Topic: "feature", AllowMaintainerEdits: true},
|
||||
rendered: []string{"Add metadata (assignees, labels, milestone, due date)", "Milestone:", "Due date:"},
|
||||
},
|
||||
{"agit", "y\nmain\ntopic\nTitle\n", PullFormChoices{}, []string{"Topic branch (required):"}, nil},
|
||||
} {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
p, rendered := accessiblePrompter(t, tc.input)
|
||||
tc.choices.EditBody = noEdit
|
||||
_, err := p.CreatePull(context.Background(), tc.choices)
|
||||
p, rendered := linePrompter(t, tc.input)
|
||||
values, err := p.CreatePull(context.Background(), tc.choices)
|
||||
if tc.err != nil {
|
||||
require.ErrorIs(t, err, tc.err)
|
||||
return
|
||||
}
|
||||
require.NoError(t, err)
|
||||
for _, want := range tc.want {
|
||||
require.Equal(t, tc.want, values)
|
||||
for _, want := range tc.rendered {
|
||||
require.Contains(t, rendered.String(), want)
|
||||
}
|
||||
for _, unwanted := range tc.without {
|
||||
for _, unwanted := range tc.hidden {
|
||||
require.NotContains(t, rendered.String(), unwanted)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// stagedInput feeds one form's keystrokes per stage. A finished form's canceled read loop can still be inside Read,
|
||||
// and bubbletea drops the byte that Read returns. When a stage runs dry, the finished form's loop blocks first and
|
||||
// the next form's loop second, so the next stage is handed to that second reader and never to the stale one.
|
||||
type stagedInput struct {
|
||||
mu sync.Mutex
|
||||
cur string
|
||||
stages []string
|
||||
idle int
|
||||
}
|
||||
|
||||
func (s *stagedInput) Read(p []byte) (int, error) {
|
||||
s.mu.Lock()
|
||||
for s.cur == "" {
|
||||
s.idle++
|
||||
if s.idle < 2 || len(s.stages) == 0 {
|
||||
s.mu.Unlock()
|
||||
select {} // no more input for this reader; the loop is abandoned with its form
|
||||
}
|
||||
s.cur, s.stages, s.idle = s.stages[0], s.stages[1:], 0
|
||||
}
|
||||
p[0], s.cur = s.cur[0], s.cur[1:]
|
||||
s.mu.Unlock()
|
||||
return 1, nil
|
||||
func mustDueDate(t *testing.T, raw string) *time.Time {
|
||||
t.Helper()
|
||||
due, err := parseDueDate(raw)
|
||||
require.NoError(t, err)
|
||||
return due
|
||||
}
|
||||
|
||||
func TestCreatePullPreservesDraftOnEditorFailure(t *testing.T) {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||
defer cancel()
|
||||
path := filepath.Join(t.TempDir(), "draft.md")
|
||||
called := false
|
||||
p, _ := testPrompter(&stagedInput{cur: "n\r", stages: []string{"main\ralice\rfeature\ry\r", "Title\r"}})
|
||||
values, err := p.CreatePull(ctx, PullFormChoices{
|
||||
p, _ := linePrompter(t, "Title\n")
|
||||
values, err := p.CreatePull(context.Background(), PullFormChoices{
|
||||
BaseOwner: "alice", Base: "main", HeadOwner: "alice", HeadBranch: "feature",
|
||||
EditBody: func(context.Context, string) (Draft, error) {
|
||||
called = true
|
||||
|
||||
Reference in new issue
Block a user