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 19:11:25 +01:00 · 2026-10-11 17:23:06 +00:00
1 parent 12e415a7a7
commit f02245449b
@@ -0,0 +1,168 @@
+// Copyright 2026 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package app
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"strings"
+
+	"gitea.dev/tea/internal/clierr"
+	"gitea.dev/tea/internal/git"
+	"gitea.dev/tea/internal/services"
+	"gitea.dev/tea/internal/settings"
+	"github.com/spf13/cobra"
+)
+
+func (a *application) pullCleanCommand() *cobra.Command {
+	var ignoreSHA bool
+	cmd := &cobra.Command{Use: "clean <number>", Short: "Delete local and remote feature branches for a closed pull request", Args: argsExact(1), RunE: func(cmd *cobra.Command, args []string) error {
+		n, err := number(args[0])
+		if err != nil {
+			return err
+		}
+		target, err := a.resolve(cmd.Context(), true)
+		if err != nil {
+			return err
+		}
+		snapshot, err := a.deps.Settings.Load()
+		if err != nil {
+			return err
+		}
+		repository, err := (services.Repositories{Client: target.client}).View(cmd.Context(), target.Repo)
+		if err != nil {
+			return err
+		}
+		if repository.DefaultBranch == "" {
+			return clierr.Wrap(clierr.Usage, errors.New("repository has no default branch; cannot clean while checked out on the feature branch"))
+		}
+		pull, err := (services.Pulls{Client: target.client, Repository: target.Repo}).View(cmd.Context(), n)
+		if err != nil {
+			return err
+		}
+		if pull.State == "open" {
+			return errors.New("pull request is still open; close or merge it before cleaning branches")
+		}
+		if pull.Head == "" {
+			return errors.New("Gitea did not return the pull request head branch")
+		}
+		if !ignoreSHA && pull.HeadSHA == "" {
+			return errors.New("Gitea did not return the pull request head commit; retry with --ignore-sha")
+		}
+		matchingRemotes, err := a.remotesForRepositoryURLs(cmd.Context(), target.hosts(), pull.HeadCloneURL, pull.HeadSSHURL, pull.HeadRepo)
+		if err != nil {
+			return err
+		}
+		localBranch, remote, err := git.FindCleanBranch(cmd.Context(), a.deps.Git, git.FindCleanBranchOptions{
+			Directory: a.options.cwd, HeadSHA: pull.HeadSHA, HeadBranch: pull.Head, IgnoreSHA: ignoreSHA, DefaultBranch: repository.DefaultBranch,
+			PreferredNames: []string{fmt.Sprintf("pr/%d", n)}, MatchingRemotes: matchingRemotes,
+		})
+		if err != nil {
+			return clierr.Wrap(clierr.Usage, err)
+		}
+		deleteRemote := !pull.HeadRemoteDeleted && pull.HeadCanPush
+		if deleteRemote && remote == "" {
+			switch len(matchingRemotes) {
+			case 0:
+				return clierr.Wrap(clierr.Usage, errors.New("no Git remote matches the pull request head repository; add it before deleting the remote branch"))
+			case 1:
+				remote = matchingRemotes[0]
+			default:
+				return clierr.Wrap(clierr.Usage, errors.New("multiple Git remotes match the pull request head repository; select --remote"))
+			}
+		}
+		if a.options.remote != "" {
+			if deleteRemote && remote != "" && remote != a.options.remote {
+				return clierr.Wrap(clierr.Usage, errors.New("selected --remote does not match the pull request head remote"))
+			}
+			if remote == "" {
+				remote = a.options.remote
+			}
+		}
+		var credentialArgs []string
+		if deleteRemote {
+			if credentialArgs, err = a.remoteCredentials(cmd.Context(), target, remote); err != nil {
+				return err
+			}
+		}
+		description := fmt.Sprintf("Delete local branch %q for pull request %s#%d", localBranch, target.Repo, n)
+		if ignoreSHA {
+			description += " (matched by name; local commits not in the pull request are lost)"
+		}
+		if deleteRemote {
+			description += fmt.Sprintf(" and remote branch %q", remote+"/"+pull.Head)
+		}
+		if err := a.confirm(cmd, description); err != nil {
+			return err
+		}
+		result, err := git.CleanPull(cmd.Context(), a.deps.Git, git.CleanOptions{
+			Directory: a.options.cwd, DefaultBranch: repository.DefaultBranch, LocalBranch: localBranch,
+			Remote: remote, RemoteBranch: pull.Head, CredentialArgs: credentialArgs,
+			Prompt: a.policy(snapshot).CanPrompt(a.deps.Streams), DeleteRemote: deleteRemote,
+		})
+		if err != nil {
+			return err
+		}
+		if a.options.json != "" {
+			return a.writeJSON(cmd, result)
+		}
+		_, err = fmt.Fprintf(cmd.OutOrStdout(), "Deleted local branch %s\n", result.LocalBranch)
+		if err != nil {
+			return err
+		}
+		if result.RemoteDeleted {
+			_, err = fmt.Fprintf(cmd.OutOrStdout(), "Deleted remote branch %s/%s\n", result.Remote, result.RemoteBranch)
+			return err
+		}
+		if result.RemoteSkipped {
+			_, err = fmt.Fprintf(cmd.ErrOrStderr(), "%s\n", result.RemoteSkipReason)
+			return err
+		}
+		return nil
+	}}
+	cmd.Flags().BoolVar(&ignoreSHA, "ignore-sha", false, "Find the local branch by name instead of commit hash")
+	return cmd
+}
+
+func (a *application) remotesForRepositoryURLs(ctx context.Context, hosts map[string]settings.Host, cloneURL, sshURL, fullName string) ([]string, error) {
+	names, err := a.git(ctx, "remote")
+	if err != nil {
+		return nil, err
+	}
+	wanted := map[string]bool{}
+	addWanted := func(host, repo string) {
+		wanted[host+"\t"+strings.ToLower(repo)] = true
+	}
+	for _, raw := range []string{cloneURL, sshURL} {
+		if raw == "" {
+			continue
+		}
+		host, repo, err := settings.RepositoryURL(raw, hosts)
+		if err != nil {
+			continue
+		}
+		addWanted(host, repo)
+	}
+	if fullName != "" {
+		for host := range hosts {
+			addWanted(host, fullName)
+		}
+	}
+	matches := []string{}
+	for name := range strings.FieldsSeq(names) {
+		raw, err := a.git(ctx, "remote", "get-url", name)
+		if err != nil {
+			return nil, err
+		}
+		host, repo, err := settings.RepositoryURL(raw, hosts)
+		if err != nil {
+			continue
+		}
+		if wanted[host+"\t"+strings.ToLower(repo)] {
+			matches = append(matches, name)
+		}
+	}
+	return matches, nil
+}