feat!: rebuild tea on Cobra with explicit noun/verb commands (#1126)

- **switch tea to the Cobra command tree:** `internal/app` wires the packages from parts 1–4 into explicit noun/verb commands with `--repo`, `--json` / `--jq`, `--sudo` and `--debug`; `main.go` points at it. Build, release and docs tooling (`tools/cli-docs`, Makefile, goreleaser, snap, CI) and README / CONTRIBUTING are updated. - **remove the urfave/cli command tree:** deletes `cmd/`, `modules/`, the old integration tests, contrib completion scripts and the generated `docs/CLI.md`, and drops their dependencies. This commit only deletes. ## Breaking changes This is a breaking release. It requires Gitea 28 or newer; configuration moves to separate `config.yml` and `hosts.yml` files and requires fresh authentication, and command names, aliases, flags and output formats change. `docs/migration-1.0.md` maps every old command, flag and environment variable to its replacement. ## Issues fixes #1118 fixes #1116 fixes #1115 fixes #1094 fixes #1091 fixes #1073 fixes #1052 fixes #1032 fixes #1023 fixes #966 fixes #908 fixes #833 fixes #831 fixes #817 fixes #804 fixes #779 fixes #770 fixes #737 fixes #697 fixes #726 fixes #677 fixes #672 fixes #633 fixes #632 fixes #560 fixes #556 fixes #523 fixes #516 fixes #510 fixes #504 fixes #500 fixes #482 fixes #406 fixes #403 fixes #373 fixes #351 fixes #344 fixes #326 fixes #325 fixes #323 fixes #246 fixes #240 fixes #232 fixes #197 fixes #172 fixes #141 fixes #69 fixes #1110 fixes #569 fixes #480 fixes #666 fixes #670 fixes #457 fixes #643 fixes #498 fixes #490 fixes #1069 fixes #834 fixes #602 fixes #328 fixes #417 fixes #571 fixes #1029 fixes #489 fixes #1050 fixes #162 fixes #430 fixes #1087 fixes #683 Reviewed-on: https://gitea.com/gitea/tea/pulls/1126 Reviewed-by: TheFox0x7 <95654+thefox0x7@noreply.gitea.com>
2026-10-26 11:01:25 +01:00 · 2026-10-11 17:23:06 +00:00
1 parent 12e415a7a7
commit f02245449b
@@ -0,0 +1,116 @@
+// Copyright 2026 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package app
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"strings"
+	"testing"
+
+	"gitea.dev/tea/internal/git"
+	"gitea.dev/tea/internal/settings"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCheckoutRemoteUsesOnlyMatchingRepository(t *testing.T) {
+	deps, _, _ := testDeps(t)
+	deps.Git = &fakeGit{results: map[string]string{
+		"remote": "fork\norigin\nupstream\ntracking", "symbolic-ref --short HEAD": "main", "config --get branch.main.remote": "tracking",
+		"remote get-url fork":     "https://example.org/bob/project.git",
+		"remote get-url origin":   "https://example.org/alice/project.git",
+		"remote get-url upstream": "https://other.example.org/alice/project.git",
+		"remote get-url tracking": "https://example.org/alice/project.git",
+	}}
+	a := &application{deps: deps}
+	snapshot := settings.Snapshot{Preferences: settings.Defaults()}
+	target := target{Host: "https://example.org", Repo: "alice/project"}
+	remote, err := a.checkoutRemote(context.Background(), target, snapshot)
+	require.NoError(t, err)
+	require.Equal(t, "tracking", remote)
+	a.options.remote = "upstream"
+	_, err = a.checkoutRemote(context.Background(), target, snapshot)
+	require.ErrorContains(t, err, "does not match")
+	a.options.remote = "origin"
+	remote, err = a.checkoutRemote(context.Background(), target, snapshot)
+	require.NoError(t, err)
+	require.Equal(t, "origin", remote)
+}
+
+func TestCheckoutSelectedInstanceDisambiguatesSharedSSHRemote(t *testing.T) {
+	deps, _, _ := testDeps(t)
+	deps.Git = &fakeGit{results: map[string]string{
+		"remote": "local\norigin", "symbolic-ref --short HEAD": "main", "config --get branch.main.remote": "origin",
+		"remote get-url local":  "/srv/git/project.git",
+		"remote get-url origin": "ssh://git@git.example.org:2222/alice/project.git",
+	}}
+	a := &application{deps: deps}
+	snapshot := settings.Snapshot{Preferences: settings.Defaults(), Hosts: settings.Hosts{Hosts: map[string]settings.Host{
+		"https://example.org/first":  {SSHHost: "git.example.org:2222"},
+		"https://example.org/second": {SSHHost: "git.example.org:2222"},
+	}}}
+	remote, err := a.checkoutRemote(context.Background(), target{Host: "https://example.org/second", Repo: "alice/project", host: snapshot.Hosts.Hosts["https://example.org/second"]}, snapshot)
+	require.NoError(t, err)
+	require.Equal(t, "origin", remote)
+}
+
+func TestCheckoutMatchesRemoteThroughEnvironmentSSHHost(t *testing.T) {
+	server := newAuthenticatedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/api/v1/repos/alice/project/pulls/7", r.URL.Path)
+		_, _ = fmt.Fprint(w, `{"number":7,"head":{"sha":"abc123","ref":"feature","repo":{"full_name":"alice/project","ssh_url":"git@ssh.example.org:alice/project.git"}}}`)
+	}))
+	defer server.Close()
+	deps, out, _ := testDeps(t)
+	deps.Getenv = serverEnv(server.URL, map[string]string{"GITEA_INSTANCE_SSH_HOST": "ssh.example.org"})
+	deps.Git = &fakeGit{results: map[string]string{
+		"remote": "origin", "remote get-url origin": "git@ssh.example.org:alice/project.git",
+		"rev-parse --is-inside-work-tree": "true", "check-ref-format --branch pr/7": "",
+		"check-ref-format --branch feature":              "",
+		"status --porcelain=v1 --untracked-files=normal": "", "for-each-ref --format=%(refname) refs/heads/": "",
+		"fetch --no-tags -- origin refs/heads/feature": "", "rev-parse --verify FETCH_HEAD^{commit}": "abc123", "switch --create pr/7 abc123": "",
+		"config branch.pr/7.remote origin": "", "config branch.pr/7.merge refs/heads/feature": "",
+	}}
+	require.NoError(t, Execute(context.Background(), deps, []string{"pr", "checkout", "7", "--repo", "alice/project", "--remote", "origin", "--no-input", "--json"}))
+	require.JSONEq(t, `{"branch":"pr/7","commit":"abc123","detached":false,"remote":"origin","tracking":"origin/feature"}`, out.String())
+}
+
+func TestSSHCheckoutUsesAccountKeyOnlyForFetch(t *testing.T) {
+	server := newAuthenticatedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/api/v1/repos/alice/project/pulls/7", r.URL.Path)
+		_, _ = fmt.Fprint(w, `{"number":7,"head":{"sha":"abc123","ref":"feature","repo":{"full_name":"alice/project","clone_url":"https://example.org/alice/project.git","ssh_url":"ssh://git@git.example.org:2222/alice/project.git","permissions":{"push":true}}}}`)
+	}))
+	defer server.Close()
+	deps, out, _ := serverDeps(t, server.URL)
+	configureHost(t, deps, server.URL, settings.Host{User: "alice", SSHHost: "git.example.org:2222", Users: map[string]settings.Account{
+		"alice": {AuthMethod: "token", CredentialStore: "file", SSHKey: "/keys/alice key"},
+		"bob":   {AuthMethod: "token", CredentialStore: "file", SSHKey: "/keys/bob"},
+	}})
+	sshArgs, err := git.SSHArguments("/keys/alice key", false)
+	require.NoError(t, err)
+	fetch := strings.Join(append(sshArgs, "fetch", "--no-tags", "--", "origin", "refs/heads/feature"), " ")
+	runner := &fakeGit{results: map[string]string{
+		"remote": "origin", "remote get-url origin": "ssh://git@git.example.org:2222/alice/project.git",
+		"rev-parse --is-inside-work-tree": "true", "check-ref-format --branch pr/7": "",
+		"check-ref-format --branch feature":              "",
+		"status --porcelain=v1 --untracked-files=normal": "", "for-each-ref --format=%(refname) refs/heads/": "",
+		fetch: "", "rev-parse --verify FETCH_HEAD^{commit}": "abc123", "switch --create pr/7 abc123": "",
+		"config branch.pr/7.remote origin": "", "config branch.pr/7.merge refs/heads/feature": "",
+	}}
+	deps.Git = runner
+	require.NoError(t, Execute(context.Background(), deps, []string{"pr", "checkout", "7", "--repo", "alice/project", "--remote", "origin", "--no-input", "--json"}))
+	require.Contains(t, runner.calls, fetch)
+	require.Contains(t, runner.calls, "config branch.pr/7.remote origin")
+	require.Contains(t, runner.calls, "config branch.pr/7.merge refs/heads/feature")
+	configured := 0
+	for _, call := range runner.calls {
+		if strings.HasPrefix(call, "-c ") {
+			configured++
+			require.Equal(t, fetch, call)
+		}
+	}
+	require.Equal(t, 1, configured)
+	require.False(t, runner.prompt)
+	require.JSONEq(t, `{"branch":"pr/7","commit":"abc123","detached":false,"remote":"origin","tracking":"origin/feature"}`, out.String())
+}