mirror of
https://gitea.com/gitea/tea.git
synced 2026-10-26 19:11:25 +01:00
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>
175 lines
7.6 KiB
Go
175 lines
7.6 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package git
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
type checkoutRunner struct {
|
|
calls []string
|
|
dirty, collision bool
|
|
localCommit string
|
|
diverged bool
|
|
}
|
|
|
|
func (r *checkoutRunner) Output(_ context.Context, dir string, prompt bool, args ...string) (string, error) {
|
|
if dir != "/work" || prompt {
|
|
return "", fmt.Errorf("unexpected Git execution policy")
|
|
}
|
|
command := strings.Join(args, " ")
|
|
r.calls = append(r.calls, command)
|
|
switch args[0] {
|
|
case "merge-base":
|
|
if r.diverged {
|
|
return "", &CommandError{ExitCode: 1}
|
|
}
|
|
case "rev-parse":
|
|
if len(args) > 2 && strings.HasPrefix(args[2], "refs/heads/") && r.localCommit != "" {
|
|
return r.localCommit, nil
|
|
}
|
|
if args[1] == "--is-inside-work-tree" {
|
|
return "true", nil
|
|
}
|
|
return "abc123", nil
|
|
case "status":
|
|
if r.dirty {
|
|
return "?? file", nil
|
|
}
|
|
case "for-each-ref":
|
|
if r.collision {
|
|
return "refs/heads/pr/7", nil
|
|
}
|
|
}
|
|
return "", nil
|
|
}
|
|
|
|
func TestPullCheckoutValidatesBeforeChangingGitState(t *testing.T) {
|
|
options := CheckoutOptions{Directory: "/work", Remote: "origin", Number: 7, Branch: "pr/7"}
|
|
for _, tc := range []struct {
|
|
dirty, collision bool
|
|
message string
|
|
}{{true, false, "working tree has changes"}, {false, true, "already exists"}} {
|
|
runner := &checkoutRunner{dirty: tc.dirty, collision: tc.collision}
|
|
_, err := CheckoutPull(context.Background(), runner, options)
|
|
require.ErrorContains(t, err, tc.message)
|
|
for _, call := range runner.calls {
|
|
require.False(t, strings.HasPrefix(call, "fetch "))
|
|
require.False(t, strings.HasPrefix(call, "switch "))
|
|
}
|
|
}
|
|
runner := &checkoutRunner{}
|
|
result, err := CheckoutPull(context.Background(), runner, options)
|
|
require.NoError(t, err)
|
|
require.Equal(t, CheckoutResult{Branch: "pr/7", Commit: "abc123", Remote: "origin"}, result)
|
|
require.Equal(t, []string{"rev-parse --is-inside-work-tree", "check-ref-format --branch pr/7", "status --porcelain=v1 --untracked-files=normal", "for-each-ref --format=%(refname) refs/heads/", "fetch --quiet --no-tags -- origin refs/pull/7/head", "rev-parse --verify FETCH_HEAD^{commit}", "switch --quiet --create pr/7 abc123", "config branch.pr/7.tea-pr 7", "config branch.pr/7.tea-base-remote origin"}, runner.calls)
|
|
}
|
|
|
|
func TestPullCheckoutRejectsChangedHead(t *testing.T) {
|
|
runner := &checkoutRunner{}
|
|
_, err := CheckoutPull(context.Background(), runner, CheckoutOptions{Directory: "/work", Remote: "origin", Number: 7, Branch: "pr/7", ExpectedCommit: "different"})
|
|
require.ErrorContains(t, err, "PR head changed")
|
|
for _, call := range runner.calls {
|
|
require.False(t, strings.HasPrefix(call, "switch "))
|
|
}
|
|
}
|
|
|
|
func TestPullCheckoutScopesCredentialArgumentsToFetch(t *testing.T) {
|
|
runner := &checkoutRunner{}
|
|
arguments := []string{"-c", "credential.https://example.test.helper=!tea-helper"}
|
|
_, err := CheckoutPull(context.Background(), runner, CheckoutOptions{Directory: "/work", Remote: "origin", Number: 7, Branch: "pr/7", CredentialArgs: arguments})
|
|
require.NoError(t, err)
|
|
credentialCalls := 0
|
|
for _, call := range runner.calls {
|
|
if strings.HasPrefix(call, "-c ") {
|
|
credentialCalls++
|
|
require.Equal(t, "-c credential.https://example.test.helper=!tea-helper fetch --quiet --no-tags -- origin refs/pull/7/head", call)
|
|
}
|
|
}
|
|
require.Equal(t, 1, credentialCalls)
|
|
require.Equal(t, []string{"-c", "credential.https://example.test.helper=!tea-helper"}, arguments)
|
|
}
|
|
|
|
func TestDetachedCheckoutDoesNotCreateOrChangeBranches(t *testing.T) {
|
|
runner := &checkoutRunner{collision: true}
|
|
result, err := CheckoutPull(context.Background(), runner, CheckoutOptions{Directory: "/work", Remote: "origin", Number: 7, Detached: true, ExpectedCommit: "abc123"})
|
|
require.NoError(t, err)
|
|
require.Equal(t, CheckoutResult{Detached: true, Commit: "abc123", Remote: "origin"}, result)
|
|
require.Equal(t, "switch --quiet --detach abc123", runner.calls[len(runner.calls)-1])
|
|
for _, call := range runner.calls {
|
|
require.False(t, strings.HasPrefix(call, "config "))
|
|
require.False(t, strings.HasPrefix(call, "for-each-ref"))
|
|
require.False(t, strings.HasPrefix(call, "check-ref-format"))
|
|
require.NotContains(t, call, "--create")
|
|
}
|
|
runner = &checkoutRunner{dirty: true}
|
|
_, err = CheckoutPull(context.Background(), runner, CheckoutOptions{Directory: "/work", Remote: "origin", Number: 7, Detached: true})
|
|
require.ErrorContains(t, err, "working tree has changes")
|
|
for _, call := range runner.calls {
|
|
require.False(t, strings.HasPrefix(call, "fetch "))
|
|
require.False(t, strings.HasPrefix(call, "switch "))
|
|
}
|
|
runner = &checkoutRunner{}
|
|
_, err = CheckoutPull(context.Background(), runner, CheckoutOptions{Directory: "/work", Remote: "origin", Number: 7, Detached: true, Branch: "existing"})
|
|
require.ErrorContains(t, err, "cannot select a branch")
|
|
require.Empty(t, runner.calls)
|
|
}
|
|
|
|
func TestPullCheckoutReusesMatchingBranch(t *testing.T) {
|
|
runner := &checkoutRunner{collision: true}
|
|
result, err := CheckoutPull(context.Background(), runner, CheckoutOptions{Directory: "/work", Remote: "origin", Number: 7, Branch: "pr/7", ExpectedCommit: "abc123"})
|
|
require.NoError(t, err)
|
|
require.Equal(t, "abc123", result.Commit)
|
|
require.Contains(t, runner.calls, "rev-parse --verify refs/heads/pr/7^{commit}")
|
|
require.Equal(t, "switch --quiet pr/7", runner.calls[len(runner.calls)-3])
|
|
runner = &checkoutRunner{collision: true}
|
|
_, err = CheckoutPull(context.Background(), runner, CheckoutOptions{Directory: "/work", Remote: "origin", Number: 7, Branch: "pr/7", ExpectedCommit: "different"})
|
|
require.ErrorContains(t, err, "already exists with a different commit")
|
|
for _, call := range runner.calls {
|
|
require.False(t, strings.HasPrefix(call, "fetch "))
|
|
require.False(t, strings.HasPrefix(call, "switch "))
|
|
}
|
|
}
|
|
|
|
func TestPullCheckoutUpdatesOnlyByFastForward(t *testing.T) {
|
|
for _, diverged := range []bool{false, true} {
|
|
runner := &checkoutRunner{collision: true, localCommit: "previous", diverged: diverged}
|
|
_, err := CheckoutPull(context.Background(), runner, CheckoutOptions{Directory: "/work", Remote: "origin", Number: 7, Branch: "pr/7", ExpectedCommit: "abc123", Update: true})
|
|
require.Contains(t, runner.calls, "merge-base --is-ancestor previous abc123")
|
|
if diverged {
|
|
require.ErrorContains(t, err, "cannot be fast-forwarded")
|
|
for _, call := range runner.calls {
|
|
require.False(t, strings.HasPrefix(call, "switch "))
|
|
require.False(t, strings.HasPrefix(call, "merge "))
|
|
}
|
|
} else {
|
|
require.NoError(t, err)
|
|
require.Equal(t, []string{"switch --quiet pr/7", "merge --ff-only --no-edit abc123"}, runner.calls[len(runner.calls)-4:len(runner.calls)-2])
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestPullCheckoutTracksHeadBranch(t *testing.T) {
|
|
runner := &checkoutRunner{}
|
|
result, err := CheckoutPull(context.Background(), runner, CheckoutOptions{
|
|
Directory: "/work", Remote: "origin", Number: 7, Branch: "pr/7", ExpectedCommit: "abc123",
|
|
HeadRemote: "pulls/bob", HeadBranch: "feature",
|
|
})
|
|
require.NoError(t, err)
|
|
require.Equal(t, CheckoutResult{Branch: "pr/7", Commit: "abc123", Remote: "pulls/bob", Tracking: "pulls/bob/feature"}, result)
|
|
require.Contains(t, runner.calls, "check-ref-format --branch feature")
|
|
require.Contains(t, runner.calls, "fetch --quiet --no-tags -- pulls/bob refs/heads/feature")
|
|
require.Contains(t, runner.calls, "config branch.pr/7.remote pulls/bob")
|
|
require.Contains(t, runner.calls, "config branch.pr/7.merge refs/heads/feature")
|
|
require.Equal(t, []string{"config branch.pr/7.tea-pr 7", "config branch.pr/7.tea-base-remote origin"}, runner.calls[len(runner.calls)-2:])
|
|
for _, call := range runner.calls {
|
|
require.NotContains(t, call, "refs/pull/")
|
|
}
|
|
}
|