use secrets for s3 info (#530)

Reviewed-on: https://gitea.com/gitea/tea/pulls/535
Reviewed-by: John Olheiser <john+gitea@jolheiser.com>

.devcontainer/devcontainer.json

@@ -1,20 +0,0 @@
-{
-  "name": "Tea DevContainer",
-  "image": "mcr.microsoft.com/devcontainers/go:1.24-bullseye",
-  "features": {
-    "ghcr.io/devcontainers/features/git-lfs:1.2.5": {}
-  },
-  "customizations": {
-    "vscode": {
-      "settings": {},
-      "extensions": [
-        "editorconfig.editorconfig",
-        "golang.go",
-        "stylelint.vscode-stylelint",
-        "DavidAnson.vscode-markdownlint",
-        "ms-azuretools.vscode-docker",
-        "GitHub.vscode-pull-request-github"
-      ]
-    }
-  }
-}

.drone.yml

@@ -0,0 +1,219 @@
+---
+kind: pipeline
+name: default
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: vendor
+  pull: always
+  image: golang:1.18
+  environment:
+    GOPROXY: https://goproxy.io # proxy.golang.org is blocked in China, this proxy is not
+  commands:
+  - make vendor # use vendor folder as cache
+
+- name: build
+  pull: always
+  image: golang:1.18
+  environment:
+    GOPROXY: https://goproxy.io # proxy.golang.org is blocked in China, this proxy is not
+  commands:
+  - make clean
+  - make vet
+  - make lint
+  - make fmt-check
+  - make misspell-check
+  - make build
+  when:
+    event:
+    - push
+    - tag
+    - pull_request
+
+- name: unit-test
+  image: golang:1.18
+  commands:
+  - make unit-test-coverage
+  settings:
+    group: test
+  environment:
+    GOPROXY: https://goproxy.io # proxy.golang.org is blocked in China, this proxy is not
+  when:
+    branch:
+    - main
+    event:
+    - push
+    - pull_request
+
+- name: release-test
+  image: golang:1.18
+  commands:
+  - make test
+  settings:
+    group: test
+  environment:
+    GOPROXY: https://goproxy.io # proxy.golang.org is blocked in China, this proxy is not
+  when:
+    branch:
+    - "release/*"
+    event:
+    - push
+    - pull_request
+
+- name: tag-test
+  pull: always
+  image: golang:1.18
+  commands:
+  - make test
+  settings:
+    group: test
+  environment:
+    GOPROXY: https://goproxy.io # proxy.golang.org is blocked in China, this proxy is not
+  when:
+    event:
+    - tag
+
+- name: static
+  image: golang:1.18
+  environment:
+    GOPROXY: https://goproxy.io # proxy.golang.org is blocked in China, this proxy is not
+  commands:
+  - make release
+  when:
+    event:
+    - push
+    - tag
+
+- name: gpg-sign
+  pull: always
+  image: plugins/gpgsign:1
+  settings:
+    detach_sign: true
+    excludes:
+    - "dist/release/*.sha256"
+    files:
+    - "dist/release/*"
+  environment:
+    GPGSIGN_KEY:
+      from_secret: gpgsign_key
+    GPGSIGN_PASSPHRASE:
+      from_secret: gpgsign_passphrase
+  when:
+    event:
+    - push
+    - tag
+
+- name: tag-release
+  pull: always
+  image: woodpeckerci/plugin-s3:latest
+  settings:
+    acl:
+      from_secret: aws_s3_acl
+    region:
+      from_secret: aws_s3_region
+    bucket:
+      from_secret: aws_s3_bucket
+    endpoint:
+      from_secret: aws_s3_endpoint
+    path_style:
+      from_secret: aws_s3_path_style
+    source: "dist/release/*"
+    strip_prefix: dist/release/
+    target: "/tea/${DRONE_TAG##v}"
+  environment:
+    AWS_ACCESS_KEY_ID:
+      from_secret: aws_access_key_id
+    AWS_SECRET_ACCESS_KEY:
+      from_secret: aws_secret_access_key
+  when:
+    event:
+    - tag
+
+- name: release-branch-release
+  pull: always
+  image: woodpeckerci/plugin-s3:latest
+  settings:
+    acl:
+      from_secret: aws_s3_acl
+    region:
+      from_secret: aws_s3_region
+    bucket:
+      from_secret: aws_s3_bucket
+    endpoint:
+      from_secret: aws_s3_endpoint
+    path_style:
+      from_secret: aws_s3_path_style
+    source: "dist/release/*"
+    strip_prefix: dist/release/
+    target: "/tea/${DRONE_BRANCH##release/v}"
+  environment:
+    AWS_ACCESS_KEY_ID:
+      from_secret: aws_access_key_id
+    AWS_SECRET_ACCESS_KEY:
+      from_secret: aws_secret_access_key
+  when:
+    branch:
+    - "release/*"
+    event:
+    - push
+
+- name: release
+  pull: always
+  image: woodpeckerci/plugin-s3:latest
+  settings:
+    acl:
+      from_secret: aws_s3_acl
+    region:
+      from_secret: aws_s3_region
+    bucket:
+      from_secret: aws_s3_bucket
+    endpoint:
+      from_secret: aws_s3_endpoint
+    path_style:
+      from_secret: aws_s3_path_style
+    source: "dist/release/*"
+    strip_prefix: dist/release/
+    target: /tea/main
+  environment:
+    AWS_ACCESS_KEY_ID:
+      from_secret: aws_access_key_id
+    AWS_SECRET_ACCESS_KEY:
+      from_secret: aws_secret_access_key
+  when:
+    branch:
+    - main
+    event:
+    - push
+
+- name: gitea
+  pull: always
+  image: plugins/gitea-release:1
+  settings:
+    files:
+    - "dist/release/*"
+    base_url: https://gitea.com
+    api_key:
+      from_secret: gitea_token
+  when:
+    event:
+    - tag
+
+- name: discord
+  pull: always
+  image: appleboy/drone-discord:1.0.0
+  environment:
+    DISCORD_WEBHOOK_ID:
+      from_secret: discord_webhook_id
+    DISCORD_WEBHOOK_TOKEN:
+      from_secret: discord_webhook_token
+  when:
+    event:
+    - push
+    - tag
+    - pull_request
+    status:
+    - changed
+    - failure

.envrc

@@ -1 +0,0 @@
-use flake 

.gitea/issue_template/bug.md

@@ -8,7 +8,7 @@ labels:
 
 ### describe your environment
 - tea version used (`tea -v`):
-    - [ ] I also reproduced the issue [with the latest main build](https://dl.gitea.com/tea/main/)
+    - [ ] I also reproduced the issue [with the latest master build](https://dl.gitea.io/tea/master)
 - Gitea version used:
     - [ ] the issue only occurred after updating gitea recently
 - operating system:

.gitea/workflows/release-nightly.yml

@@ -1,76 +0,0 @@
-name: goreleaser
-
-on:
-  push:
-    branches: [ main ]
-
-jobs:
-  goreleaser:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - run: git fetch --force --tags
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: "go.mod"
-      - name: import gpg
-        id: import_gpg
-        uses: crazy-max/ghaction-import-gpg@v6
-        with:
-          gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
-          passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
-      - name: goreleaser
-        uses: goreleaser/goreleaser-action@v6
-        with:
-            distribution: goreleaser-pro
-            version: "~> v1"
-            args: release --nightly
-        env:
-          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
-          AWS_REGION: ${{ secrets.AWS_REGION }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          S3_REGION: ${{ secrets.AWS_REGION }}
-          S3_BUCKET: ${{ secrets.AWS_BUCKET }}
-          GORELEASER_FORCE_TOKEN: 'gitea'
-          GPGSIGN_PASSPHRASE: ${{ secrets.GPGSIGN_PASSPHRASE }}
-          GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
-          GITEA_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-  release-image:
-    runs-on: ubuntu-latest
-    env:
-      DOCKER_ORG: gitea
-      DOCKER_LATEST: nightly
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # all history for all branches and tags
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        env:
-          ACTIONS_RUNTIME_TOKEN: '' # See https://gitea.com/gitea/act_runner/issues/119
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: |
-            linux/amd64
-            linux/arm64
-          push: true
-          tags: |
-            gitea/tea:latest

.gitea/workflows/release-tag.yml

@@ -1,81 +0,0 @@
-name: goreleaser
-
-on: 
-  push:
-    tags:
-      - '*'
-
-jobs:
-  goreleaser:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - run: git fetch --force --tags
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: 'go.mod'
-      - name: import gpg
-        id: import_gpg
-        uses: crazy-max/ghaction-import-gpg@v6
-        with:
-          gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
-          passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
-      - name: goreleaser
-        uses: goreleaser/goreleaser-action@v6
-        with:
-            distribution: goreleaser-pro
-            version: "~> v1"
-            args: release
-        env:
-          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
-          AWS_REGION: ${{ secrets.AWS_REGION }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          S3_REGION: ${{ secrets.AWS_REGION }}
-          S3_BUCKET: ${{ secrets.AWS_BUCKET }}
-          GORELEASER_FORCE_TOKEN: 'gitea'
-          GPGSIGN_PASSPHRASE: ${{ secrets.GPGSIGN_PASSPHRASE }}
-          GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
-          GITEA_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-  release-image:
-    runs-on: ubuntu-latest
-    env:
-      DOCKER_ORG: gitea
-      DOCKER_LATEST: nightly
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # all history for all branches and tags
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Get tag version without v
-        id: get_version
-        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
-
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        env:
-          ACTIONS_RUNTIME_TOKEN: '' # See https://gitea.com/gitea/act_runner/issues/119
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: |
-            linux/amd64
-            linux/arm64
-          push: true
-          tags: |
-            gitea/tea:${{ env.VERSION }}

.gitea/workflows/test-pr.yml

@@ -1,64 +0,0 @@
-name: check-and-test
-
-on:
-  - pull_request
-
-jobs:
-  govulncheck_job:
-    runs-on: ubuntu-latest
-    name: Run govulncheck
-    steps:
-      - id: govulncheck
-        uses: golang/govulncheck-action@v1
-        with:
-          go-version-file: 'go.mod'
-  check-and-test:
-    runs-on: ubuntu-latest
-    env:
-      HTTP_PROXY: ""
-      GITEA_TEA_TEST_URL: "http://gitea:3000"
-      GITEA_TEA_TEST_USERNAME: "test01"
-      GITEA_TEA_TEST_PASSWORD: "test01"
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: 'go.mod'
-      - name: lint and build
-        run: |
-          make clean
-          make vet
-          make lint
-          make fmt-check
-          make misspell-check
-          make docs-check
-          make build
-      - run: curl --noproxy "*" http://gitea:3000/api/v1/version # verify connection to instance
-      - name: test and coverage
-        run: |
-          make test
-          make unit-test-coverage
-    services:
-      gitea:
-        image: docker.gitea.com/gitea:1.24.5
-        cmd:
-          - bash
-          - -c
-          - >-
-            mkdir -p /tmp/conf/
-            && mkdir -p /tmp/data/
-            && echo "I_AM_BEING_UNSAFE_RUNNING_AS_ROOT = true" > /tmp/conf/app.ini
-            && echo "[security]" >> /tmp/conf/app.ini
-            && echo "INTERNAL_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE1NTg4MzY4ODB9.LoKQyK5TN_0kMJFVHWUW0uDAyoGjDP6Mkup4ps2VJN4" >> /tmp/conf/app.ini
-            && echo "INSTALL_LOCK   = true" >> /tmp/conf/app.ini
-            && echo "SECRET_KEY     = 2crAW4UANgvLipDS6U5obRcFosjSJHQANll6MNfX7P0G3se3fKcCwwK3szPyGcbo" >> /tmp/conf/app.ini
-            && echo "PASSWORD_COMPLEXITY = off" >> /tmp/conf/app.ini
-            && echo "[database]" >> /tmp/conf/app.ini
-            && echo "DB_TYPE = sqlite3" >> /tmp/conf/app.ini
-            && echo "[repository]" >> /tmp/conf/app.ini
-            && echo "ROOT = /tmp/data/" >> /tmp/conf/app.ini
-            && echo "[server]" >> /tmp/conf/app.ini
-            && echo "ROOT_URL = http://gitea:3000" >> /tmp/conf/app.ini
-            && gitea migrate -c /tmp/conf/app.ini
-            && gitea admin user create --username=test01 --password=test01 --email=test01@gitea.io --admin=true --must-change-password=false --access-token -c /tmp/conf/app.ini
-            && gitea web -c /tmp/conf/app.ini

.gitignore

@@ -1,6 +1,5 @@
-/tea
+tea
 /gitea-vet
-/gitea-vet.exe
 
 .idea/
 .history/
@@ -8,12 +7,3 @@ dist/
 
 .vscode/
 vendor/
-
-coverage.out
-
-dist/
-
-# Nix-specific
-.direnv/
-result
-result-*

.goreleaser.checksum.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ -z "$1" ]; then
-  echo "usage: $0 <path>"
-  exit 1
-fi
-
-SUM=$(shasum -a 256 "$1" | cut -d' ' -f1)
-BASENAME=$(basename "$1")
-echo -n "${SUM}  ${BASENAME}" > "$1".sha256

.goreleaser.yaml

@@ -1,124 +0,0 @@
-before:
-  hooks:
-    - go mod tidy
-
-builds:
-- env:
-  - CGO_ENABLED=0
-  goos:
-  - darwin
-  - linux
-  - windows
-  - freebsd
-  goarch:
-  - amd64
-  - arm
-  - arm64
-  goarm:
-  - "5"
-  - "6"
-  - "7"
-  ignore:
-    - goos: darwin
-      goarch: arm
-    - goos: darwin
-      goarch: ppc64le
-    - goos: darwin
-      goarch: s390x
-    - goos: windows
-      goarch: ppc64le
-    - goos: windows
-      goarch: s390x
-    - goos: windows
-      goarch: arm
-      goarm: "5"
-    - goos: windows
-      goarch: arm
-      goarm: "6"
-    - goos: windows
-      goarch: arm
-      goarm: "7"
-    - goos: windows
-      goarch: arm64
-    - goos: freebsd
-      goarch: ppc64le
-    - goos: freebsd
-      goarch: s390x
-    - goos: freebsd
-      goarch: arm
-      goarm: "5"
-    - goos: freebsd
-      goarch: arm
-      goarm: "6"
-    - goos: freebsd
-      goarch: arm
-      goarm: "7"
-    - goos: freebsd
-      goarch: arm64
-  flags:
-  - -trimpath
-  ldflags:
-  - -s -w -X code.gitea.io/tea/cmd.Version={{ .Version }}
-  binary: >-
-    {{ .ProjectName }}-
-    {{- .Version }}-
-    {{- .Os }}-
-    {{- if eq .Arch "amd64" }}amd64
-    {{- else if eq .Arch "amd64_v1" }}amd64
-    {{- else if eq .Arch "386" }}386
-    {{- else }}{{ .Arch }}{{ end }}
-    {{- if .Arm }}-{{ .Arm }}{{ end }}
-  no_unique_dist_dir: true
-  hooks:
-    post:
-      - cmd: xz -k -9 {{ .Path }}
-        dir: ./dist/
-      - cmd: sh .goreleaser.checksum.sh {{ .Path }}
-      - cmd: sh .goreleaser.checksum.sh {{ .Path }}.xz
-
-blobs:
-  -
-    provider: s3
-    bucket: "{{ .Env.S3_BUCKET }}"
-    region: "{{ .Env.S3_REGION }}"
-    folder: "tea/{{.Version}}"
-    extra_files:
-      - glob: ./**.xz
-      - glob: ./**.sha256
-
-archives:
-  - format: binary
-    name_template: "{{ .Binary }}"
-    allow_different_binary_count: true
-
-checksum:
-  name_template: 'checksums.txt'
-  extra_files:
-      - glob: ./**.xz
-
-force_token: gitea
-
-signs:
-  -
-    signature: "${artifact}.sig"
-    artifacts: checksum
-    stdin: '{{ .Env.GPGSIGN_PASSPHRASE }}'
-    args: ["--batch", "-u", "{{ .Env.GPG_FINGERPRINT }}", "--output", "${signature}", "--detach-sign", "${artifact}"]
-
-snapshot:
-  name_template: "{{ .Branch }}-devel"
-
-nightly:
-  name_template: "{{ .Branch }}"
-
-gitea_urls:
-  api: https://gitea.com/api/v1
-  download: https://gitea.com
-
-release:
-  extra_files:
-    - glob: ./**.xz
-    - glob: ./**.xz.sha256
-
-# yaml-language-server: $schema=https://goreleaser.com/static/schema-pro.json
-# vim: set ts=2 sw=2 tw=0 fo=cnqoj

CONTRIBUTING.md

@@ -7,6 +7,7 @@
   - [Bug reports](#bug-reports)
   - [Discuss your design](#discuss-your-design)
   - [Testing redux](#testing-redux)
+  - [Vendoring](#vendoring)
   - [Code review](#code-review)
   - [Styleguide](#styleguide)
   - [Sign-off your work](#sign-off-your-work)
@@ -59,6 +60,20 @@ high-level discussions.
 Before sending code out for review, run all the test by executing: `make test`
 Since TEA is an cli tool it should be obvious to test your feature locally first.
 
+## Vendoring
+
+We keep a cached copy of dependencies within the `vendor/` directory,
+managing updates via [dep](https://github.com/golang/dep).
+
+Pull requests should only include `vendor/` updates if they are part of
+the same change, be it a bugfix or a feature addition.
+
+The `vendor/` update needs to be justified as part of the PR description,
+and must be verified by the reviewers and/or merger to always reference
+an existing upstream commit.
+
+You can find more information on how to get started with it on the [dep project website](https://golang.github.io/dep/docs/introduction.html).
+
 ## Code review
 
 Changes to TEA must be reviewed before they are accepted—no matter who
@@ -160,7 +175,7 @@ maintainers](MAINTAINERS). Every PR **MUST** be reviewed by at least
 two maintainers (or owners) before it can get merged. A maintainer
 should be a contributor of Gitea (or Gogs) and contributed at least
 4 accepted PRs. A contributor should apply as a maintainer in the
-[Discord](https://discord.gg/Gitea) #develop channel. The owners
+[Discord](https://discord.gg/NsatcWJ) #develop channel. The owners
 or the team maintainers may invite the contributor. A maintainer
 should spend some time on code reviews. If a maintainer has no
 time to do that, they should apply to leave the maintainers team
@@ -193,7 +208,7 @@ https://help.github.com/articles/securing-your-account-with-two-factor-authentic
 
 After the election, the new owners should proactively agree
 with our [CONTRIBUTING](CONTRIBUTING.md) requirements in the
-[Discord](https://discord.gg/Gitea) #general channel. Below are the
+[Discord](https://discord.gg/NsatcWJ) #general channel. Below are the
 words to speak:
 
 ```
@@ -221,8 +236,8 @@ Code that you contribute should use the standard copyright header:
 
 ```
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 ```
 
 Files in the repository contain copyright from the year they are added

Dockerfile

@@ -1,12 +1,25 @@
-FROM docker.io/chainguard/go:latest AS build
-COPY . /build/
-WORKDIR /build
-RUN make build && mkdir -p /app/.config/tea
+ARG GOVERSION="1.16.2"
 
-FROM docker.io/chainguard/busybox:latest-glibc
-COPY --from=build /build/tea /bin/tea
-COPY --from=build --chown=65532:65532 /app /app
-VOLUME [ "/app" ]
+FROM golang:${GOVERSION}-alpine AS buildenv
+
+ARG GOOS="linux"
+
+COPY . $GOPATH/src/
+WORKDIR $GOPATH/src
+
+RUN	apk add --quiet --no-cache \
+		build-base \
+		make \
+		git && \
+	make clean build STATIC=true
+
+FROM scratch
+ARG VERSION="0.7.0"
+LABEL org.opencontainers.image.title="tea - CLI for Gitea - git with a cup of tea"
+LABEL org.opencontainers.image.description="A command line tool to interact with Gitea servers"
+LABEL org.opencontainers.image.version="${VERSION}"
+LABEL org.opencontainers.image.authors="Tamás Gérczei <tamas@gerczei.eu>"
+LABEL org.opencontainers.image.vendor="The Gitea Authors"
+COPY --from=buildenv /go/src/tea /
 ENV HOME="/app"
-ENTRYPOINT ["/bin/sh", "-c"]
-CMD [ "tea" ]
+ENTRYPOINT ["/tea"]

FEATURE-COMPARISON.md

@@ -0,0 +1,63 @@
+# comparing git forge commandline interfaces
+
+[tea]: https://gitea.com/gitea/tea
+[sip]: https://gitea.com/jolheiser/sip
+[gitlab]: https://github.com/makkes/gitlab-cli
+[glab]: https://github.com/profclems/glab
+[gh]: https://cli.github.com
+
+last update: 2020-12-11
+
+## general
+/ | [tea][tea] | [sip][sip] | [gitlab][gitlab] | [gh][gh]
+-----------------------|:-----:|:-----:|:-----:|:-----:
+forge|gitea|gitea|gitlab|github
+official forge support|✓|✘|✘|✓
+dev status|adding features|maintenance||
+platform|any|any|any|any
+
+## philosophy
+/ | [tea][tea] | [sip][sip] | [gitlab][gitlab] | [gh][gh]
+-----------------------|:-----:|:-----:|:-----:|:-----:
+aims to replace git cli|✘|||✓
+works with decentralization in mind|✓|✓|✓|✘
+per-repo setup needed|✘||✓|✘
+workflow helpers|✓|||
+interactive mode |[(✓)](https://gitea.com/gitea/tea/issues?type=all&state=open&labels=&milestone=0&assignee=0&q=interactive)|✘| |✓
+programmatic mode|✓|||✓
+machine readable output|✓|||
+follows XDG spec|✓|||
+
+## features
+/ | [tea][tea] | [sip][sip] | [gitlab][gitlab] | [gh][gh]
+-----------------------|:-----:|:-----:|:-----:|:-----:
+open web UI|✓|||
+search repos|✓|||
+search issues|✘|✓||
+textual item search filter syntax|✘|✓||
+CRUD repos|[(✓)](https://gitea.com/gitea/tea/issues/239)|||
+CRUD issues|[(✓)](https://gitea.com/gitea/tea/issues/229)|||
+CRUD milestones|[(✓)](https://gitea.com/gitea/tea/issues/246)|||
+CRUD releases|✓|||
+CRUD labels|✓|||
+CRUD PRs|✓|||
+CRUD time tracking|✓|||x
+CRUD orgs|[(✓)](https://gitea.com/gitea/tea/issues/287)|||
+create PRs from local repo|✓|||
+create PRs from remote repo|✓|||
+code review|[u](https://gitea.com/gitea/tea/issues/131)|||
+merge PRs||||
+read comments|[u](https://gitea.com/gitea/tea/issues/172)|||
+post comments||||
+manage CI|✘|✘|✓|
+manage notifications|[(✓)]()|||
+administration|[u](https://gitea.com/gitea/tea/issues/161)|✘||✘
+markdown rendering|✓|||✓
+issue import/export|[u](https://gitea.com/gitea/tea/issues/132)|||
+checkout PRs|✓|||
+
+- ✓: supported
+- (✓): partial support
+- u: upcoming
+- ✘: not supported
+- ?: unknown

LICENSE

@@ -1,4 +1,5 @@
 Copyright (c) 2016 The Gitea Authors
+Copyright (c) 2015 The Gogs Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,10 +1,13 @@
 DIST := dist
+export GO111MODULE=on
+export CGO_ENABLED=0
+
 GO ?= go
 SHASUM ?= shasum -a 256
 
 export PATH := $($(GO) env GOPATH)/bin:$(PATH)
 
-GOFILES := $(shell find . -name "*.go" -type f ! -path "*/bindata.go")
+GOFILES := $(shell find . -name "*.go" -type f ! -path "./vendor/*" ! -path "*/bindata.go")
 GOFMT ?= gofmt -s
 
 ifneq ($(DRONE_TAG),)
@@ -14,7 +17,7 @@ else
 	ifneq ($(DRONE_BRANCH),)
 		VERSION ?= $(subst release/v,,$(DRONE_BRANCH))
 	else
-		VERSION ?= main
+		VERSION ?= master
 	endif
 	TEA_VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
 endif
@@ -22,21 +25,22 @@ TEA_VERSION_TAG ?= $(shell sed 's/+/_/' <<< $(TEA_VERSION))
 
 TAGS ?=
 SDK ?= $(shell $(GO) list -f '{{.Version}}' -m code.gitea.io/sdk/gitea)
-LDFLAGS := -X "code.gitea.io/tea/cmd.Version=$(TEA_VERSION)" -X "code.gitea.io/tea/cmd.Tags=$(TAGS)" -X "code.gitea.io/tea/cmd.SDK=$(SDK)" -s -w
+LDFLAGS := -X "main.Version=$(TEA_VERSION)" -X "main.Tags=$(TAGS)" -X "main.SDK=$(SDK)" -s -w
 
 # override to allow passing additional goflags via make CLI
-override GOFLAGS := $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)'
+override GOFLAGS := $(GOFLAGS) -mod=vendor -tags '$(TAGS)' -ldflags '$(LDFLAGS)'
 
-PACKAGES ?= $(shell $(GO) list ./...)
+PACKAGES ?= $(shell $(GO) list ./... | grep -v /vendor/)
 SOURCES ?= $(shell find . -name "*.go" -type f)
 
 # OS specific vars.
 ifeq ($(OS), Windows_NT)
 	EXECUTABLE := tea.exe
-	VET_TOOL := gitea-vet.exe
 else
 	EXECUTABLE := tea
-	VET_TOOL := gitea-vet
+	ifneq ($(shell uname -s), OpenBSD)
+		override BUILDMODE := -buildmode=pie
+	endif
 endif
 
 .PHONY: all
@@ -44,7 +48,7 @@ all: build
 
 .PHONY: clean
 clean:
-	$(GO) clean -i ./...
+	$(GO) clean -mod=vendor -i ./...
 	rm -rf $(EXECUTABLE) $(DIST)
 
 .PHONY: fmt
@@ -54,22 +58,22 @@ fmt:
 .PHONY: vet
 vet:
 	# Default vet
-	$(GO) vet $(PACKAGES)
+	$(GO) vet -mod=vendor $(PACKAGES)
 	# Custom vet
-	$(GO) build code.gitea.io/gitea-vet
-	$(GO) vet -vettool=$(VET_TOOL) $(PACKAGES)
+	$(GO) build -mod=vendor code.gitea.io/gitea-vet
+	$(GO) vet -vettool=gitea-vet $(PACKAGES)
 
 .PHONY: lint
 lint: install-lint-tools
-	$(GO) run github.com/mgechev/revive@v1.3.2 -config .revive.toml ./... || exit 1
+	revive -config .revive.toml -exclude=./vendor/... ./... || exit 1
 
 .PHONY: misspell-check
 misspell-check: install-lint-tools
-	$(GO) run github.com/client9/misspell/cmd/misspell@latest -error -i unknwon,destory $(GOFILES)
+	misspell -error -i unknwon,destory $(GOFILES)
 
 .PHONY: misspell
 misspell: install-lint-tools
-	$(GO) run github.com/client9/misspell/cmd/misspell@latest -w -i unknwon $(GOFILES)
+	misspell -w -i unknwon $(GOFILES)
 
 .PHONY: fmt-check
 fmt-check:
@@ -81,38 +85,25 @@ fmt-check:
 		exit 1; \
 	fi;
 
-.PHONY: docs
-docs:
-	$(GO) run docs/docs.go --out docs/CLI.md
-
-.PHONY: docs-check
-docs-check:
-	@DIFF=$$($(GO) run docs/docs.go | diff docs/CLI.md -); \
-	if [ -n "$$DIFF" ]; then \
-		echo "Please run 'make docs' and commit the result:"; \
-		echo "$$DIFF"; \
-		exit 1; \
-	fi;
-
 .PHONY: test
 test:
-	$(GO) test -tags='sqlite sqlite_unlock_notify' $(PACKAGES)
+	$(GO) test -mod=vendor -tags='sqlite sqlite_unlock_notify' $(PACKAGES)
 
 .PHONY: unit-test-coverage
 unit-test-coverage:
-	$(GO) test -tags='sqlite sqlite_unlock_notify' -cover -coverprofile coverage.out $(PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1
+	$(GO) test -mod=vendor -tags='sqlite sqlite_unlock_notify' -cover -coverprofile coverage.out $(PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1
 
-.PHONY: tidy
-tidy:
-	$(GO) mod tidy
+.PHONY: vendor
+vendor:
+	$(GO) mod tidy && $(GO) mod vendor
 
 .PHONY: check
 check: test
 
 .PHONY: install
 install: $(SOURCES)
-	@echo "installing to $(shell $(GO) env GOPATH)/bin/$(EXECUTABLE)"
-	$(GO) install -v $(BUILDMODE) $(GOFLAGS)
+	@echo "installing to $(GOPATH)/bin/$(EXECUTABLE)"
+	$(GO) install -v $(BUILDMODE) $(GOFLAGS) 
 
 .PHONY: build
 build: $(EXECUTABLE)
@@ -124,9 +115,37 @@ $(EXECUTABLE): $(SOURCES)
 build-image:
 	docker build --build-arg VERSION=$(TEA_VERSION) -t gitea/tea:$(TEA_VERSION_TAG) .
 
+.PHONY: release
+release: release-dirs install-release-tools release-os release-compress release-check
+
+.PHONY: release-dirs
+release-dirs:
+	mkdir -p $(DIST)/binaries $(DIST)/release
+
+.PHONY: release-os
+release-os:
+	CGO_ENABLED=0 gox -verbose -cgo=false $(GOFLAGS) -osarch='!darwin/386 !darwin/arm' -os="windows linux darwin" -arch="386 amd64 arm arm64" -output="$(DIST)/release/tea-$(VERSION)-{{.OS}}-{{.Arch}}"
+
+.PHONY: release-compress
+release-compress: install-release-tools
+	cd $(DIST)/release/; for file in `find . -type f -name "*"`; do echo "compressing $${file}" && gxz -k -9 $${file}; done;
+
+.PHONY: release-check
+release-check: install-release-tools
+	cd $(DIST)/release/; for file in `find . -type f -name "*"`; do echo "checksumming $${file}" && $(SHASUM) `echo $${file} | sed 's/^..//'` > $${file}.sha256; done;
+
+### tools
+install-release-tools:
+	@hash gox > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
+		$(GO) install github.com/mitchellh/gox@latest; \
+	fi
+	@hash gxz > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
+		$(GO) install github.com/ulikunitz/xz/cmd/gxz@latest; \
+	fi
+
 install-lint-tools:
 	@hash revive > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
-		$(GO) install github.com/mgechev/revive@v1.3.2; \
+		$(GO) install github.com/mgechev/revive@latest; \
 	fi
 	@hash misspell > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		$(GO) install github.com/client9/misspell/cmd/misspell@latest; \

README.md

@@ -1,100 +1,75 @@
-# <img alt='tea logo' src='https://gitea.com/repo-avatars/550-80a3a8c2ab0e2c2d69f296b7f8582485' height="40"/> *T E A*
-fffff
-[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
-[![Release](https://raster.shields.io/badge/dynamic/json.svg?label=release&url=https://gitea.com/api/v1/repos/gitea/tea/releases&query=$[0].tag_name)](https://gitea.com/gitea/tea/releases)
-[![Join the chat at https://img.shields.io/discord/322538954119184384.svg](https://img.shields.io/discord/322538954119184384.svg)](https://discord.gg/Gitea)
-[![Go Report Card](https://goreportcard.com/badge/code.gitea.io/tea)](https://goreportcard.com/report/code.gitea.io/tea) [![GoDoc](https://pkg.go.dev/badge/code.gitea.io/tea?status.svg)](https://godoc.org/code.gitea.io/tea)
-![Tea Release Status](https://gitea.com/gitea/tea/actions/workflows/release-nightly.yml/badge.svg)
-ffff
-## The official CLI for Gitea
+# <img alt='' src='https://gitea.com/repo-avatars/550-80a3a8c2ab0e2c2d69f296b7f8582485' height="40"/> *T E A*
+
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT) [![Release](https://raster.shields.io/badge/dynamic/json.svg?label=release&url=https://gitea.com/api/v1/repos/gitea/tea/releases&query=$[0].tag_name)](https://gitea.com/gitea/tea/releases) [![Build Status](https://drone.gitea.com/api/badges/gitea/tea/status.svg)](https://drone.gitea.com/gitea/tea) [![Join the chat at https://img.shields.io/discord/322538954119184384.svg](https://img.shields.io/discord/322538954119184384.svg)](https://discord.gg/Gitea) [![Go Report Card](https://goreportcard.com/badge/code.gitea.io/tea)](https://goreportcard.com/report/code.gitea.io/tea) [![GoDoc](https://godoc.org/code.gitea.io/tea?status.svg)](https://godoc.org/code.gitea.io/tea)
+
+### The official CLI for Gitea
 
 ![demo gif](./demo.gif)
 
 ```
-NAME:
-  tea - command line tool to interact with Gitea
+   tea - command line tool to interact with Gitea
+   version 0.8.0-preview
 
-USAGE:
-  tea [global options] [command [command options]]
+ USAGE
+   tea command [subcommand] [command options] [arguments...]
 
-VERSION:
-  Version: 0.10.1+15-g8876fe3  golang: 1.25.0  go-sdk: v0.21.0
+ DESCRIPTION
+   tea is a productivity helper for Gitea. It can be used to manage most entities on
+   one or multiple Gitea instances & provides local helpers like 'tea pr checkout'.
+   
+   tea tries to make use of context provided by the repository in $PWD if available.
+   tea works best in a upstream/fork workflow, when the local main branch tracks the
+   upstream repo. tea assumes that local git state is published on the remote before
+   doing operations with tea.    Configuration is persisted in $XDG_CONFIG_HOME/tea.
 
-DESCRIPTION:
-  tea is a productivity helper for Gitea. It can be used to manage most entities on
-  one or multiple Gitea instances & provides local helpers like 'tea pr checkout'.
+ COMMANDS
+   help, h  Shows a list of commands or help for one command
+   ENTITIES:
+     issues, issue, i                  List, create and update issues
+     pulls, pull, pr                   Manage and checkout pull requests
+     labels, label                     Manage issue labels
+     milestones, milestone, ms         List and create milestones
+     releases, release, r              Manage releases
+     times, time, t                    Operate on tracked times of a repository's issues & pulls
+     organizations, organization, org  List, create, delete organizations
+     repos, repo                       Show repository details
+     comment, c                        Add a comment to an issue / pr
+   HELPERS:
+     open, o                         Open something of the repository in web browser
+     notifications, notification, n  Show notifications
+     clone, C                        Clone a repository locally
+   SETUP:
+     logins, login                  Log in to a Gitea server
+     logout                         Log out from a Gitea server
+     shellcompletion, autocomplete  Install shell completion for tea
+     whoami                         Show current logged in user
 
-  tea tries to make use of context provided by the repository in $PWD if available.
-  tea works best in a upstream/fork workflow, when the local main branch tracks the
-  upstream repo. tea assumes that local git state is published on the remote before
-  doing operations with tea.    Configuration is persisted in $XDG_CONFIG_HOME/tea.
+ OPTIONS
+   --help, -h     show help (default: false)
+   --version, -v  print the version (default: false)
 
-COMMANDS:
-  help, h  Shows a list of commands or help for one command
+ EXAMPLES
+   tea login add                       # add a login once to get started
 
-  ENTITIES:
-    issues, issue, i                  List, create and update issues
-    pulls, pull, pr                   Manage and checkout pull requests
-    labels, label                     Manage issue labels
-    milestones, milestone, ms         List and create milestones
-    releases, release, r              Manage releases
-    times, time, t                    Operate on tracked times of a repository's issues & pulls
-    organizations, organization, org  List, create, delete organizations
-    repos, repo                       Show repository details
-    branches, branch, b               Consult branches
-    actions                           Manage repository actions (secrets, variables)
-    comment, c                        Add a comment to an issue / pr
-    webhooks, webhook                 Manage repository webhooks
+   tea pulls                           # list open pulls for the repo in $PWD
+   tea pulls --repo $HOME/foo          # list open pulls for the repo in $HOME/foo
+   tea pulls --remote upstream         # list open pulls for the repo pointed at by
+                                       # your local "upstream" git remote
+   # list open pulls for any gitea repo at the given login instance
+   tea pulls --repo gitea/tea --login gitea.com
 
-  HELPERS:
-    open, o                         Open something of the repository in web browser
-    notifications, notification, n  Show notifications
-    clone, C                        Clone a repository locally
+   tea milestone issues 0.7.0          # view open issues for milestone '0.7.0'
+   tea issue 189                       # view contents of issue 189
+   tea open 189                        # open web ui for issue 189
+   tea open milestones                 # open web ui for milestones
 
-  MISCELLANEOUS:
-    whoami    Show current logged in user
-    admin, a  Operations requiring admin access on the Gitea instance
+   # send gitea desktop notifications every 5 minutes (bash + libnotify)
+   while :; do tea notifications --mine -o simple | xargs -i notify-send {}; sleep 300; done
 
-  SETUP:
-    logins, login  Log in to a Gitea server
-    logout         Log out from a Gitea server
-
-GLOBAL OPTIONS:
-  --debug, --vvv  Enable debug mode (default: false)
-  --help, -h      show help
-  --version, -v   print the version
-
-EXAMPLES
-  tea login add                       # add a login once to get started
-
-  tea pulls                           # list open pulls for the repo in $PWD
-  tea pulls --repo $HOME/foo          # list open pulls for the repo in $HOME/foo
-  tea pulls --remote upstream         # list open pulls for the repo pointed at by
-                                      # your local "upstream" git remote
-  # list open pulls for any gitea repo at the given login instance
-  tea pulls --repo gitea/tea --login gitea.com
-
-  tea milestone issues 0.7.0          # view open issues for milestone '0.7.0'
-  tea issue 189                       # view contents of issue 189
-  tea open 189                        # open web ui for issue 189
-  tea open milestones                 # open web ui for milestones
-
-  tea actions secrets list            # list all repository action secrets
-  tea actions secrets create API_KEY  # create a new secret (will prompt for value)
-  tea actions variables list          # list all repository action variables
-  tea actions variables set API_URL https://api.example.com
-
-  tea webhooks list                   # list repository webhooks
-  tea webhooks list --org myorg       # list organization webhooks
-  tea webhooks create https://example.com/hook --events push,pull_request
-
-  # send gitea desktop notifications every 5 minutes (bash + libnotify)
-  while :; do tea notifications --mine -o simple | xargs -i notify-send {}; sleep 300; done
-
-ABOUT
-  Written & maintained by The Gitea Authors.
-  If you find a bug or want to contribute, we'll welcome you at https://gitea.com/gitea/tea.
-  More info about Gitea itself on https://about.gitea.com.
+ ABOUT
+   Written & maintained by The Gitea Authors.
+   If you find a bug or want to contribute, we'll welcome you at https://gitea.com/gitea/tea.
+   More info about Gitea itself on https://gitea.io.
 ```
 
 - [Compare features with other git forge CLIs](./FEATURE-COMPARISON.md)
@@ -105,68 +80,19 @@ ABOUT
 There are different ways to get `tea`:
 
 1. Install via your system package manager:
-    - macOS via `brew` (official):
+    - macOS via `brew` (gitea-maintained):
       ```sh
+      brew tap gitea/tap https://gitea.com/gitea/homebrew-gitea
       brew install tea
       ```
-    - arch linux ([tea](https://archlinux.org/packages/extra/x86_64/tea/), thirdparty)
+    - arch linux ([gitea-tea-git](https://aur.archlinux.org/packages/gitea-tea-git), thirdparty)
     - alpine linux ([tea](https://pkgs.alpinelinux.org/packages?name=tea&branch=edge), thirdparty)
-    - Windows via `MSYS2` ([tea](https://packages.msys2.org/base/mingw-w64-tea), thirdparty)
 
-2. Use the prebuilt binaries from [dl.gitea.com](https://dl.gitea.com/tea/)
+2. Use the prebuilt binaries from [dl.gitea.io](https://dl.gitea.io/tea/)
 
 3. Install from source: [see *Compilation*](#compilation)
 
-4. Docker: [Tea at docker hub](https://hub.docker.com/r/gitea/tea)
-
-### Log in to Gitea from tea
-
-Gitea can use many different authentication schemes, and not every authentication method will work with every Gitea deployment. When you are a Gitea instance administrator you can tweak your settings to fit your use case. For the method that is most likely to work with any Gitea deployment use the following steps:
-
-1. Open your Gitea instance in a web browser
-
-2. Log in to Gitea in your web browser. Any MFA, IDP, or whatever else should be available this way.
-
-3. In your "user settings", generate an application token with at least **user read** permissions. If you want to do anything useful with the token add additional permissions/scopes.
-
-4. Run `tea login add`, select **application token** authentication when asked for authentication type, and answer **yes** to the question if you have a token. Paste the generated token when asked for one.
-
-You should now be logged in to your gitea instance from tea.
-
-Since 0.10 Gitea supports the much simpler oauth workflow but oauth may not be available on all Gitea deployments, and gets much more complex when running tea on a remote system.
-
-### Shell completion
-
-If you installed from source or the package does not provide the completions with it you can add them yourself with `tea completion <shell>` command which is not visible in help. To generate the completions run one of the following commands depending on your shell.
-
-```shell
-# .bashrc
-source <(tea completion bash)
-
-# .zshrc
-source <(tea completion zsh)
-
-# fish
-tea completion fish > ~/.config/fish/completions/tea.fish
-
-# Powershell
-Output the script to path/to/autocomplete/tea.ps1 an run it.
-```
-
-### Man Page
-
-The hidden command `tea man` can be used to generate the `tea` man page.
-
-```shell
-# for bash or zsh
-man <(tea man)
-
-# for fish
-man (tea man | psub)
-
-# write man page to a file
-tea man --out ./tea.man
-```
+4. Docker (thirdparty): [tgerczei/tea](https://hub.docker.com/r/tgerczei/tea)
 
 ## Compilation
 
@@ -179,15 +105,10 @@ Make sure you have a current go version installed (1.13 or newer).
   make
   ```
   Note that GNU Make (gmake on OpenBSD) is required.
-  If you want to install the compiled program you have to execute the following command:
-  ```sh
-  make install
-  ```
-  This installs the binary into the "bin" folder inside of your GOPATH folder (`go env GOPATH`). It is possible that this folder isn't in your PATH Environment Variable. 
 
-- For a quick installation without `git` & `make`, set $version and exec:
+- For a quick installation without `git` & `make`:
   ```sh
-  go install code.gitea.io/tea@${version}
+  go install code.gitea.io/tea@latest
   ```
 
 ## Contributing
@@ -196,6 +117,7 @@ Fork -> Patch -> Push -> Pull Request
 
 - `make test` run testsuite
 - `make vet`  run checks (check the order of imports; preventing failure on CI pipeline beforehand)
+- `make vendor` when adding new dependencies
 - ... (for other development tasks, check the `Makefile`)
 
 **Please** read the [CONTRIBUTING](CONTRIBUTING.md) documentation, it will tell you about internal structures and concepts.

build.go

@@ -1,6 +1,6 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 //go:build vendor
 // +build vendor
 

cmd/actions.go

@@ -1,46 +0,0 @@
-// Copyright 2024 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package cmd
-
-import (
-	stdctx "context"
-
-	"code.gitea.io/tea/cmd/actions"
-
-	"github.com/urfave/cli/v3"
-)
-
-// CmdActions represents the actions command for managing Gitea Actions
-var CmdActions = cli.Command{
-	Name:        "actions",
-	Aliases:     []string{"action"},
-	Category:    catEntities,
-	Usage:       "Manage repository actions",
-	Description: "Manage repository actions including secrets, variables, and workflows",
-	Action:      runActionsDefault,
-	Commands: []*cli.Command{
-		&actions.CmdActionsSecrets,
-		&actions.CmdActionsVariables,
-	},
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:  "repo",
-			Usage: "repository to operate on",
-		},
-		&cli.StringFlag{
-			Name:  "login",
-			Usage: "gitea login instance to use",
-		},
-		&cli.StringFlag{
-			Name:    "output",
-			Aliases: []string{"o"},
-			Usage:   "output format [table, csv, simple, tsv, yaml, json]",
-		},
-	},
-}
-
-func runActionsDefault(ctx stdctx.Context, cmd *cli.Command) error {
-	// Default to showing help
-	return cli.ShowCommandHelp(ctx, cmd, "actions")
-}

cmd/actions/secrets.go

@@ -1,30 +0,0 @@
-// Copyright 2024 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package actions
-
-import (
-	stdctx "context"
-
-	"code.gitea.io/tea/cmd/actions/secrets"
-
-	"github.com/urfave/cli/v3"
-)
-
-// CmdActionsSecrets represents the actions secrets command
-var CmdActionsSecrets = cli.Command{
-	Name:        "secrets",
-	Aliases:     []string{"secret"},
-	Usage:       "Manage repository action secrets",
-	Description: "Manage secrets used by repository actions and workflows",
-	Action:      runSecretsDefault,
-	Commands: []*cli.Command{
-		&secrets.CmdSecretsList,
-		&secrets.CmdSecretsCreate,
-		&secrets.CmdSecretsDelete,
-	},
-}
-
-func runSecretsDefault(ctx stdctx.Context, cmd *cli.Command) error {
-	return secrets.RunSecretsList(ctx, cmd)
-}

cmd/actions/secrets/create.go

@@ -1,96 +0,0 @@
-// Copyright 2024 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package secrets
-
-import (
-	stdctx "context"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"syscall"
-
-	"code.gitea.io/tea/cmd/flags"
-	"code.gitea.io/tea/modules/context"
-
-	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
-	"golang.org/x/term"
-)
-
-// CmdSecretsCreate represents a sub command to create action secrets
-var CmdSecretsCreate = cli.Command{
-	Name:        "create",
-	Aliases:     []string{"add", "set"},
-	Usage:       "Create an action secret",
-	Description: "Create a secret for use in repository actions and workflows",
-	ArgsUsage:   "<secret-name> [secret-value]",
-	Action:      runSecretsCreate,
-	Flags: append([]cli.Flag{
-		&cli.StringFlag{
-			Name:  "file",
-			Usage: "read secret value from file",
-		},
-		&cli.BoolFlag{
-			Name:  "stdin",
-			Usage: "read secret value from stdin",
-		},
-	}, flags.AllDefaultFlags...),
-}
-
-func runSecretsCreate(ctx stdctx.Context, cmd *cli.Command) error {
-	if cmd.Args().Len() == 0 {
-		return fmt.Errorf("secret name is required")
-	}
-
-	c := context.InitCommand(cmd)
-	client := c.Login.Client()
-
-	secretName := cmd.Args().First()
-	var secretValue string
-
-	// Determine how to get the secret value
-	if cmd.String("file") != "" {
-		// Read from file
-		content, err := os.ReadFile(cmd.String("file"))
-		if err != nil {
-			return fmt.Errorf("failed to read file: %w", err)
-		}
-		secretValue = strings.TrimSpace(string(content))
-	} else if cmd.Bool("stdin") {
-		// Read from stdin
-		content, err := io.ReadAll(os.Stdin)
-		if err != nil {
-			return fmt.Errorf("failed to read from stdin: %w", err)
-		}
-		secretValue = strings.TrimSpace(string(content))
-	} else if cmd.Args().Len() >= 2 {
-		// Use provided argument
-		secretValue = cmd.Args().Get(1)
-	} else {
-		// Interactive prompt (hidden input)
-		fmt.Printf("Enter secret value for '%s': ", secretName)
-		byteValue, err := term.ReadPassword(int(syscall.Stdin))
-		if err != nil {
-			return fmt.Errorf("failed to read secret value: %w", err)
-		}
-		fmt.Println() // Add newline after hidden input
-		secretValue = string(byteValue)
-	}
-
-	if secretValue == "" {
-		return fmt.Errorf("secret value cannot be empty")
-	}
-
-	_, err := client.CreateRepoActionSecret(c.Owner, c.Repo, gitea.CreateSecretOption{
-		Name: secretName,
-		Data: secretValue,
-	})
-	if err != nil {
-		return err
-	}
-
-	fmt.Printf("Secret '%s' created successfully\n", secretName)
-	return nil
-}

cmd/actions/secrets/create_test.go

@@ -1,56 +0,0 @@
-// Copyright 2025 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package secrets
-
-import (
-	"testing"
-)
-
-func TestGetSecretSourceArgs(t *testing.T) {
-	tests := []struct {
-		name    string
-		args    []string
-		wantErr bool
-	}{
-		{
-			name:    "valid args",
-			args:    []string{"VALID_SECRET", "secret_value"},
-			wantErr: false,
-		},
-		{
-			name:    "missing name",
-			args:    []string{},
-			wantErr: true,
-		},
-		{
-			name:    "too many args",
-			args:    []string{"SECRET_NAME", "value", "extra"},
-			wantErr: true,
-		},
-		{
-			name:    "invalid secret name",
-			args:    []string{"invalid_secret", "value"},
-			wantErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Test argument validation only
-			if len(tt.args) == 0 {
-				if !tt.wantErr {
-					t.Error("Expected error for empty args")
-				}
-				return
-			}
-
-			if len(tt.args) > 2 {
-				if !tt.wantErr {
-					t.Error("Expected error for too many args")
-				}
-				return
-			}
-		})
-	}
-}

cmd/actions/secrets/delete.go

@@ -1,60 +0,0 @@
-// Copyright 2024 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package secrets
-
-import (
-	stdctx "context"
-	"fmt"
-
-	"code.gitea.io/tea/cmd/flags"
-	"code.gitea.io/tea/modules/context"
-
-	"github.com/urfave/cli/v3"
-)
-
-// CmdSecretsDelete represents a sub command to delete action secrets
-var CmdSecretsDelete = cli.Command{
-	Name:        "delete",
-	Aliases:     []string{"remove", "rm"},
-	Usage:       "Delete an action secret",
-	Description: "Delete a secret used by repository actions",
-	ArgsUsage:   "<secret-name>",
-	Action:      runSecretsDelete,
-	Flags: append([]cli.Flag{
-		&cli.BoolFlag{
-			Name:    "confirm",
-			Aliases: []string{"y"},
-			Usage:   "confirm deletion without prompting",
-		},
-	}, flags.AllDefaultFlags...),
-}
-
-func runSecretsDelete(ctx stdctx.Context, cmd *cli.Command) error {
-	if cmd.Args().Len() == 0 {
-		return fmt.Errorf("secret name is required")
-	}
-
-	c := context.InitCommand(cmd)
-	client := c.Login.Client()
-
-	secretName := cmd.Args().First()
-
-	if !cmd.Bool("confirm") {
-		fmt.Printf("Are you sure you want to delete secret '%s'? [y/N] ", secretName)
-		var response string
-		fmt.Scanln(&response)
-		if response != "y" && response != "Y" && response != "yes" {
-			fmt.Println("Deletion cancelled.")
-			return nil
-		}
-	}
-
-	_, err := client.DeleteRepoActionSecret(c.Owner, c.Repo, secretName)
-	if err != nil {
-		return err
-	}
-
-	fmt.Printf("Secret '%s' deleted successfully\n", secretName)
-	return nil
-}

cmd/actions/secrets/delete_test.go

@@ -1,93 +0,0 @@
-// Copyright 2025 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package secrets
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestSecretsDeleteValidation(t *testing.T) {
-	tests := []struct {
-		name    string
-		args    []string
-		wantErr bool
-	}{
-		{
-			name:    "valid secret name",
-			args:    []string{"VALID_SECRET"},
-			wantErr: false,
-		},
-		{
-			name:    "no args",
-			args:    []string{},
-			wantErr: true,
-		},
-		{
-			name:    "too many args",
-			args:    []string{"SECRET1", "SECRET2"},
-			wantErr: true,
-		},
-		{
-			name:    "invalid secret name but client does not validate",
-			args:    []string{"invalid_secret"},
-			wantErr: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := validateDeleteArgs(tt.args)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("validateDeleteArgs() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}
-
-func TestSecretsDeleteFlags(t *testing.T) {
-	cmd := CmdSecretsDelete
-
-	// Test command properties
-	if cmd.Name != "delete" {
-		t.Errorf("Expected command name 'delete', got %s", cmd.Name)
-	}
-
-	// Check that rm is one of the aliases
-	hasRmAlias := false
-	for _, alias := range cmd.Aliases {
-		if alias == "rm" {
-			hasRmAlias = true
-			break
-		}
-	}
-	if !hasRmAlias {
-		t.Error("Expected 'rm' to be one of the aliases for delete command")
-	}
-
-	if cmd.ArgsUsage != "<secret-name>" {
-		t.Errorf("Expected ArgsUsage '<secret-name>', got %s", cmd.ArgsUsage)
-	}
-
-	if cmd.Usage == "" {
-		t.Error("Delete command should have usage text")
-	}
-
-	if cmd.Description == "" {
-		t.Error("Delete command should have description")
-	}
-}
-
-// validateDeleteArgs validates arguments for the delete command
-func validateDeleteArgs(args []string) error {
-	if len(args) == 0 {
-		return fmt.Errorf("secret name is required")
-	}
-
-	if len(args) > 1 {
-		return fmt.Errorf("only one secret name allowed")
-	}
-
-	return nil
-}

cmd/actions/secrets/list.go

@@ -1,44 +0,0 @@
-// Copyright 2024 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package secrets
-
-import (
-	stdctx "context"
-
-	"code.gitea.io/tea/cmd/flags"
-	"code.gitea.io/tea/modules/context"
-	"code.gitea.io/tea/modules/print"
-
-	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
-)
-
-// CmdSecretsList represents a sub command to list action secrets
-var CmdSecretsList = cli.Command{
-	Name:        "list",
-	Aliases:     []string{"ls"},
-	Usage:       "List action secrets",
-	Description: "List secrets configured for repository actions",
-	Action:      RunSecretsList,
-	Flags: append([]cli.Flag{
-		&flags.PaginationPageFlag,
-		&flags.PaginationLimitFlag,
-	}, flags.AllDefaultFlags...),
-}
-
-// RunSecretsList list action secrets
-func RunSecretsList(ctx stdctx.Context, cmd *cli.Command) error {
-	c := context.InitCommand(cmd)
-	client := c.Login.Client()
-
-	secrets, _, err := client.ListRepoActionSecret(c.Owner, c.Repo, gitea.ListRepoActionSecretOption{
-		ListOptions: flags.GetListOptions(),
-	})
-	if err != nil {
-		return err
-	}
-
-	print.ActionSecretsList(secrets, c.Output)
-	return nil
-}

cmd/actions/secrets/list_test.go

@@ -1,63 +0,0 @@
-// Copyright 2025 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package secrets
-
-import (
-	"testing"
-)
-
-func TestSecretsListFlags(t *testing.T) {
-	cmd := CmdSecretsList
-
-	// Test that required flags exist
-	expectedFlags := []string{"output", "remote", "login", "repo"}
-
-	for _, flagName := range expectedFlags {
-		found := false
-		for _, flag := range cmd.Flags {
-			if flag.Names()[0] == flagName {
-				found = true
-				break
-			}
-		}
-
-		if !found {
-			t.Errorf("Expected flag %s not found in CmdSecretsList", flagName)
-		}
-	}
-
-	// Test command properties
-	if cmd.Name != "list" {
-		t.Errorf("Expected command name 'list', got %s", cmd.Name)
-	}
-
-	if len(cmd.Aliases) == 0 || cmd.Aliases[0] != "ls" {
-		t.Errorf("Expected alias 'ls' for list command")
-	}
-
-	if cmd.Usage == "" {
-		t.Error("List command should have usage text")
-	}
-
-	if cmd.Description == "" {
-		t.Error("List command should have description")
-	}
-}
-
-func TestSecretsListValidation(t *testing.T) {
-	// Basic validation that the command accepts the expected arguments
-	// More detailed testing would require mocking the Gitea client
-
-	// Test that list command doesn't require arguments
-	args := []string{}
-	if len(args) > 0 {
-		t.Error("List command should not require arguments")
-	}
-
-	// Test that extra arguments are ignored
-	extraArgs := []string{"extra", "args"}
-	if len(extraArgs) > 0 {
-		// This is fine - list commands typically ignore extra args
-	}
-}

cmd/actions/variables.go

@@ -1,30 +0,0 @@
-// Copyright 2024 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package actions
-
-import (
-	stdctx "context"
-
-	"code.gitea.io/tea/cmd/actions/variables"
-
-	"github.com/urfave/cli/v3"
-)
-
-// CmdActionsVariables represents the actions variables command
-var CmdActionsVariables = cli.Command{
-	Name:        "variables",
-	Aliases:     []string{"variable", "vars", "var"},
-	Usage:       "Manage repository action variables",
-	Description: "Manage variables used by repository actions and workflows",
-	Action:      runVariablesDefault,
-	Commands: []*cli.Command{
-		&variables.CmdVariablesList,
-		&variables.CmdVariablesSet,
-		&variables.CmdVariablesDelete,
-	},
-}
-
-func runVariablesDefault(ctx stdctx.Context, cmd *cli.Command) error {
-	return variables.RunVariablesList(ctx, cmd)
-}

cmd/actions/variables/delete.go

@@ -1,60 +0,0 @@
-// Copyright 2024 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package variables
-
-import (
-	stdctx "context"
-	"fmt"
-
-	"code.gitea.io/tea/cmd/flags"
-	"code.gitea.io/tea/modules/context"
-
-	"github.com/urfave/cli/v3"
-)
-
-// CmdVariablesDelete represents a sub command to delete action variables
-var CmdVariablesDelete = cli.Command{
-	Name:        "delete",
-	Aliases:     []string{"remove", "rm"},
-	Usage:       "Delete an action variable",
-	Description: "Delete a variable used by repository actions",
-	ArgsUsage:   "<variable-name>",
-	Action:      runVariablesDelete,
-	Flags: append([]cli.Flag{
-		&cli.BoolFlag{
-			Name:    "confirm",
-			Aliases: []string{"y"},
-			Usage:   "confirm deletion without prompting",
-		},
-	}, flags.AllDefaultFlags...),
-}
-
-func runVariablesDelete(ctx stdctx.Context, cmd *cli.Command) error {
-	if cmd.Args().Len() == 0 {
-		return fmt.Errorf("variable name is required")
-	}
-
-	c := context.InitCommand(cmd)
-	client := c.Login.Client()
-
-	variableName := cmd.Args().First()
-
-	if !cmd.Bool("confirm") {
-		fmt.Printf("Are you sure you want to delete variable '%s'? [y/N] ", variableName)
-		var response string
-		fmt.Scanln(&response)
-		if response != "y" && response != "Y" && response != "yes" {
-			fmt.Println("Deletion cancelled.")
-			return nil
-		}
-	}
-
-	_, err := client.DeleteRepoActionVariable(c.Owner, c.Repo, variableName)
-	if err != nil {
-		return err
-	}
-
-	fmt.Printf("Variable '%s' deleted successfully\n", variableName)
-	return nil
-}

cmd/actions/variables/delete_test.go

@@ -1,98 +0,0 @@
-// Copyright 2025 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package variables
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestVariablesDeleteValidation(t *testing.T) {
-	tests := []struct {
-		name    string
-		args    []string
-		wantErr bool
-	}{
-		{
-			name:    "valid variable name",
-			args:    []string{"VALID_VARIABLE"},
-			wantErr: false,
-		},
-		{
-			name:    "valid lowercase name",
-			args:    []string{"valid_variable"},
-			wantErr: false,
-		},
-		{
-			name:    "no args",
-			args:    []string{},
-			wantErr: true,
-		},
-		{
-			name:    "too many args",
-			args:    []string{"VARIABLE1", "VARIABLE2"},
-			wantErr: true,
-		},
-		{
-			name:    "invalid variable name",
-			args:    []string{"invalid-variable"},
-			wantErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := validateVariableDeleteArgs(tt.args)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("validateVariableDeleteArgs() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}
-
-func TestVariablesDeleteFlags(t *testing.T) {
-	cmd := CmdVariablesDelete
-
-	// Test command properties
-	if cmd.Name != "delete" {
-		t.Errorf("Expected command name 'delete', got %s", cmd.Name)
-	}
-
-	// Check that rm is one of the aliases
-	hasRmAlias := false
-	for _, alias := range cmd.Aliases {
-		if alias == "rm" {
-			hasRmAlias = true
-			break
-		}
-	}
-	if !hasRmAlias {
-		t.Error("Expected 'rm' to be one of the aliases for delete command")
-	}
-
-	if cmd.ArgsUsage != "<variable-name>" {
-		t.Errorf("Expected ArgsUsage '<variable-name>', got %s", cmd.ArgsUsage)
-	}
-
-	if cmd.Usage == "" {
-		t.Error("Delete command should have usage text")
-	}
-
-	if cmd.Description == "" {
-		t.Error("Delete command should have description")
-	}
-}
-
-// validateVariableDeleteArgs validates arguments for the delete command
-func validateVariableDeleteArgs(args []string) error {
-	if len(args) == 0 {
-		return fmt.Errorf("variable name is required")
-	}
-
-	if len(args) > 1 {
-		return fmt.Errorf("only one variable name allowed")
-	}
-
-	return validateVariableName(args[0])
-}

cmd/actions/variables/list.go

@@ -1,55 +0,0 @@
-// Copyright 2024 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package variables
-
-import (
-	stdctx "context"
-	"fmt"
-
-	"code.gitea.io/tea/cmd/flags"
-	"code.gitea.io/tea/modules/context"
-	"code.gitea.io/tea/modules/print"
-
-	"github.com/urfave/cli/v3"
-)
-
-// CmdVariablesList represents a sub command to list action variables
-var CmdVariablesList = cli.Command{
-	Name:        "list",
-	Aliases:     []string{"ls"},
-	Usage:       "List action variables",
-	Description: "List variables configured for repository actions",
-	Action:      RunVariablesList,
-	Flags: append([]cli.Flag{
-		&cli.StringFlag{
-			Name:  "name",
-			Usage: "show specific variable by name",
-		},
-	}, flags.AllDefaultFlags...),
-}
-
-// RunVariablesList list action variables
-func RunVariablesList(ctx stdctx.Context, cmd *cli.Command) error {
-	c := context.InitCommand(cmd)
-	client := c.Login.Client()
-
-	if name := cmd.String("name"); name != "" {
-		// Get specific variable
-		variable, _, err := client.GetRepoActionVariable(c.Owner, c.Repo, name)
-		if err != nil {
-			return err
-		}
-
-		print.ActionVariableDetails(variable)
-		return nil
-	}
-
-	// List all variables - Note: SDK doesn't have ListRepoActionVariables yet
-	// This is a limitation of the current SDK
-	fmt.Println("Note: Listing all variables is not yet supported by the Gitea SDK.")
-	fmt.Println("Use 'tea actions variables list --name <variable-name>' to get a specific variable.")
-	fmt.Println("You can also check your repository's Actions settings in the web interface.")
-
-	return nil
-}

cmd/actions/variables/list_test.go

@@ -1,63 +0,0 @@
-// Copyright 2025 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package variables
-
-import (
-	"testing"
-)
-
-func TestVariablesListFlags(t *testing.T) {
-	cmd := CmdVariablesList
-
-	// Test that required flags exist
-	expectedFlags := []string{"output", "remote", "login", "repo"}
-
-	for _, flagName := range expectedFlags {
-		found := false
-		for _, flag := range cmd.Flags {
-			if flag.Names()[0] == flagName {
-				found = true
-				break
-			}
-		}
-
-		if !found {
-			t.Errorf("Expected flag %s not found in CmdVariablesList", flagName)
-		}
-	}
-
-	// Test command properties
-	if cmd.Name != "list" {
-		t.Errorf("Expected command name 'list', got %s", cmd.Name)
-	}
-
-	if len(cmd.Aliases) == 0 || cmd.Aliases[0] != "ls" {
-		t.Errorf("Expected alias 'ls' for list command")
-	}
-
-	if cmd.Usage == "" {
-		t.Error("List command should have usage text")
-	}
-
-	if cmd.Description == "" {
-		t.Error("List command should have description")
-	}
-}
-
-func TestVariablesListValidation(t *testing.T) {
-	// Basic validation that the command accepts the expected arguments
-	// More detailed testing would require mocking the Gitea client
-
-	// Test that list command doesn't require arguments
-	args := []string{}
-	if len(args) > 0 {
-		t.Error("List command should not require arguments")
-	}
-
-	// Test that extra arguments are ignored
-	extraArgs := []string{"extra", "args"}
-	if len(extraArgs) > 0 {
-		// This is fine - list commands typically ignore extra args
-	}
-}

cmd/actions/variables/set.go

@@ -1,117 +0,0 @@
-// Copyright 2024 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package variables
-
-import (
-	stdctx "context"
-	"fmt"
-	"io"
-	"os"
-	"regexp"
-	"strings"
-
-	"code.gitea.io/tea/cmd/flags"
-	"code.gitea.io/tea/modules/context"
-
-	"github.com/urfave/cli/v3"
-)
-
-// CmdVariablesSet represents a sub command to set action variables
-var CmdVariablesSet = cli.Command{
-	Name:        "set",
-	Aliases:     []string{"create", "update"},
-	Usage:       "Set an action variable",
-	Description: "Set a variable for use in repository actions and workflows",
-	ArgsUsage:   "<variable-name> [variable-value]",
-	Action:      runVariablesSet,
-	Flags: append([]cli.Flag{
-		&cli.StringFlag{
-			Name:  "file",
-			Usage: "read variable value from file",
-		},
-		&cli.BoolFlag{
-			Name:  "stdin",
-			Usage: "read variable value from stdin",
-		},
-	}, flags.AllDefaultFlags...),
-}
-
-func runVariablesSet(ctx stdctx.Context, cmd *cli.Command) error {
-	if cmd.Args().Len() == 0 {
-		return fmt.Errorf("variable name is required")
-	}
-
-	c := context.InitCommand(cmd)
-	client := c.Login.Client()
-
-	variableName := cmd.Args().First()
-	var variableValue string
-
-	// Determine how to get the variable value
-	if cmd.String("file") != "" {
-		// Read from file
-		content, err := os.ReadFile(cmd.String("file"))
-		if err != nil {
-			return fmt.Errorf("failed to read file: %w", err)
-		}
-		variableValue = strings.TrimSpace(string(content))
-	} else if cmd.Bool("stdin") {
-		// Read from stdin
-		content, err := io.ReadAll(os.Stdin)
-		if err != nil {
-			return fmt.Errorf("failed to read from stdin: %w", err)
-		}
-		variableValue = strings.TrimSpace(string(content))
-	} else if cmd.Args().Len() >= 2 {
-		// Use provided argument
-		variableValue = cmd.Args().Get(1)
-	} else {
-		// Interactive prompt
-		fmt.Printf("Enter variable value for '%s': ", variableName)
-		var input string
-		fmt.Scanln(&input)
-		variableValue = input
-	}
-
-	if variableValue == "" {
-		return fmt.Errorf("variable value cannot be empty")
-	}
-
-	_, err := client.CreateRepoActionVariable(c.Owner, c.Repo, variableName, variableValue)
-	if err != nil {
-		return err
-	}
-
-	fmt.Printf("Variable '%s' set successfully\n", variableName)
-	return nil
-}
-
-// validateVariableName validates that a variable name follows the required format
-func validateVariableName(name string) error {
-	if name == "" {
-		return fmt.Errorf("variable name cannot be empty")
-	}
-
-	// Variable names can contain letters (upper/lower), numbers, and underscores
-	// Cannot start with a number
-	// Cannot contain spaces or special characters (except underscore)
-	validPattern := regexp.MustCompile(`^[A-Za-z_][A-Za-z0-9_]*$`)
-	if !validPattern.MatchString(name) {
-		return fmt.Errorf("variable name must contain only letters, numbers, and underscores, and cannot start with a number")
-	}
-
-	return nil
-}
-
-// validateVariableValue validates that a variable value is acceptable
-func validateVariableValue(value string) error {
-	// Variables can be empty or contain whitespace, unlike secrets
-
-	// Check for maximum size (64KB limit)
-	if len(value) > 65536 {
-		return fmt.Errorf("variable value cannot exceed 64KB")
-	}
-
-	return nil
-}

cmd/actions/variables/set_test.go

@@ -1,213 +0,0 @@
-// Copyright 2025 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package variables
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestValidateVariableName(t *testing.T) {
-	tests := []struct {
-		name    string
-		input   string
-		wantErr bool
-	}{
-		{
-			name:    "valid name",
-			input:   "VALID_VARIABLE_NAME",
-			wantErr: false,
-		},
-		{
-			name:    "valid name with numbers",
-			input:   "VARIABLE_123",
-			wantErr: false,
-		},
-		{
-			name:    "valid lowercase",
-			input:   "valid_variable",
-			wantErr: false,
-		},
-		{
-			name:    "valid mixed case",
-			input:   "Mixed_Case_Variable",
-			wantErr: false,
-		},
-		{
-			name:    "invalid - spaces",
-			input:   "INVALID VARIABLE",
-			wantErr: true,
-		},
-		{
-			name:    "invalid - special chars",
-			input:   "INVALID-VARIABLE!",
-			wantErr: true,
-		},
-		{
-			name:    "invalid - starts with number",
-			input:   "1INVALID",
-			wantErr: true,
-		},
-		{
-			name:    "invalid - empty",
-			input:   "",
-			wantErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := validateVariableName(tt.input)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("validateVariableName(%q) error = %v, wantErr %v", tt.input, err, tt.wantErr)
-			}
-		})
-	}
-}
-
-func TestGetVariableSourceArgs(t *testing.T) {
-	tests := []struct {
-		name    string
-		args    []string
-		wantErr bool
-	}{
-		{
-			name:    "valid args",
-			args:    []string{"VALID_VARIABLE", "variable_value"},
-			wantErr: false,
-		},
-		{
-			name:    "valid lowercase",
-			args:    []string{"valid_variable", "value"},
-			wantErr: false,
-		},
-		{
-			name:    "missing name",
-			args:    []string{},
-			wantErr: true,
-		},
-		{
-			name:    "too many args",
-			args:    []string{"VARIABLE_NAME", "value", "extra"},
-			wantErr: true,
-		},
-		{
-			name:    "invalid variable name",
-			args:    []string{"invalid-variable", "value"},
-			wantErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Test argument validation only
-			if len(tt.args) == 0 {
-				if !tt.wantErr {
-					t.Error("Expected error for empty args")
-				}
-				return
-			}
-
-			if len(tt.args) > 2 {
-				if !tt.wantErr {
-					t.Error("Expected error for too many args")
-				}
-				return
-			}
-
-			// Test variable name validation
-			err := validateVariableName(tt.args[0])
-			if (err != nil) != tt.wantErr {
-				t.Errorf("validateVariableName() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}
-
-func TestVariableNameValidation(t *testing.T) {
-	// Test that variable names follow GitHub Actions/Gitea Actions conventions
-	validNames := []string{
-		"VALID_VARIABLE",
-		"API_URL",
-		"DATABASE_HOST",
-		"VARIABLE_123",
-		"mixed_Case_Variable",
-		"lowercase_variable",
-		"UPPERCASE_VARIABLE",
-	}
-
-	invalidNames := []string{
-		"Invalid-Dashes",
-		"INVALID SPACES",
-		"123_STARTS_WITH_NUMBER",
-		"",           // Empty
-		"INVALID!@#", // Special chars
-	}
-
-	for _, name := range validNames {
-		t.Run("valid_"+name, func(t *testing.T) {
-			err := validateVariableName(name)
-			if err != nil {
-				t.Errorf("validateVariableName(%q) should be valid, got error: %v", name, err)
-			}
-		})
-	}
-
-	for _, name := range invalidNames {
-		t.Run("invalid_"+name, func(t *testing.T) {
-			err := validateVariableName(name)
-			if err == nil {
-				t.Errorf("validateVariableName(%q) should be invalid, got no error", name)
-			}
-		})
-	}
-}
-
-func TestVariableValueValidation(t *testing.T) {
-	tests := []struct {
-		name    string
-		value   string
-		wantErr bool
-	}{
-		{
-			name:    "valid value",
-			value:   "variable123",
-			wantErr: false,
-		},
-		{
-			name:    "valid complex value",
-			value:   "https://api.example.com/v1",
-			wantErr: false,
-		},
-		{
-			name:    "valid multiline value",
-			value:   "line1\nline2\nline3",
-			wantErr: false,
-		},
-		{
-			name:    "empty value allowed",
-			value:   "",
-			wantErr: false, // Variables can be empty unlike secrets
-		},
-		{
-			name:    "whitespace only allowed",
-			value:   "   \t\n   ",
-			wantErr: false, // Variables can contain whitespace
-		},
-		{
-			name:    "very long value",
-			value:   strings.Repeat("a", 65537), // Over 64KB
-			wantErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := validateVariableValue(tt.value)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("validateVariableValue() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}

cmd/admin.go

@@ -1,15 +1,14 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package cmd
 
 import (
-	stdctx "context"
-
 	"code.gitea.io/tea/cmd/admin/users"
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/print"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdAdmin represents the namespace of admin commands.
@@ -19,10 +18,10 @@ var CmdAdmin = cli.Command{
 	Usage:    "Operations requiring admin access on the Gitea instance",
 	Aliases:  []string{"a"},
 	Category: catMisc,
-	Action: func(_ stdctx.Context, cmd *cli.Command) error {
+	Action: func(cmd *cli.Context) error {
 		return cli.ShowSubcommandHelp(cmd)
 	},
-	Commands: []*cli.Command{
+	Subcommands: []*cli.Command{
 		&cmdAdminUsers,
 	},
 }
@@ -31,19 +30,19 @@ var cmdAdminUsers = cli.Command{
 	Name:    "users",
 	Aliases: []string{"u"},
 	Usage:   "Manage registered users",
-	Action: func(ctx stdctx.Context, cmd *cli.Command) error {
-		if cmd.Args().Len() == 1 {
-			return runAdminUserDetail(ctx, cmd, cmd.Args().First())
+	Action: func(ctx *cli.Context) error {
+		if ctx.Args().Len() == 1 {
+			return runAdminUserDetail(ctx, ctx.Args().First())
 		}
-		return users.RunUserList(ctx, cmd)
+		return users.RunUserList(ctx)
 	},
-	Commands: []*cli.Command{
+	Subcommands: []*cli.Command{
 		&users.CmdUserList,
 	},
 	Flags: users.CmdUserList.Flags,
 }
 
-func runAdminUserDetail(_ stdctx.Context, cmd *cli.Command, u string) error {
+func runAdminUserDetail(cmd *cli.Context, u string) error {
 	ctx := context.InitCommand(cmd)
 	client := ctx.Login.Client()
 	user, _, err := client.GetUserInfo(u)

cmd/admin/users/list.go

@@ -1,17 +1,16 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package users
 
 import (
-	stdctx "context"
-
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/print"
 
 	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 var userFieldsFlag = flags.FieldsFlag(print.UserFields, []string{
@@ -33,7 +32,7 @@ var CmdUserList = cli.Command{
 }
 
 // RunUserList list users
-func RunUserList(_ stdctx.Context, cmd *cli.Command) error {
+func RunUserList(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 
 	fields, err := userFieldsFlag.GetValues(cmd)
@@ -43,7 +42,7 @@ func RunUserList(_ stdctx.Context, cmd *cli.Command) error {
 
 	client := ctx.Login.Client()
 	users, _, err := client.AdminListUsers(gitea.AdminListUsersOptions{
-		ListOptions: flags.GetListOptions(),
+		ListOptions: ctx.GetListOptions(),
 	})
 	if err != nil {
 		return err

cmd/attachments.go

@@ -1,28 +0,0 @@
-// Copyright 2024 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package cmd
-
-import (
-	"code.gitea.io/tea/cmd/attachments"
-	"code.gitea.io/tea/cmd/flags"
-
-	"github.com/urfave/cli/v3"
-)
-
-// CmdReleaseAttachments represents a release attachment (file attachment)
-var CmdReleaseAttachments = cli.Command{
-	Name:        "assets",
-	Aliases:     []string{"asset", "a"},
-	Category:    catEntities,
-	Usage:       "Manage release assets",
-	Description: "Manage release assets",
-	ArgsUsage:   " ", // command does not accept arguments
-	Action:      attachments.RunReleaseAttachmentList,
-	Commands: []*cli.Command{
-		&attachments.CmdReleaseAttachmentList,
-		&attachments.CmdReleaseAttachmentCreate,
-		&attachments.CmdReleaseAttachmentDelete,
-	},
-	Flags: flags.AllDefaultFlags,
-}

cmd/attachments/create.go

@@ -1,65 +0,0 @@
-// Copyright 2024 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package attachments
-
-import (
-	stdctx "context"
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"code.gitea.io/tea/cmd/flags"
-	"code.gitea.io/tea/modules/context"
-
-	"github.com/urfave/cli/v3"
-)
-
-// CmdReleaseAttachmentCreate represents a sub command of Release Attachments to create a release attachment
-var CmdReleaseAttachmentCreate = cli.Command{
-	Name:        "create",
-	Aliases:     []string{"c"},
-	Usage:       "Create one or more release attachments",
-	Description: `Create one or more release attachments`,
-	ArgsUsage:   "<release-tag> <asset> [<asset>...]",
-	Action:      runReleaseAttachmentCreate,
-	Flags:       flags.AllDefaultFlags,
-}
-
-func runReleaseAttachmentCreate(_ stdctx.Context, cmd *cli.Command) error {
-	ctx := context.InitCommand(cmd)
-	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
-	client := ctx.Login.Client()
-
-	if ctx.Args().Len() < 2 {
-		return fmt.Errorf("No release tag or assets specified.\nUsage:\t%s", ctx.Command.UsageText)
-	}
-
-	tag := ctx.Args().First()
-	if len(tag) == 0 {
-		return fmt.Errorf("Release tag needed to create attachment")
-	}
-
-	release, err := getReleaseByTag(ctx.Owner, ctx.Repo, tag, client)
-	if err != nil {
-		return err
-	}
-
-	for _, asset := range ctx.Args().Slice()[1:] {
-		var file *os.File
-		if file, err = os.Open(asset); err != nil {
-			return err
-		}
-
-		filePath := filepath.Base(asset)
-
-		if _, _, err = ctx.Login.Client().CreateReleaseAttachment(ctx.Owner, ctx.Repo, release.ID, file, filePath); err != nil {
-			file.Close()
-			return err
-		}
-
-		file.Close()
-	}
-
-	return nil
-}

cmd/attachments/delete.go

@@ -1,101 +0,0 @@
-// Copyright 2024 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package attachments
-
-import (
-	stdctx "context"
-	"fmt"
-
-	"code.gitea.io/tea/cmd/flags"
-	"code.gitea.io/tea/modules/context"
-
-	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
-)
-
-// CmdReleaseAttachmentDelete represents a sub command of Release Attachments to delete a release attachment
-var CmdReleaseAttachmentDelete = cli.Command{
-	Name:        "delete",
-	Aliases:     []string{"rm"},
-	Usage:       "Delete one or more release attachments",
-	Description: `Delete one or more release attachments`,
-	ArgsUsage:   "<release tag> <attachment name> [<attachment name>...]",
-	Action:      runReleaseAttachmentDelete,
-	Flags: append([]cli.Flag{
-		&cli.BoolFlag{
-			Name:    "confirm",
-			Aliases: []string{"y"},
-			Usage:   "Confirm deletion (required)",
-		},
-	}, flags.AllDefaultFlags...),
-}
-
-func runReleaseAttachmentDelete(_ stdctx.Context, cmd *cli.Command) error {
-	ctx := context.InitCommand(cmd)
-	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
-	client := ctx.Login.Client()
-
-	if ctx.Args().Len() < 2 {
-		return fmt.Errorf("No release tag or attachment names specified.\nUsage:\t%s", ctx.Command.UsageText)
-	}
-
-	tag := ctx.Args().First()
-	if len(tag) == 0 {
-		return fmt.Errorf("Release tag needed to delete attachment")
-	}
-
-	if !ctx.Bool("confirm") {
-		fmt.Println("Are you sure? Please confirm with -y or --confirm.")
-		return nil
-	}
-
-	release, err := getReleaseByTag(ctx.Owner, ctx.Repo, tag, client)
-	if err != nil {
-		return err
-	}
-
-	existing, _, err := client.ListReleaseAttachments(ctx.Owner, ctx.Repo, release.ID, gitea.ListReleaseAttachmentsOptions{
-		ListOptions: gitea.ListOptions{Page: -1},
-	})
-	if err != nil {
-		return err
-	}
-
-	for _, name := range ctx.Args().Slice()[1:] {
-		var attachment *gitea.Attachment
-		for _, a := range existing {
-			if a.Name == name {
-				attachment = a
-			}
-		}
-		if attachment == nil {
-			return fmt.Errorf("Release does not have attachment named '%s'", name)
-		}
-
-		_, err = client.DeleteReleaseAttachment(ctx.Owner, ctx.Repo, release.ID, attachment.ID)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func getReleaseAttachmentByName(owner, repo string, release int64, name string, client *gitea.Client) (*gitea.Attachment, error) {
-	al, _, err := client.ListReleaseAttachments(owner, repo, release, gitea.ListReleaseAttachmentsOptions{
-		ListOptions: gitea.ListOptions{Page: -1},
-	})
-	if err != nil {
-		return nil, err
-	}
-	if len(al) == 0 {
-		return nil, fmt.Errorf("Release does not have any attachments")
-	}
-	for _, a := range al {
-		if a.Name == name {
-			return a, nil
-		}
-	}
-	return nil, fmt.Errorf("Attachment does not exist")
-}

cmd/attachments/list.go

@@ -1,75 +0,0 @@
-// Copyright 2024 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package attachments
-
-import (
-	stdctx "context"
-	"fmt"
-
-	"code.gitea.io/tea/cmd/flags"
-	"code.gitea.io/tea/modules/context"
-	"code.gitea.io/tea/modules/print"
-
-	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
-)
-
-// CmdReleaseAttachmentList represents a sub command of release attachment to list release attachments
-var CmdReleaseAttachmentList = cli.Command{
-	Name:        "list",
-	Aliases:     []string{"ls"},
-	Usage:       "List Release Attachments",
-	Description: "List Release Attachments",
-	ArgsUsage:   "<release-tag>", // command does not accept arguments
-	Action:      RunReleaseAttachmentList,
-	Flags: append([]cli.Flag{
-		&flags.PaginationPageFlag,
-		&flags.PaginationLimitFlag,
-	}, flags.AllDefaultFlags...),
-}
-
-// RunReleaseAttachmentList list release attachments
-func RunReleaseAttachmentList(_ stdctx.Context, cmd *cli.Command) error {
-	ctx := context.InitCommand(cmd)
-	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
-	client := ctx.Login.Client()
-
-	tag := ctx.Args().First()
-	if len(tag) == 0 {
-		return fmt.Errorf("Release tag needed to list attachments")
-	}
-
-	release, err := getReleaseByTag(ctx.Owner, ctx.Repo, tag, client)
-	if err != nil {
-		return err
-	}
-
-	attachments, _, err := ctx.Login.Client().ListReleaseAttachments(ctx.Owner, ctx.Repo, release.ID, gitea.ListReleaseAttachmentsOptions{
-		ListOptions: flags.GetListOptions(),
-	})
-	if err != nil {
-		return err
-	}
-
-	print.ReleaseAttachmentsList(attachments, ctx.Output)
-	return nil
-}
-
-func getReleaseByTag(owner, repo, tag string, client *gitea.Client) (*gitea.Release, error) {
-	rl, _, err := client.ListReleases(owner, repo, gitea.ListReleasesOptions{
-		ListOptions: gitea.ListOptions{Page: -1},
-	})
-	if err != nil {
-		return nil, err
-	}
-	if len(rl) == 0 {
-		return nil, fmt.Errorf("Repo does not have any release")
-	}
-	for _, r := range rl {
-		if r.TagName == tag {
-			return r, nil
-		}
-	}
-	return nil, fmt.Errorf("Release tag does not exist")
-}

cmd/autocomplete.go

@@ -0,0 +1,138 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package cmd
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"os/exec"
+
+	"github.com/adrg/xdg"
+	"github.com/urfave/cli/v2"
+)
+
+// CmdAutocomplete manages autocompletion
+var CmdAutocomplete = cli.Command{
+	Name:        "shellcompletion",
+	Aliases:     []string{"autocomplete"},
+	Category:    catSetup,
+	Usage:       "Install shell completion for tea",
+	Description: "Install shell completion for tea",
+	ArgsUsage:   "<shell type> (bash, zsh, powershell, fish)",
+	Flags: []cli.Flag{
+		&cli.BoolFlag{
+			Name:  "install",
+			Usage: "Persist in shell config instead of printing commands",
+		},
+	},
+	Action: runAutocompleteAdd,
+}
+
+func runAutocompleteAdd(ctx *cli.Context) error {
+	var remoteFile, localFile, cmds string
+	shell := ctx.Args().First()
+
+	switch shell {
+	case "zsh":
+		remoteFile = "contrib/autocomplete.zsh"
+		localFile = "autocomplete.zsh"
+		cmds = "echo 'PROG=tea _CLI_ZSH_AUTOCOMPLETE_HACK=1 source \"%s\"' >> ~/.zshrc && source ~/.zshrc"
+
+	case "bash":
+		remoteFile = "contrib/autocomplete.sh"
+		localFile = "autocomplete.sh"
+		cmds = "echo 'PROG=tea source \"%s\"' >> ~/.bashrc && source ~/.bashrc"
+
+	case "powershell":
+		remoteFile = "contrib/autocomplete.ps1"
+		localFile = "tea.ps1"
+		cmds = "\"& %s\" >> $profile"
+
+	case "fish":
+		// fish is different, in that urfave/cli provides a generator for the shell script needed.
+		// this also means that the fish completion can become out of sync with the tea binary!
+		// writing to this directory suffices, as fish reads files there on startup, no cmds needed.
+		return writeFishAutoCompleteFile(ctx)
+
+	default:
+		return fmt.Errorf("Must specify valid %s", ctx.Command.ArgsUsage)
+	}
+
+	localPath, err := xdg.ConfigFile("tea/" + localFile)
+	if err != nil {
+		return err
+	}
+
+	cmds = fmt.Sprintf(cmds, localPath)
+	if err = writeRemoteAutoCompleteFile(remoteFile, localPath); err != nil {
+		return err
+	}
+
+	if ctx.Bool("install") {
+		fmt.Println("Installing in your shellrc")
+		installer := exec.Command(shell, "-c", cmds)
+		if shell == "powershell" {
+			installer = exec.Command("powershell.exe", "-Command", cmds)
+		}
+		out, err := installer.CombinedOutput()
+		if err != nil {
+			return fmt.Errorf("Couldn't run the commands: %s %s", err, out)
+		}
+	} else {
+		fmt.Println("\n# Run the following commands to install autocompletion (or use --install)")
+		fmt.Println(cmds)
+	}
+
+	return nil
+}
+
+func writeRemoteAutoCompleteFile(file, destPath string) error {
+	url := fmt.Sprintf("https://gitea.com/gitea/tea/raw/branch/master/%s", file)
+	fmt.Println("Fetching " + url)
+
+	res, err := http.Get(url)
+	if err != nil {
+		return err
+	}
+	defer res.Body.Close()
+
+	writer, err := os.Create(destPath)
+	if err != nil {
+		return err
+	}
+	defer writer.Close()
+
+	_, err = io.Copy(writer, res.Body)
+	return err
+}
+
+func writeFishAutoCompleteFile(ctx *cli.Context) error {
+	// NOTE: to make sure this file is in sync with tea commands, we'd need to
+	//   - check if the file exists
+	//   - if it does, check if the tea version that wrote it is the currently running version
+	//   - if not, rewrite the file
+	//   on each application run
+	// NOTE: this generates a completion that also suggests file names, which looks kinda messy..
+	script, err := ctx.App.ToFishCompletion()
+	if err != nil {
+		return err
+	}
+
+	localPath, err := xdg.ConfigFile("fish/conf.d/tea_completion.fish")
+	if err != nil {
+		return err
+	}
+	writer, err := os.Create(localPath)
+	if err != nil {
+		return err
+	}
+	if _, err = io.WriteString(writer, script); err != nil {
+		return err
+	}
+	fmt.Printf("Installed tab completion to %s\n", localPath)
+	return nil
+}

cmd/branches.go

@@ -1,38 +0,0 @@
-// Copyright 2024 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package cmd
-
-import (
-	"context"
-
-	"code.gitea.io/tea/cmd/branches"
-
-	"github.com/urfave/cli/v3"
-)
-
-// CmdBranches represents to login a gitea server.
-var CmdBranches = cli.Command{
-	Name:        "branches",
-	Aliases:     []string{"branch", "b"},
-	Category:    catEntities,
-	Usage:       "Consult branches",
-	Description: `Lists branches when called without argument. If a branch is provided, will show it in detail.`,
-	ArgsUsage:   "[<branch name>]",
-	Action:      runBranches,
-	Commands: []*cli.Command{
-		&branches.CmdBranchesList,
-		&branches.CmdBranchesProtect,
-		&branches.CmdBranchesUnprotect,
-	},
-	Flags: append([]cli.Flag{
-		&cli.BoolFlag{
-			Name:  "comments",
-			Usage: "Whether to display comments (will prompt if not provided & run interactively)",
-		},
-	}, branches.CmdBranchesList.Flags...),
-}
-
-func runBranches(ctx context.Context, cmd *cli.Command) error {
-	return branches.RunBranchesList(ctx, cmd)
-}

cmd/branches/list.go

@@ -1,75 +0,0 @@
-// Copyright 2024 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package branches
-
-import (
-	stdctx "context"
-
-	"code.gitea.io/tea/cmd/flags"
-	"code.gitea.io/tea/modules/context"
-	"code.gitea.io/tea/modules/print"
-
-	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
-)
-
-var branchFieldsFlag = flags.FieldsFlag(print.BranchFields, []string{
-	"name", "protected", "user-can-merge", "user-can-push",
-})
-
-// CmdBranchesListFlags Flags for command list
-var CmdBranchesListFlags = append([]cli.Flag{
-	branchFieldsFlag,
-	&flags.PaginationPageFlag,
-	&flags.PaginationLimitFlag,
-}, flags.AllDefaultFlags...)
-
-// CmdBranchesList represents a sub command of branches to list branches
-var CmdBranchesList = cli.Command{
-	Name:        "list",
-	Aliases:     []string{"ls"},
-	Usage:       "List branches of the repository",
-	Description: `List branches of the repository`,
-	ArgsUsage:   " ", // command does not accept arguments
-	Action:      RunBranchesList,
-	Flags:       CmdBranchesListFlags,
-}
-
-// RunBranchesList list branches
-func RunBranchesList(_ stdctx.Context, cmd *cli.Command) error {
-	ctx := context.InitCommand(cmd)
-	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
-
-	owner := ctx.Owner
-	if ctx.IsSet("owner") {
-		owner = ctx.String("owner")
-	}
-
-	var branches []*gitea.Branch
-	var protections []*gitea.BranchProtection
-	var err error
-	branches, _, err = ctx.Login.Client().ListRepoBranches(owner, ctx.Repo, gitea.ListRepoBranchesOptions{
-		ListOptions: flags.GetListOptions(),
-	})
-
-	if err != nil {
-		return err
-	}
-
-	protections, _, err = ctx.Login.Client().ListBranchProtections(owner, ctx.Repo, gitea.ListBranchProtectionsOptions{
-		ListOptions: flags.GetListOptions(),
-	})
-
-	if err != nil {
-		return err
-	}
-
-	fields, err := branchFieldsFlag.GetValues(cmd)
-	if err != nil {
-		return err
-	}
-
-	print.BranchesList(branches, protections, ctx.Output, fields)
-	return nil
-}

cmd/branches/protect.go

@@ -1,102 +0,0 @@
-// Copyright 2024 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package branches
-
-import (
-	stdctx "context"
-	"fmt"
-
-	"code.gitea.io/tea/cmd/flags"
-	"code.gitea.io/tea/modules/context"
-
-	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
-)
-
-// CmdBranchesProtectFlags Flags for command protect/unprotect
-var CmdBranchesProtectFlags = append([]cli.Flag{
-	branchFieldsFlag,
-	&flags.PaginationPageFlag,
-	&flags.PaginationLimitFlag,
-}, flags.AllDefaultFlags...)
-
-// CmdBranchesProtect represents a sub command of branches to protect a branch
-var CmdBranchesProtect = cli.Command{
-	Name:        "protect",
-	Aliases:     []string{"P"},
-	Usage:       "Protect branches",
-	Description: `Block actions push/merge on specified branches`,
-	ArgsUsage:   "<branch>",
-	Action:      RunBranchesProtect,
-	Flags:       CmdBranchesProtectFlags,
-}
-
-// CmdBranchesUnprotect represents a sub command of branches to protect a branch
-var CmdBranchesUnprotect = cli.Command{
-	Name:        "unprotect",
-	Aliases:     []string{"U"},
-	Usage:       "Unprotect branches",
-	Description: `Suppress existing protections on specified branches`,
-	ArgsUsage:   "<branch>",
-	Action:      RunBranchesProtect,
-	Flags:       CmdBranchesProtectFlags,
-}
-
-// RunBranchesProtect function to protect/unprotect a list of branches
-func RunBranchesProtect(_ stdctx.Context, cmd *cli.Command) error {
-	ctx := context.InitCommand(cmd)
-	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
-
-	if !cmd.Args().Present() {
-		return fmt.Errorf("must specify at least one branch")
-	}
-
-	owner := ctx.Owner
-	if ctx.IsSet("owner") {
-		owner = ctx.String("owner")
-	}
-
-	for _, branch := range ctx.Args().Slice() {
-
-		var err error
-		command := ctx.Command.Name
-		if command == "protect" {
-			_, _, err = ctx.Login.Client().CreateBranchProtection(owner, ctx.Repo, gitea.CreateBranchProtectionOption{
-				BranchName:                    branch,
-				RuleName:                      "",
-				EnablePush:                    false,
-				EnablePushWhitelist:           false,
-				PushWhitelistUsernames:        []string{},
-				PushWhitelistTeams:            []string{},
-				PushWhitelistDeployKeys:       false,
-				EnableMergeWhitelist:          false,
-				MergeWhitelistUsernames:       []string{},
-				MergeWhitelistTeams:           []string{},
-				EnableStatusCheck:             false,
-				StatusCheckContexts:           []string{},
-				RequiredApprovals:             1,
-				EnableApprovalsWhitelist:      false,
-				ApprovalsWhitelistUsernames:   []string{},
-				ApprovalsWhitelistTeams:       []string{},
-				BlockOnRejectedReviews:        false,
-				BlockOnOfficialReviewRequests: false,
-				BlockOnOutdatedBranch:         false,
-				DismissStaleApprovals:         false,
-				RequireSignedCommits:          false,
-				ProtectedFilePatterns:         "",
-				UnprotectedFilePatterns:       "",
-			})
-		} else if command == "unprotect" {
-			_, err = ctx.Login.Client().DeleteBranchProtection(owner, ctx.Repo, branch)
-		} else {
-			return fmt.Errorf("command %s is not supported", command)
-		}
-
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}

cmd/categories.go

@@ -1,5 +1,6 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package cmd
 

cmd/clone.go

@@ -1,22 +1,21 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package cmd
 
 import (
-	stdctx "context"
 	"fmt"
 
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/config"
 	"code.gitea.io/tea/modules/context"
-	"code.gitea.io/tea/modules/debug"
 	"code.gitea.io/tea/modules/git"
 	"code.gitea.io/tea/modules/interact"
 	"code.gitea.io/tea/modules/task"
 	"code.gitea.io/tea/modules/utils"
 
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdRepoClone represents a sub command of repos to create a local copy
@@ -47,18 +46,18 @@ When a host is specified in the repo-slug, it will override the login specified
 	},
 }
 
-func runRepoClone(ctx stdctx.Context, cmd *cli.Command) error {
-	teaCmd := context.InitCommand(cmd)
+func runRepoClone(cmd *cli.Context) error {
+	ctx := context.InitCommand(cmd)
 
-	args := teaCmd.Args()
+	args := ctx.Args()
 	if args.Len() < 1 {
-		return cli.ShowCommandHelp(ctx, cmd, "clone")
+		return cli.ShowCommandHelp(cmd, "clone")
 	}
 	dir := args.Get(1)
 
 	var (
-		login *config.Login = teaCmd.Login
-		owner string        = teaCmd.Login.User
+		login *config.Login = ctx.Login
+		owner string        = ctx.Login.User
 		repo  string
 	)
 
@@ -69,15 +68,12 @@ func runRepoClone(ctx stdctx.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	debug.Printf("Cloning repository %s into %s", url.String(), dir)
-
 	owner, repo = utils.GetOwnerAndRepo(url.Path, login.User)
 	if url.Host != "" {
 		login = config.GetLoginByHost(url.Host)
 		if login == nil {
 			return fmt.Errorf("No login configured matching host '%s', run `tea login add` first", url.Host)
 		}
-		debug.Printf("Matched login '%s' for host '%s'", login.Name, url.Host)
 	}
 
 	_, err = task.RepoClone(
@@ -86,7 +82,7 @@ func runRepoClone(ctx stdctx.Context, cmd *cli.Command) error {
 		owner,
 		repo,
 		interact.PromptPassword,
-		teaCmd.Int("depth"),
+		ctx.Int("depth"),
 	)
 
 	return err

cmd/cmd.go

@@ -1,138 +0,0 @@
-// Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-// Tea is command line tool for Gitea.
-package cmd // import "code.gitea.io/tea"
-
-import (
-	"fmt"
-	"runtime"
-	"strings"
-
-	"github.com/urfave/cli/v3"
-)
-
-// Version holds the current tea version
-// If the Version is moved to another package or name changed,
-// build flags in .goreleaser.yaml or Makefile need to be updated accordingly.
-var Version = "development"
-
-// Tags holds the build tags used
-var Tags = ""
-
-// SDK holds the sdk version from go.mod
-var SDK = ""
-
-// App creates and returns a tea Command with all subcommands set
-// it was separated from main so docs can be generated for it
-func App() *cli.Command {
-	// make parsing tea --version easier, by printing /just/ the version string
-	cli.VersionPrinter = func(c *cli.Command) { fmt.Fprintln(c.Writer, c.Version) }
-
-	return &cli.Command{
-		Name:               "tea",
-		Usage:              "command line tool to interact with Gitea",
-		Description:        appDescription,
-		CustomHelpTemplate: helpTemplate,
-		Version:            formatVersion(),
-		Commands: []*cli.Command{
-			&CmdLogin,
-			&CmdLogout,
-			&CmdWhoami,
-
-			&CmdIssues,
-			&CmdPulls,
-			&CmdLabels,
-			&CmdMilestones,
-			&CmdReleases,
-			&CmdTrackedTimes,
-			&CmdOrgs,
-			&CmdRepos,
-			&CmdBranches,
-			&CmdActions,
-			&CmdWebhooks,
-			&CmdAddComment,
-
-			&CmdOpen,
-			&CmdNotifications,
-			&CmdRepoClone,
-
-			&CmdAdmin,
-
-			&CmdGenerateManPage,
-		},
-		EnableShellCompletion: true,
-	}
-}
-
-func formatVersion() string {
-	version := fmt.Sprintf("Version: %s\tgolang: %s",
-		bold(Version),
-		strings.ReplaceAll(runtime.Version(), "go", ""))
-
-	if len(Tags) != 0 {
-		version += fmt.Sprintf("\tbuilt with: %s", strings.Replace(Tags, " ", ", ", -1))
-	}
-
-	if len(SDK) != 0 {
-		version += fmt.Sprintf("\tgo-sdk: %s", SDK)
-	}
-
-	return version
-}
-
-var appDescription = `tea is a productivity helper for Gitea. It can be used to manage most entities on
-one or multiple Gitea instances & provides local helpers like 'tea pr checkout'.
-
-tea tries to make use of context provided by the repository in $PWD if available.
-tea works best in a upstream/fork workflow, when the local main branch tracks the
-upstream repo. tea assumes that local git state is published on the remote before
-doing operations with tea.    Configuration is persisted in $XDG_CONFIG_HOME/tea.
-`
-
-var helpTemplate = bold(`
-   {{.Name}}{{if .Usage}} - {{.Usage}}{{end}}`) + `
-   {{if .Version}}{{if not .HideVersion}}version {{.Version}}{{end}}{{end}}
-
- USAGE
-   {{if .UsageText}}{{.UsageText}}{{else}}{{.HelpName}}{{if .Commands}} command [subcommand] [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{end}}{{if .Description}}
-
- DESCRIPTION
-   {{.Description | nindent 3 | trim}}{{end}}{{if .VisibleCommands}}
-
- COMMANDS{{range .VisibleCategories}}{{if .Name}}
-   {{.Name}}:{{range .VisibleCommands}}
-     {{join .Names ", "}}{{"\t"}}{{.Usage}}{{end}}{{else}}{{range .VisibleCommands}}
-   {{join .Names ", "}}{{"\t"}}{{.Usage}}{{end}}{{end}}{{end}}{{end}}{{if .VisibleFlags}}
-
- OPTIONS
-   {{range $index, $option := .VisibleFlags}}{{if $index}}
-   {{end}}{{$option}}{{end}}{{end}}
-
- EXAMPLES
-   tea login add                       # add a login once to get started
-
-   tea pulls                           # list open pulls for the repo in $PWD
-   tea pulls --repo $HOME/foo          # list open pulls for the repo in $HOME/foo
-   tea pulls --remote upstream         # list open pulls for the repo pointed at by
-                                       # your local "upstream" git remote
-   # list open pulls for any gitea repo at the given login instance
-   tea pulls --repo gitea/tea --login gitea.com
-
-   tea milestone issues 0.7.0          # view open issues for milestone '0.7.0'
-   tea issue 189                       # view contents of issue 189
-   tea open 189                        # open web ui for issue 189
-   tea open milestones                 # open web ui for milestones
-
-   # send gitea desktop notifications every 5 minutes (bash + libnotify)
-   while :; do tea notifications --mine -o simple | xargs -i notify-send {}; sleep 300; done
-
- ABOUT
-   Written & maintained by The Gitea Authors.
-   If you find a bug or want to contribute, we'll welcome you at https://gitea.com/gitea/tea.
-   More info about Gitea itself on https://about.gitea.com.
-`
-
-func bold(t string) string {
-	return fmt.Sprintf("\033[1m%s\033[0m", t)
-}

cmd/comment.go

@@ -1,13 +1,12 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package cmd
 
 import (
-	stdctx "context"
-	"errors"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"strings"
 
 	"code.gitea.io/tea/cmd/flags"
@@ -15,12 +14,11 @@ import (
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/interact"
 	"code.gitea.io/tea/modules/print"
-	"code.gitea.io/tea/modules/theme"
 	"code.gitea.io/tea/modules/utils"
 
 	"code.gitea.io/sdk/gitea"
-	"github.com/charmbracelet/huh"
-	"github.com/urfave/cli/v3"
+	"github.com/AlecAivazis/survey/v2"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdAddComment is the main command to operate with notifications
@@ -35,7 +33,7 @@ var CmdAddComment = cli.Command{
 	Flags:       flags.AllDefaultFlags,
 }
 
-func runAddComment(_ stdctx.Context, cmd *cli.Command) error {
+func runAddComment(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 
@@ -52,28 +50,23 @@ func runAddComment(_ stdctx.Context, cmd *cli.Command) error {
 	body := strings.Join(ctx.Args().Tail(), " ")
 	if interact.IsStdinPiped() {
 		// custom solution until https://github.com/AlecAivazis/survey/issues/328 is fixed
-		if bodyStdin, err := io.ReadAll(ctx.Reader); err != nil {
+		if bodyStdin, err := ioutil.ReadAll(ctx.App.Reader); err != nil {
 			return err
 		} else if len(bodyStdin) != 0 {
 			body = strings.Join([]string{body, string(bodyStdin)}, "\n\n")
 		}
 	} else if len(body) == 0 {
-		if err := huh.NewForm(
-			huh.NewGroup(
-				huh.NewText().
-					Title("Comment(markdown):").
-					ExternalEditor(config.GetPreferences().Editor).
-					EditorExtension("md").
-					Value(&body),
-			),
-		).WithTheme(theme.GetTheme()).
-			Run(); err != nil {
+		if err = survey.AskOne(interact.NewMultiline(interact.Multiline{
+			Message:   "Comment:",
+			Syntax:    "md",
+			UseEditor: config.GetPreferences().Editor,
+		}), &body); err != nil {
 			return err
 		}
 	}
 
 	if len(body) == 0 {
-		return errors.New("no comment content provided")
+		return fmt.Errorf("No comment body provided")
 	}
 
 	client := ctx.Login.Client()

cmd/flags/csvflag.go

@@ -1,5 +1,6 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package flags
 
@@ -8,7 +9,7 @@ import (
 	"strings"
 
 	"code.gitea.io/tea/modules/utils"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CsvFlag is a wrapper around cli.StringFlag, with an added GetValues() method
@@ -38,8 +39,8 @@ func NewCsvFlag(name, usage string, aliases, availableValues, defaults []string)
 }
 
 // GetValues returns the value of the flag, parsed as a commaseparated list
-func (f CsvFlag) GetValues(cmd *cli.Command) ([]string, error) {
-	val := cmd.String(f.Name)
+func (f CsvFlag) GetValues(ctx *cli.Context) ([]string, error) {
+	val := ctx.String(f.Name)
 	selection := strings.Split(val, ",")
 	if f.AvailableFields != nil && val != "" {
 		for _, field := range selection {

cmd/flags/generic.go

@@ -1,13 +1,11 @@
-// Copyright 2025 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Copyright 2019 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package flags
 
 import (
-	"errors"
-
-	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // LoginFlag provides flag to specify tea login profile
@@ -35,56 +33,21 @@ var RemoteFlag = cli.StringFlag{
 var OutputFlag = cli.StringFlag{
 	Name:    "output",
 	Aliases: []string{"o"},
-	Usage:   "Output format. (simple, table, csv, tsv, yaml, json)",
-}
-
-var (
-	paging gitea.ListOptions
-	// ErrPage indicates that the provided page value is invalid (less than -1 or equal to 0).
-	ErrPage = errors.New("page cannot be smaller than 1")
-	// ErrLimit indicates that the provided limit value is invalid (negative).
-	ErrLimit = errors.New("limit cannot be negative")
-)
-
-// GetListOptions returns configured paging struct
-func GetListOptions() gitea.ListOptions {
-	return paging
-}
-
-// PaginationFlags provides all pagination related flags
-var PaginationFlags = []cli.Flag{
-	&PaginationPageFlag,
-	&PaginationLimitFlag,
+	Usage:   "Output format. (csv, simple, table, tsv, yaml)",
 }
 
 // PaginationPageFlag provides flag for pagination options
-var PaginationPageFlag = cli.IntFlag{
+var PaginationPageFlag = cli.StringFlag{
 	Name:    "page",
 	Aliases: []string{"p"},
-	Usage:   "specify page",
-	Value:   1,
-	Validator: func(i int) error {
-		if i < 1 && i != -1 {
-			return ErrPage
-		}
-		return nil
-	},
-	Destination: &paging.Page,
+	Usage:   "specify page, default is 1",
 }
 
 // PaginationLimitFlag provides flag for pagination options
-var PaginationLimitFlag = cli.IntFlag{
+var PaginationLimitFlag = cli.StringFlag{
 	Name:    "limit",
 	Aliases: []string{"lm"},
 	Usage:   "specify limit of items per page",
-	Value:   30,
-	Validator: func(i int) error {
-		if i < 0 {
-			return ErrLimit
-		}
-		return nil
-	},
-	Destination: &paging.PageSize,
 }
 
 // LoginOutputFlags defines login and output flags that should

cmd/flags/generic_test.go

@@ -1,125 +0,0 @@
-// Copyright 2025 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package flags
-
-import (
-	"context"
-	"io"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"github.com/urfave/cli/v3"
-)
-
-func TestPaginationFlags(t *testing.T) {
-	var (
-		defaultPage  = PaginationPageFlag.Value
-		defaultLimit = PaginationLimitFlag.Value
-	)
-
-	cases := []struct {
-		name          string
-		args          []string
-		expectedPage  int
-		expectedLimit int
-	}{
-		{
-			name:          "no flags",
-			args:          []string{"test"},
-			expectedPage:  defaultPage,
-			expectedLimit: defaultLimit,
-		},
-		{
-			name:          "only paging",
-			args:          []string{"test", "--page", "5"},
-			expectedPage:  5,
-			expectedLimit: defaultLimit,
-		},
-		{
-			name:          "only limit",
-			args:          []string{"test", "--limit", "10"},
-			expectedPage:  defaultPage,
-			expectedLimit: 10,
-		},
-		{
-			name:          "only limit",
-			args:          []string{"test", "--limit", "10"},
-			expectedPage:  defaultPage,
-			expectedLimit: 10,
-		},
-		{
-			name:          "both flags",
-			args:          []string{"test", "--page", "2", "--limit", "20"},
-			expectedPage:  2,
-			expectedLimit: 20,
-		},
-		{ //TODO: Should no paging be applied as -1 or a separate flag? It's not obvious that page=-1 turns off paging and limit is ignored
-			name:          "no paging",
-			args:          []string{"test", "--limit", "20", "--page", "-1"},
-			expectedPage:  -1,
-			expectedLimit: 20,
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			cmd := cli.Command{
-				Name: "test-paging",
-				Action: func(_ context.Context, cmd *cli.Command) error {
-					assert.Equal(t, tc.expectedPage, cmd.Int("page"))
-					assert.Equal(t, tc.expectedLimit, cmd.Int("limit"))
-					return nil
-				},
-				Flags: PaginationFlags,
-			}
-			err := cmd.Run(context.Background(), tc.args)
-			require.NoError(t, err)
-		})
-	}
-
-}
-func TestPaginationFailures(t *testing.T) {
-	cases := []struct {
-		name          string
-		args          []string
-		expectedError error
-	}{
-		{
-			name:          "negative limit",
-			args:          []string{"test", "--limit", "-10"},
-			expectedError: ErrLimit,
-		},
-		{
-			name:          "negative paging",
-			args:          []string{"test", "--page", "-2"},
-			expectedError: ErrPage,
-		},
-		{
-			name:          "zero paging",
-			args:          []string{"test", "--page", "0"},
-			expectedError: ErrPage,
-		},
-		{
-			//urfave does not validate all flags in one pass
-			name:          "negative paging and paging",
-			args:          []string{"test", "--page", "-2", "--limit", "-10"},
-			expectedError: ErrPage,
-		},
-	}
-
-	for _, tc := range cases {
-		cmd := cli.Command{
-			Name:      "test-paging",
-			Flags:     PaginationFlags,
-			Writer:    io.Discard,
-			ErrWriter: io.Discard,
-		}
-		t.Run(tc.name, func(t *testing.T) {
-			err := cmd.Run(context.Background(), tc.args)
-			require.ErrorContains(t, err, tc.expectedError.Error())
-			// require.ErrorIs(t, err, tc.expectedError)
-		})
-	}
-}

cmd/flags/issue_pr.go

@@ -1,19 +1,19 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package flags
 
 import (
 	"fmt"
 	"strings"
-	"time"
 
 	"code.gitea.io/sdk/gitea"
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/task"
 
 	"github.com/araddon/dateparse"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // StateFlag provides flag to specify issue/pr state, defaulting to "open"
@@ -70,10 +70,6 @@ var IssueListingFlags = append([]cli.Flag{
 		Name:    "mentions",
 		Aliases: []string{"M"},
 	},
-	&cli.StringFlag{
-		Name:    "owner",
-		Aliases: []string{"org"},
-	},
 	&cli.StringFlag{
 		Name:    "from",
 		Aliases: []string{"F"},
@@ -88,8 +84,8 @@ var IssueListingFlags = append([]cli.Flag{
 	&PaginationLimitFlag,
 }, AllDefaultFlags...)
 
-// issuePRFlags defines shared flags between flags IssuePRCreateFlags and IssuePREditFlags
-var issuePRFlags = append([]cli.Flag{
+// IssuePREditFlags defines flags for properties of issues and PRs
+var IssuePREditFlags = append([]cli.Flag{
 	&cli.StringFlag{
 		Name:    "title",
 		Aliases: []string{"t"},
@@ -98,25 +94,6 @@ var issuePRFlags = append([]cli.Flag{
 		Name:    "description",
 		Aliases: []string{"d"},
 	},
-	&cli.StringFlag{
-		Name:    "referenced-version",
-		Aliases: []string{"v"},
-		Usage:   "commit-hash or tag name to assign",
-	},
-	&cli.StringFlag{
-		Name:    "milestone",
-		Aliases: []string{"m"},
-		Usage:   "Milestone to assign",
-	},
-	&cli.StringFlag{
-		Name:    "deadline",
-		Aliases: []string{"D"},
-		Usage:   "Deadline timestamp to assign",
-	},
-}, LoginRepoFlags...)
-
-// IssuePRCreateFlags defines flags for creation of issues and PRs
-var IssuePRCreateFlags = append([]cli.Flag{
 	&cli.StringFlag{
 		Name:    "assignees",
 		Aliases: []string{"a"},
@@ -127,10 +104,20 @@ var IssuePRCreateFlags = append([]cli.Flag{
 		Aliases: []string{"L"},
 		Usage:   "Comma-separated list of labels to assign",
 	},
-}, issuePRFlags...)
+	&cli.StringFlag{
+		Name:    "deadline",
+		Aliases: []string{"D"},
+		Usage:   "Deadline timestamp to assign",
+	},
+	&cli.StringFlag{
+		Name:    "milestone",
+		Aliases: []string{"m"},
+		Usage:   "Milestone to assign",
+	},
+}, LoginRepoFlags...)
 
-// GetIssuePRCreateFlags parses all IssuePREditFlags
-func GetIssuePRCreateFlags(ctx *context.TeaContext) (*gitea.CreateIssueOption, error) {
+// GetIssuePREditFlags parses all IssuePREditFlags
+func GetIssuePREditFlags(ctx *context.TeaContext) (*gitea.CreateIssueOption, error) {
 	opts := gitea.CreateIssueOption{
 		Title:     ctx.String("title"),
 		Body:      ctx.String("description"),
@@ -172,67 +159,3 @@ func GetIssuePRCreateFlags(ctx *context.TeaContext) (*gitea.CreateIssueOption, e
 
 	return &opts, nil
 }
-
-// IssuePREditFlags defines flags for editing properties of issues and PRs
-var IssuePREditFlags = append([]cli.Flag{
-	&cli.StringFlag{
-		Name:    "add-assignees",
-		Aliases: []string{"a"},
-		Usage:   "Comma-separated list of usernames to assign",
-	},
-	&cli.StringFlag{
-		Name:    "add-labels",
-		Aliases: []string{"L"},
-		Usage:   "Comma-separated list of labels to assign. Takes precedence over --remove-labels",
-	},
-	&cli.StringFlag{
-		Name:  "remove-labels",
-		Usage: "Comma-separated list of labels to remove",
-	},
-}, issuePRFlags...)
-
-// GetIssuePREditFlags parses all IssuePREditFlags
-func GetIssuePREditFlags(ctx *context.TeaContext) (*task.EditIssueOption, error) {
-	opts := task.EditIssueOption{}
-	if ctx.IsSet("title") {
-		val := ctx.String("title")
-		opts.Title = &val
-	}
-	if ctx.IsSet("description") {
-		val := ctx.String("description")
-		opts.Body = &val
-	}
-	if ctx.IsSet("referenced-version") {
-		val := ctx.String("referenced-version")
-		opts.Ref = &val
-	}
-	if ctx.IsSet("milestone") {
-		val := ctx.String("milestone")
-		opts.Milestone = &val
-	}
-	if ctx.IsSet("deadline") {
-		date := ctx.String("deadline")
-		if date == "" {
-			opts.Deadline = &time.Time{}
-		} else {
-			t, err := dateparse.ParseAny(date)
-			if err != nil {
-				return nil, err
-			}
-			opts.Deadline = &t
-		}
-	}
-	if ctx.IsSet("add-assignees") {
-		val := ctx.String("add-assignees")
-		opts.AddAssignees = strings.Split(val, ",")
-	}
-	if ctx.IsSet("add-labels") {
-		val := ctx.String("add-labels")
-		opts.AddLabels = strings.Split(val, ",")
-	}
-	if ctx.IsSet("remove-labels") {
-		val := ctx.String("remove-labels")
-		opts.RemoveLabels = strings.Split(val, ",")
-	}
-	return &opts, nil
-}

cmd/issues.go

@@ -1,53 +1,21 @@
 // Copyright 2018 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package cmd
 
 import (
-	stdctx "context"
-	"encoding/json"
 	"fmt"
-	"time"
 
-	"code.gitea.io/sdk/gitea"
-	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/cmd/issues"
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/interact"
 	"code.gitea.io/tea/modules/print"
 	"code.gitea.io/tea/modules/utils"
 
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
-type labelData struct {
-	Name        string `json:"name"`
-	Color       string `json:"color"`
-	Description string `json:"description"`
-}
-
-type issueData struct {
-	ID        int64           `json:"id"`
-	Index     int64           `json:"index"`
-	Title     string          `json:"title"`
-	State     gitea.StateType `json:"state"`
-	Created   time.Time       `json:"created"`
-	Labels    []labelData     `json:"labels"`
-	User      string          `json:"user"`
-	Body      string          `json:"body"`
-	Assignees []string        `json:"assignees"`
-	URL       string          `json:"url"`
-	ClosedAt  *time.Time      `json:"closedAt"`
-	Comments  []commentData   `json:"comments"`
-}
-
-type commentData struct {
-	ID      int64     `json:"id"`
-	Author  string    `json:"author"`
-	Created time.Time `json:"created"`
-	Body    string    `json:"body"`
-}
-
 // CmdIssues represents to login a gitea server.
 var CmdIssues = cli.Command{
 	Name:        "issues",
@@ -57,10 +25,9 @@ var CmdIssues = cli.Command{
 	Description: `Lists issues when called without argument. If issue index is provided, will show it in detail.`,
 	ArgsUsage:   "[<issue index>]",
 	Action:      runIssues,
-	Commands: []*cli.Command{
+	Subcommands: []*cli.Command{
 		&issues.CmdIssuesList,
 		&issues.CmdIssuesCreate,
-		&issues.CmdIssuesEdit,
 		&issues.CmdIssuesReopen,
 		&issues.CmdIssuesClose,
 	},
@@ -72,14 +39,14 @@ var CmdIssues = cli.Command{
 	}, issues.CmdIssuesList.Flags...),
 }
 
-func runIssues(ctx stdctx.Context, cmd *cli.Command) error {
-	if cmd.Args().Len() == 1 {
-		return runIssueDetail(ctx, cmd, cmd.Args().First())
+func runIssues(ctx *cli.Context) error {
+	if ctx.Args().Len() == 1 {
+		return runIssueDetail(ctx, ctx.Args().First())
 	}
-	return issues.RunIssuesList(ctx, cmd)
+	return issues.RunIssuesList(ctx)
 }
 
-func runIssueDetail(_ stdctx.Context, cmd *cli.Command, index string) error {
+func runIssueDetail(cmd *cli.Context, index string) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 
@@ -96,14 +63,6 @@ func runIssueDetail(_ stdctx.Context, cmd *cli.Command, index string) error {
 	if err != nil {
 		return err
 	}
-
-	if ctx.IsSet("output") {
-		switch ctx.String("output") {
-		case "json":
-			return runIssueDetailAsJSON(ctx, issue)
-		}
-	}
-
 	print.IssueDetails(issue, reactions)
 
 	if issue.Comments > 0 {
@@ -115,61 +74,3 @@ func runIssueDetail(_ stdctx.Context, cmd *cli.Command, index string) error {
 
 	return nil
 }
-
-func runIssueDetailAsJSON(ctx *context.TeaContext, issue *gitea.Issue) error {
-	c := ctx.Login.Client()
-	opts := gitea.ListIssueCommentOptions{ListOptions: flags.GetListOptions()}
-
-	labelSlice := make([]labelData, 0, len(issue.Labels))
-	for _, label := range issue.Labels {
-		labelSlice = append(labelSlice, labelData{label.Name, label.Color, label.Description})
-	}
-
-	assigneesSlice := make([]string, 0, len(issue.Assignees))
-	for _, assignee := range issue.Assignees {
-		assigneesSlice = append(assigneesSlice, assignee.UserName)
-	}
-
-	issueSlice := issueData{
-		ID:        issue.ID,
-		Index:     issue.Index,
-		Title:     issue.Title,
-		State:     issue.State,
-		Created:   issue.Created,
-		User:      issue.Poster.UserName,
-		Body:      issue.Body,
-		Labels:    labelSlice,
-		Assignees: assigneesSlice,
-		URL:       issue.HTMLURL,
-		ClosedAt:  issue.Closed,
-		Comments:  make([]commentData, 0),
-	}
-
-	if ctx.Bool("comments") {
-		comments, _, err := c.ListIssueComments(ctx.Owner, ctx.Repo, issue.Index, opts)
-		issueSlice.Comments = make([]commentData, 0, len(comments))
-
-		if err != nil {
-			return err
-		}
-
-		for _, comment := range comments {
-			issueSlice.Comments = append(issueSlice.Comments, commentData{
-				ID:      comment.ID,
-				Author:  comment.Poster.UserName,
-				Body:    comment.Body, // Selected Field
-				Created: comment.Created,
-			})
-		}
-
-	}
-
-	jsonData, err := json.MarshalIndent(issueSlice, "", "\t")
-	if err != nil {
-		return err
-	}
-
-	_, err = fmt.Fprintf(ctx.Writer, "%s\n", jsonData)
-
-	return err
-}

cmd/issues/close.go

@@ -1,11 +1,10 @@
 // Copyright 2018 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package issues
 
 import (
-	stdctx "context"
-	"errors"
 	"fmt"
 
 	"code.gitea.io/tea/cmd/flags"
@@ -14,47 +13,40 @@ import (
 	"code.gitea.io/tea/modules/utils"
 
 	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdIssuesClose represents a sub command of issues to close an issue
 var CmdIssuesClose = cli.Command{
 	Name:        "close",
-	Usage:       "Change state of one ore more issues to 'closed'",
-	Description: `Change state of one ore more issues to 'closed'`,
-	ArgsUsage:   "<issue index> [<issue index>...]",
-	Action: func(ctx stdctx.Context, cmd *cli.Command) error {
-		s := gitea.StateClosed
-		return editIssueState(ctx, cmd, gitea.EditIssueOption{State: &s})
+	Usage:       "Change state of an issue to 'closed'",
+	Description: `Change state of an issue to 'closed'`,
+	ArgsUsage:   "<issue index>",
+	Action: func(ctx *cli.Context) error {
+		var s = gitea.StateClosed
+		return editIssueState(ctx, gitea.EditIssueOption{State: &s})
 	},
 	Flags: flags.AllDefaultFlags,
 }
 
 // editIssueState abstracts the arg parsing to edit the given issue
-func editIssueState(_ stdctx.Context, cmd *cli.Command, opts gitea.EditIssueOption) error {
+func editIssueState(cmd *cli.Context, opts gitea.EditIssueOption) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 	if ctx.Args().Len() == 0 {
-		return errors.New(ctx.Command.ArgsUsage)
+		return fmt.Errorf(ctx.Command.ArgsUsage)
 	}
 
-	indices, err := utils.ArgsToIndices(ctx.Args().Slice())
+	index, err := utils.ArgToIndex(ctx.Args().First())
 	if err != nil {
 		return err
 	}
 
-	client := ctx.Login.Client()
-	for _, index := range indices {
-		issue, _, err := client.EditIssue(ctx.Owner, ctx.Repo, index, opts)
-		if err != nil {
-			return err
-		}
-
-		if len(indices) > 1 {
-			fmt.Println(issue.HTMLURL)
-		} else {
-			print.IssueDetails(issue, nil)
-		}
+	issue, _, err := ctx.Login.Client().EditIssue(ctx.Owner, ctx.Repo, index, opts)
+	if err != nil {
+		return err
 	}
+
+	print.IssueDetails(issue, nil)
 	return nil
 }

cmd/issues/create.go

@@ -1,17 +1,16 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package issues
 
 import (
-	stdctx "context"
-
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/interact"
 	"code.gitea.io/tea/modules/task"
 
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdIssuesCreate represents a sub command of issues to create issue
@@ -22,22 +21,18 @@ var CmdIssuesCreate = cli.Command{
 	Description: `Create an issue on repository`,
 	ArgsUsage:   " ", // command does not accept arguments
 	Action:      runIssuesCreate,
-	Flags:       flags.IssuePRCreateFlags,
+	Flags:       flags.IssuePREditFlags,
 }
 
-func runIssuesCreate(_ stdctx.Context, cmd *cli.Command) error {
+func runIssuesCreate(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 
 	if ctx.NumFlags() == 0 {
-		err := interact.CreateIssue(ctx.Login, ctx.Owner, ctx.Repo)
-		if err != nil && !interact.IsQuitting(err) {
-			return err
-		}
-		return nil
+		return interact.CreateIssue(ctx.Login, ctx.Owner, ctx.Repo)
 	}
 
-	opts, err := flags.GetIssuePRCreateFlags(ctx)
+	opts, err := flags.GetIssuePREditFlags(ctx)
 	if err != nil {
 		return err
 	}

cmd/issues/edit.go

@@ -1,75 +0,0 @@
-// Copyright 2022 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package issues
-
-import (
-	"fmt"
-
-	stdctx "context"
-
-	"code.gitea.io/tea/cmd/flags"
-	"code.gitea.io/tea/modules/context"
-	"code.gitea.io/tea/modules/interact"
-	"code.gitea.io/tea/modules/print"
-	"code.gitea.io/tea/modules/task"
-	"code.gitea.io/tea/modules/utils"
-	"github.com/urfave/cli/v3"
-)
-
-// CmdIssuesEdit is the subcommand of issues to edit issues
-var CmdIssuesEdit = cli.Command{
-	Name:    "edit",
-	Aliases: []string{"e"},
-	Usage:   "Edit one or more issues",
-	Description: `Edit one or more issues. To unset a property again,
-use an empty string (eg. --milestone "").`,
-	ArgsUsage: "<idx> [<idx>...]",
-	Action:    runIssuesEdit,
-	Flags:     flags.IssuePREditFlags,
-}
-
-func runIssuesEdit(_ stdctx.Context, cmd *cli.Command) error {
-	ctx := context.InitCommand(cmd)
-	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
-
-	if !cmd.Args().Present() {
-		return fmt.Errorf("must specify at least one issue index")
-	}
-
-	opts, err := flags.GetIssuePREditFlags(ctx)
-	if err != nil {
-		return err
-	}
-
-	indices, err := utils.ArgsToIndices(ctx.Args().Slice())
-	if err != nil {
-		return err
-	}
-
-	client := ctx.Login.Client()
-	for _, opts.Index = range indices {
-		if ctx.NumFlags() == 0 {
-			var err error
-			opts, err = interact.EditIssue(*ctx, opts.Index)
-			if err != nil {
-				if interact.IsQuitting(err) {
-					return nil // user quit
-				}
-				return err
-			}
-		}
-
-		issue, err := task.EditIssue(ctx, client, *opts)
-		if err != nil {
-			return err
-		}
-		if ctx.Args().Len() > 1 {
-			fmt.Println(issue.HTMLURL)
-		} else {
-			print.IssueDetails(issue, nil)
-		}
-	}
-
-	return nil
-}

cmd/issues/list.go

@@ -1,10 +1,10 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package issues
 
 import (
-	stdctx "context"
 	"fmt"
 	"time"
 
@@ -14,11 +14,11 @@ import (
 
 	"code.gitea.io/sdk/gitea"
 	"github.com/araddon/dateparse"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 var issueFieldsFlag = flags.FieldsFlag(print.IssueFields, []string{
-	"index", "title", "state", "author", "milestone", "labels", "owner", "repo",
+	"index", "title", "state", "author", "milestone", "labels",
 })
 
 // CmdIssuesList represents a sub command of issues to list issues
@@ -33,8 +33,9 @@ var CmdIssuesList = cli.Command{
 }
 
 // RunIssuesList list issues
-func RunIssuesList(_ stdctx.Context, cmd *cli.Command) error {
+func RunIssuesList(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
+	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 
 	state := gitea.StateOpen
 	switch ctx.String("state") {
@@ -74,52 +75,27 @@ func RunIssuesList(_ stdctx.Context, cmd *cli.Command) error {
 			return err
 		}
 	}
-	owner := ctx.Owner
-	if ctx.IsSet("owner") {
-		owner = ctx.String("owner")
-	}
 
 	// ignore error, as we don't do any input validation on these flags
 	labels, _ := flags.LabelFilterFlag.GetValues(cmd)
 	milestones, _ := flags.MilestoneFilterFlag.GetValues(cmd)
-	var issues []*gitea.Issue
-	if ctx.Repo != "" {
-		issues, _, err = ctx.Login.Client().ListRepoIssues(owner, ctx.Repo, gitea.ListIssueOption{
-			ListOptions: flags.GetListOptions(),
-			State:       state,
-			Type:        kind,
-			KeyWord:     ctx.String("keyword"),
-			CreatedBy:   ctx.String("author"),
-			AssignedBy:  ctx.String("assigned-to"),
-			MentionedBy: ctx.String("mentions"),
-			Labels:      labels,
-			Milestones:  milestones,
-			Since:       from,
-			Before:      until,
-		})
 
-		if err != nil {
-			return err
-		}
-	} else {
-		issues, _, err = ctx.Login.Client().ListIssues(gitea.ListIssueOption{
-			ListOptions: flags.GetListOptions(),
-			State:       state,
-			Type:        kind,
-			KeyWord:     ctx.String("keyword"),
-			CreatedBy:   ctx.String("author"),
-			AssignedBy:  ctx.String("assigned-to"),
-			MentionedBy: ctx.String("mentions"),
-			Labels:      labels,
-			Milestones:  milestones,
-			Since:       from,
-			Before:      until,
-			Owner:       owner,
-		})
+	issues, _, err := ctx.Login.Client().ListRepoIssues(ctx.Owner, ctx.Repo, gitea.ListIssueOption{
+		ListOptions: ctx.GetListOptions(),
+		State:       state,
+		Type:        kind,
+		KeyWord:     ctx.String("keyword"),
+		CreatedBy:   ctx.String("author"),
+		AssignedBy:  ctx.String("assigned-to"),
+		MentionedBy: ctx.String("mentions"),
+		Labels:      labels,
+		Milestones:  milestones,
+		Since:       from,
+		Before:      until,
+	})
 
-		if err != nil {
-			return err
-		}
+	if err != nil {
+		return err
 	}
 
 	fields, err := issueFieldsFlag.GetValues(cmd)

cmd/issues/reopen.go

@@ -1,27 +1,26 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package issues
 
 import (
-	"context"
-
 	"code.gitea.io/tea/cmd/flags"
 
 	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdIssuesReopen represents a sub command of issues to open an issue
 var CmdIssuesReopen = cli.Command{
 	Name:        "reopen",
 	Aliases:     []string{"open"},
-	Usage:       "Change state of one or more issues to 'open'",
-	Description: `Change state of one or more issues to 'open'`,
-	ArgsUsage:   "<issue index> [<issue index>...]",
-	Action: func(ctx context.Context, cmd *cli.Command) error {
+	Usage:       "Change state of an issue to 'open'",
+	Description: `Change state of an issue to 'open'`,
+	ArgsUsage:   "<issue index>",
+	Action: func(ctx *cli.Context) error {
 		var s = gitea.StateOpen
-		return editIssueState(ctx, cmd, gitea.EditIssueOption{State: &s})
+		return editIssueState(ctx, gitea.EditIssueOption{State: &s})
 	},
 	Flags: flags.AllDefaultFlags,
 }

cmd/issues_test.go

@@ -1,270 +0,0 @@
-// Copyright 2025 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package cmd
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-	"time"
-
-	"code.gitea.io/sdk/gitea"
-	"code.gitea.io/tea/modules/config"
-	"code.gitea.io/tea/modules/context"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"github.com/urfave/cli/v3"
-)
-
-const (
-	testOwner = "testOwner"
-	testRepo  = "testRepo"
-)
-
-func createTestIssue(comments int, isClosed bool) gitea.Issue {
-	var issue = gitea.Issue{
-		ID:      42,
-		Index:   1,
-		Title:   "Test issue",
-		State:   gitea.StateOpen,
-		Body:    "This is a test",
-		Created: time.Date(2025, 31, 10, 23, 59, 59, 999999999, time.UTC),
-		Updated: time.Date(2025, 1, 11, 0, 0, 0, 0, time.UTC),
-		Labels: []*gitea.Label{
-			{
-				Name:        "example/Label1",
-				Color:       "very red",
-				Description: "This is an example label",
-			},
-			{
-				Name:        "example/Label2",
-				Color:       "hardly red",
-				Description: "This is another example label",
-			},
-		},
-		Comments: comments,
-		Poster: &gitea.User{
-			UserName: "testUser",
-		},
-		Assignees: []*gitea.User{
-			{UserName: "testUser"},
-			{UserName: "testUser3"},
-		},
-		HTMLURL: "<space holder>",
-		Closed:  nil, //2025-11-10T21:20:19Z
-	}
-
-	if isClosed {
-		var closed = time.Date(2025, 11, 10, 21, 20, 19, 0, time.UTC)
-		issue.Closed = &closed
-	}
-
-	if isClosed {
-		issue.State = gitea.StateClosed
-	} else {
-		issue.State = gitea.StateOpen
-	}
-
-	return issue
-
-}
-
-func createTestIssueComments(comments int) []gitea.Comment {
-	baseID := 900
-	var result []gitea.Comment
-
-	for commentID := 0; commentID < comments; commentID++ {
-		result = append(result, gitea.Comment{
-			ID: int64(baseID + commentID),
-			Poster: &gitea.User{
-				UserName: "Freddy",
-			},
-			Body: fmt.Sprintf("This is a test comment #%v", commentID),
-			Created: time.Date(2025, 11, 3, 12, 0, 0, 0, time.UTC).
-				Add(time.Duration(commentID) * time.Hour),
-		})
-	}
-
-	return result
-
-}
-
-func TestRunIssueDetailAsJSON(t *testing.T) {
-	type TestCase struct {
-		name         string
-		issue        gitea.Issue
-		comments     []gitea.Comment
-		flagComments bool
-		flagOutput   string
-		flagOut      string
-		closed       bool
-	}
-
-	cmd := cli.Command{
-		Name: "t",
-		Flags: []cli.Flag{
-			&cli.BoolFlag{
-				Name:  "comments",
-				Value: false,
-			},
-			&cli.StringFlag{
-				Name:  "output",
-				Value: "json",
-			},
-		},
-	}
-
-	testContext := context.TeaContext{
-		Owner: testOwner,
-		Repo:  testRepo,
-		Login: &config.Login{
-			Name: "testLogin",
-			URL:  "http://127.0.0.1:8081",
-		},
-		Command: &cmd,
-	}
-
-	testCases := []TestCase{
-		{
-			name:         "Simple issue with no comments, no comments requested",
-			issue:        createTestIssue(0, true),
-			comments:     []gitea.Comment{},
-			flagComments: false,
-		},
-		{
-			name:         "Simple issue with no comments, comments requested",
-			issue:        createTestIssue(0, true),
-			comments:     []gitea.Comment{},
-			flagComments: true,
-		},
-		{
-			name:         "Simple issue with comments, no comments requested",
-			issue:        createTestIssue(2, true),
-			comments:     createTestIssueComments(2),
-			flagComments: false,
-		},
-		{
-			name:         "Simple issue with comments, comments requested",
-			issue:        createTestIssue(2, true),
-			comments:     createTestIssueComments(2),
-			flagComments: true,
-		},
-		{
-			name:         "Simple issue with comments, comments requested, not closed",
-			issue:        createTestIssue(2, false),
-			comments:     createTestIssueComments(2),
-			flagComments: true,
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				path := r.URL.Path
-				if path == fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/comments", testOwner, testRepo, testCase.issue.Index) {
-					jsonComments, err := json.Marshal(testCase.comments)
-					if err != nil {
-						require.NoError(t, err, "Testing setup failed: failed to marshal comments")
-					}
-					w.Header().Set("Content-Type", "application/json")
-					w.WriteHeader(http.StatusOK)
-					_, err = w.Write(jsonComments)
-					require.NoError(t, err, "Testing setup failed: failed to write out comments")
-				} else {
-					http.NotFound(w, r)
-				}
-			})
-
-			server := httptest.NewServer(handler)
-
-			testContext.Login.URL = server.URL
-			testCase.issue.HTMLURL = fmt.Sprintf("%s/%s/%s/issues/%d/", testContext.Login.URL, testOwner, testRepo, testCase.issue.Index)
-
-			var outBuffer bytes.Buffer
-			testContext.Writer = &outBuffer
-			var errBuffer bytes.Buffer
-			testContext.ErrWriter = &errBuffer
-
-			if testCase.flagComments {
-				_ = testContext.Command.Set("comments", "true")
-			} else {
-				_ = testContext.Command.Set("comments", "false")
-			}
-
-			err := runIssueDetailAsJSON(&testContext, &testCase.issue)
-
-			server.Close()
-
-			require.NoError(t, err, "Failed to run issue detail as JSON")
-
-			out := outBuffer.String()
-
-			require.NotEmpty(t, out, "Unexpected empty output from runIssueDetailAsJSON")
-
-			//setting expectations
-
-			var expectedLabels []labelData
-			expectedLabels = []labelData{}
-			for _, l := range testCase.issue.Labels {
-				expectedLabels = append(expectedLabels, labelData{
-					Name:        l.Name,
-					Color:       l.Color,
-					Description: l.Description,
-				})
-			}
-
-			var expectedAssignees []string
-			expectedAssignees = []string{}
-			for _, a := range testCase.issue.Assignees {
-				expectedAssignees = append(expectedAssignees, a.UserName)
-			}
-
-			var expectedClosedAt *time.Time
-			if testCase.issue.Closed != nil {
-				expectedClosedAt = testCase.issue.Closed
-			}
-
-			var expectedComments []commentData
-			expectedComments = []commentData{}
-			if testCase.flagComments {
-				for _, c := range testCase.comments {
-					expectedComments = append(expectedComments, commentData{
-						ID:      c.ID,
-						Author:  c.Poster.UserName,
-						Body:    c.Body,
-						Created: c.Created,
-					})
-				}
-			}
-
-			expected := issueData{
-				ID:        testCase.issue.ID,
-				Index:     testCase.issue.Index,
-				Title:     testCase.issue.Title,
-				State:     testCase.issue.State,
-				Created:   testCase.issue.Created,
-				User:      testCase.issue.Poster.UserName,
-				Body:      testCase.issue.Body,
-				URL:       testCase.issue.HTMLURL,
-				ClosedAt:  expectedClosedAt,
-				Labels:    expectedLabels,
-				Assignees: expectedAssignees,
-				Comments:  expectedComments,
-			}
-
-			// validating reality
-			var actual issueData
-			dec := json.NewDecoder(bytes.NewReader(outBuffer.Bytes()))
-			dec.DisallowUnknownFields()
-			err = dec.Decode(&actual)
-			require.NoError(t, err, "Failed to unmarshal output into struct")
-
-			assert.Equal(t, expected, actual, "Expected structs differ from expected one")
-		})
-	}
-
-}

cmd/labels.go

@@ -1,14 +1,14 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package cmd
 
 import (
-	"context"
 	"fmt"
 
 	"code.gitea.io/tea/cmd/labels"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdLabels represents to operate repositories' labels.
@@ -20,7 +20,7 @@ var CmdLabels = cli.Command{
 	Description: `Manage issue labels`,
 	ArgsUsage:   " ", // command does not accept arguments
 	Action:      runLabels,
-	Commands: []*cli.Command{
+	Subcommands: []*cli.Command{
 		&labels.CmdLabelsList,
 		&labels.CmdLabelCreate,
 		&labels.CmdLabelUpdate,
@@ -29,13 +29,13 @@ var CmdLabels = cli.Command{
 	Flags: labels.CmdLabelsList.Flags,
 }
 
-func runLabels(ctx context.Context, cmd *cli.Command) error {
-	if cmd.Args().Len() == 1 {
-		return runLabelsDetails(cmd)
+func runLabels(ctx *cli.Context) error {
+	if ctx.Args().Len() == 1 {
+		return runLabelsDetails(ctx)
 	}
-	return labels.RunLabelsList(ctx, cmd)
+	return labels.RunLabelsList(ctx)
 }
 
-func runLabelsDetails(cmd *cli.Command) error {
+func runLabelsDetails(ctx *cli.Context) error {
 	return fmt.Errorf("Not yet implemented")
 }

cmd/labels/create.go

@@ -1,11 +1,11 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package labels
 
 import (
 	"bufio"
-	stdctx "context"
 	"log"
 	"os"
 	"strings"
@@ -14,7 +14,7 @@ import (
 	"code.gitea.io/tea/modules/context"
 
 	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdLabelCreate represents a sub command of labels to create label.
@@ -45,7 +45,7 @@ var CmdLabelCreate = cli.Command{
 	}, flags.AllDefaultFlags...),
 }
 
-func runLabelCreate(_ stdctx.Context, cmd *cli.Command) error {
+func runLabelCreate(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 

cmd/labels/create_test.go

@@ -1,5 +1,6 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package labels
 

cmd/labels/delete.go

@@ -1,16 +1,14 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package labels
 
 import (
-	stdctx "context"
-	"fmt"
-
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
 
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdLabelDelete represents a sub command of labels to delete label.
@@ -22,32 +20,17 @@ var CmdLabelDelete = cli.Command{
 	ArgsUsage:   " ", // command does not accept arguments
 	Action:      runLabelDelete,
 	Flags: append([]cli.Flag{
-		&cli.Int64Flag{
-			Name:     "id",
-			Usage:    "label id",
-			Required: true,
+		&cli.IntFlag{
+			Name:  "id",
+			Usage: "label id",
 		},
 	}, flags.AllDefaultFlags...),
 }
 
-func runLabelDelete(_ stdctx.Context, cmd *cli.Command) error {
+func runLabelDelete(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 
-	labelID := ctx.Int64("id")
-	client := ctx.Login.Client()
-
-	// Verify the label exists first
-	label, _, err := client.GetRepoLabel(ctx.Owner, ctx.Repo, labelID)
-	if err != nil {
-		return fmt.Errorf("failed to get label %d: %w", labelID, err)
-	}
-
-	_, err = client.DeleteLabel(ctx.Owner, ctx.Repo, labelID)
-	if err != nil {
-		return fmt.Errorf("failed to delete label '%s' (id: %d): %w", label.Name, labelID, err)
-	}
-
-	fmt.Printf("Label '%s' (id: %d) deleted successfully\n", label.Name, labelID)
-	return nil
+	_, err := ctx.Login.Client().DeleteLabel(ctx.Owner, ctx.Repo, ctx.Int64("id"))
+	return err
 }

cmd/labels/list.go

@@ -1,18 +1,17 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package labels
 
 import (
-	stdctx "context"
-
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/print"
 	"code.gitea.io/tea/modules/task"
 
 	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdLabelsList represents a sub command of labels to list labels
@@ -35,13 +34,13 @@ var CmdLabelsList = cli.Command{
 }
 
 // RunLabelsList list labels.
-func RunLabelsList(_ stdctx.Context, cmd *cli.Command) error {
+func RunLabelsList(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 
 	client := ctx.Login.Client()
 	labels, _, err := client.ListRepoLabels(ctx.Owner, ctx.Repo, gitea.ListLabelsOptions{
-		ListOptions: flags.GetListOptions(),
+		ListOptions: ctx.GetListOptions(),
 	})
 	if err != nil {
 		return err

cmd/labels/update.go

@@ -1,16 +1,15 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package labels
 
 import (
-	stdctx "context"
-
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
 
 	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdLabelUpdate represents a sub command of labels to update label.
@@ -21,7 +20,7 @@ var CmdLabelUpdate = cli.Command{
 	ArgsUsage:   " ", // command does not accept arguments
 	Action:      runLabelUpdate,
 	Flags: append([]cli.Flag{
-		&cli.Int64Flag{
+		&cli.IntFlag{
 			Name:  "id",
 			Usage: "label id",
 		},
@@ -40,7 +39,7 @@ var CmdLabelUpdate = cli.Command{
 	}, flags.AllDefaultFlags...),
 }
 
-func runLabelUpdate(_ stdctx.Context, cmd *cli.Command) error {
+func runLabelUpdate(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 

cmd/login.go

@@ -1,17 +1,17 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package cmd
 
 import (
-	"context"
 	"fmt"
 
 	"code.gitea.io/tea/cmd/login"
 	"code.gitea.io/tea/modules/config"
 	"code.gitea.io/tea/modules/print"
 
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdLogin represents to login a gitea server.
@@ -23,22 +23,20 @@ var CmdLogin = cli.Command{
 	Description: `Log in to a Gitea server`,
 	ArgsUsage:   "[<login name>]",
 	Action:      runLogins,
-	Commands: []*cli.Command{
+	Subcommands: []*cli.Command{
 		&login.CmdLoginList,
 		&login.CmdLoginAdd,
 		&login.CmdLoginEdit,
 		&login.CmdLoginDelete,
 		&login.CmdLoginSetDefault,
-		&login.CmdLoginHelper,
-		&login.CmdLoginOAuthRefresh,
 	},
 }
 
-func runLogins(ctx context.Context, cmd *cli.Command) error {
-	if cmd.Args().Len() == 1 {
-		return runLoginDetail(cmd.Args().First())
+func runLogins(ctx *cli.Context) error {
+	if ctx.Args().Len() == 1 {
+		return runLoginDetail(ctx.Args().First())
 	}
-	return login.RunLoginList(ctx, cmd)
+	return login.RunLoginList(ctx)
 }
 
 func runLoginDetail(name string) error {

cmd/login/add.go

@@ -1,17 +1,14 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package login
 
 import (
-	"context"
-	"fmt"
-
-	"code.gitea.io/tea/modules/auth"
 	"code.gitea.io/tea/modules/interact"
 	"code.gitea.io/tea/modules/task"
 
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdLoginAdd represents to login a gitea server.
@@ -30,136 +27,56 @@ var CmdLoginAdd = cli.Command{
 			Name:    "url",
 			Aliases: []string{"u"},
 			Value:   "https://gitea.com",
-			Sources: cli.EnvVars("GITEA_SERVER_URL"),
+			EnvVars: []string{"GITEA_SERVER_URL"},
 			Usage:   "Server URL",
 		},
-		&cli.BoolFlag{
-			Name:    "no-version-check",
-			Aliases: []string{"nv"},
-			Usage:   "Do not check version of Gitea instance",
-		},
 		&cli.StringFlag{
 			Name:    "token",
 			Aliases: []string{"t"},
 			Value:   "",
-			Sources: cli.EnvVars("GITEA_SERVER_TOKEN"),
+			EnvVars: []string{"GITEA_SERVER_TOKEN"},
 			Usage:   "Access token. Can be obtained from Settings > Applications",
 		},
 		&cli.StringFlag{
 			Name:    "user",
 			Value:   "",
-			Sources: cli.EnvVars("GITEA_SERVER_USER"),
+			EnvVars: []string{"GITEA_SERVER_USER"},
 			Usage:   "User for basic auth (will create token)",
 		},
 		&cli.StringFlag{
 			Name:    "password",
 			Aliases: []string{"pwd"},
 			Value:   "",
-			Sources: cli.EnvVars("GITEA_SERVER_PASSWORD"),
+			EnvVars: []string{"GITEA_SERVER_PASSWORD"},
 			Usage:   "Password for basic auth (will create token)",
 		},
-		&cli.StringFlag{
-			Name:    "otp",
-			Sources: cli.EnvVars("GITEA_SERVER_OTP"),
-			Usage:   "OTP token for auth, if necessary",
-		},
-		&cli.StringFlag{
-			Name:    "scopes",
-			Sources: cli.EnvVars("GITEA_SCOPES"),
-			Usage:   "Token scopes to add when creating a new token, separated by a comma",
-		},
 		&cli.StringFlag{
 			Name:    "ssh-key",
 			Aliases: []string{"s"},
-			Usage:   "Path to a SSH key/certificate to use, overrides auto-discovery",
+			Usage:   "Path to a SSH key to use, overrides auto-discovery",
 		},
 		&cli.BoolFlag{
 			Name:    "insecure",
 			Aliases: []string{"i"},
 			Usage:   "Disable TLS verification",
 		},
-		&cli.StringFlag{
-			Name:    "ssh-agent-principal",
-			Aliases: []string{"c"},
-			Usage:   "Use SSH certificate with specified principal to login (needs a running ssh-agent with certificate loaded)",
-		},
-		&cli.StringFlag{
-			Name:    "ssh-agent-key",
-			Aliases: []string{"a"},
-			Usage:   "Use SSH public key or SSH fingerprint to login (needs a running ssh-agent with ssh key loaded)",
-		},
-		&cli.BoolFlag{
-			Name:    "helper",
-			Aliases: []string{"j"},
-			Usage:   "Add helper",
-		},
-		&cli.BoolFlag{
-			Name:    "oauth",
-			Aliases: []string{"o"},
-			Usage:   "Use interactive OAuth2 flow for authentication",
-		},
-		&cli.StringFlag{
-			Name:  "client-id",
-			Usage: "OAuth client ID (for use with --oauth)",
-		},
-		&cli.StringFlag{
-			Name:  "redirect-url",
-			Usage: "OAuth redirect URL (for use with --oauth)",
-		},
 	},
 	Action: runLoginAdd,
 }
 
-func runLoginAdd(_ context.Context, cmd *cli.Command) error {
+func runLoginAdd(ctx *cli.Context) error {
 	// if no args create login interactive
-	if cmd.NumFlags() == 0 {
-		if err := interact.CreateLogin(); err != nil && !interact.IsQuitting(err) {
-			return fmt.Errorf("error adding login: %w", err)
-		}
-		return nil
-	}
-
-	// if OAuth flag is provided, use OAuth2 PKCE flow
-	if cmd.Bool("oauth") {
-		opts := auth.OAuthOptions{
-			Name:     cmd.String("name"),
-			URL:      cmd.String("url"),
-			Insecure: cmd.Bool("insecure"),
-		}
-
-		// Only set clientID if provided
-		if cmd.String("client-id") != "" {
-			opts.ClientID = cmd.String("client-id")
-		}
-
-		// Only set redirect URL if provided
-		if cmd.String("redirect-url") != "" {
-			opts.RedirectURL = cmd.String("redirect-url")
-		}
-
-		return auth.OAuthLoginWithFullOptions(opts)
-	}
-
-	sshAgent := false
-	if cmd.String("ssh-agent-key") != "" || cmd.String("ssh-agent-principal") != "" {
-		sshAgent = true
+	if ctx.NumFlags() == 0 {
+		return interact.CreateLogin()
 	}
 
 	// else use args to add login
 	return task.CreateLogin(
-		cmd.String("name"),
-		cmd.String("token"),
-		cmd.String("user"),
-		cmd.String("password"),
-		cmd.String("otp"),
-		cmd.String("scopes"),
-		cmd.String("ssh-key"),
-		cmd.String("url"),
-		cmd.String("ssh-agent-principal"),
-		cmd.String("ssh-agent-key"),
-		cmd.Bool("insecure"),
-		sshAgent,
-		!cmd.Bool("no-version-check"),
-		cmd.Bool("helper"),
-	)
+		ctx.String("name"),
+		ctx.String("token"),
+		ctx.String("user"),
+		ctx.String("password"),
+		ctx.String("ssh-key"),
+		ctx.String("url"),
+		ctx.Bool("insecure"))
 }

cmd/login/default.go

@@ -1,16 +1,16 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package login
 
 import (
-	"context"
 	"fmt"
 
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/config"
 
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdLoginSetDefault represents to login a gitea server.
@@ -23,8 +23,8 @@ var CmdLoginSetDefault = cli.Command{
 	Flags:       []cli.Flag{&flags.OutputFlag},
 }
 
-func runLoginSetDefault(_ context.Context, cmd *cli.Command) error {
-	if cmd.Args().Len() == 0 {
+func runLoginSetDefault(ctx *cli.Context) error {
+	if ctx.Args().Len() == 0 {
 		l, err := config.GetDefaultLogin()
 		if err != nil {
 			return err
@@ -33,6 +33,6 @@ func runLoginSetDefault(_ context.Context, cmd *cli.Command) error {
 		return nil
 	}
 
-	name := cmd.Args().First()
+	name := ctx.Args().First()
 	return config.SetDefaultLogin(name)
 }

cmd/login/delete.go

@@ -1,16 +1,16 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package login
 
 import (
-	"context"
 	"errors"
 	"log"
 
 	"code.gitea.io/tea/modules/config"
 
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdLoginDelete is a command to delete a login
@@ -24,7 +24,7 @@ var CmdLoginDelete = cli.Command{
 }
 
 // RunLoginDelete runs the action of a login delete command
-func RunLoginDelete(_ context.Context, cmd *cli.Command) error {
+func RunLoginDelete(ctx *cli.Context) error {
 	logins, err := config.GetLogins()
 	if err != nil {
 		log.Fatal(err)
@@ -32,8 +32,8 @@ func RunLoginDelete(_ context.Context, cmd *cli.Command) error {
 
 	var name string
 
-	if len(cmd.Args().First()) != 0 {
-		name = cmd.Args().First()
+	if len(ctx.Args().First()) != 0 {
+		name = ctx.Args().First()
 	} else if len(logins) == 1 {
 		name = logins[0].Name
 	} else {

cmd/login/edit.go

@@ -1,19 +1,15 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package login
 
 import (
-	"context"
-	"log"
-	"os"
-	"os/exec"
-
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/config"
 
 	"github.com/skratchdot/open-golang/open"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdLoginEdit represents to login a gitea server.
@@ -27,15 +23,6 @@ var CmdLoginEdit = cli.Command{
 	Flags:       []cli.Flag{&flags.OutputFlag},
 }
 
-func runLoginEdit(_ context.Context, _ *cli.Command) error {
-	if e, ok := os.LookupEnv("EDITOR"); ok && e != "" {
-		cmd := exec.Command(e, config.GetConfigPath())
-		cmd.Stdin = os.Stdin
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		if err := cmd.Run(); err != nil {
-			log.Fatal(err.Error())
-		}
-	}
+func runLoginEdit(_ *cli.Context) error {
 	return open.Start(config.GetConfigPath())
 }

cmd/login/helper.go

@@ -1,131 +0,0 @@
-// Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package login
-
-import (
-	"bufio"
-	"context"
-	"fmt"
-	"log"
-	"net/url"
-	"os"
-	"strings"
-	"time"
-
-	"code.gitea.io/tea/modules/auth"
-	"code.gitea.io/tea/modules/config"
-	"code.gitea.io/tea/modules/task"
-	"github.com/urfave/cli/v3"
-)
-
-// CmdLoginHelper represents to login a gitea helper.
-var CmdLoginHelper = cli.Command{
-	Name:        "helper",
-	Aliases:     []string{"git-credential"},
-	Usage:       "Git helper",
-	Description: `Git helper`,
-	Hidden:      true,
-	Commands: []*cli.Command{
-		{
-			Name:        "store",
-			Description: "Command drops",
-			Aliases:     []string{"erase"},
-			Action: func(_ context.Context, _ *cli.Command) error {
-				return nil
-			},
-		},
-		{
-			Name:        "setup",
-			Description: "Setup helper to tea authenticate",
-			Action: func(_ context.Context, _ *cli.Command) error {
-				logins, err := config.GetLogins()
-				if err != nil {
-					return err
-				}
-				for _, login := range logins {
-					added, err := task.SetupHelper(login)
-					if err != nil {
-						return err
-					} else if added {
-						fmt.Printf("Added \"%s\"\n", login.Name)
-					} else {
-						fmt.Printf("\"%s\" has already been added!\n", login.Name)
-					}
-				}
-				return nil
-			},
-		},
-		{
-			Name:        "get",
-			Description: "Get token to auth",
-			Action: func(_ context.Context, cmd *cli.Command) error {
-				wants := map[string]string{}
-				s := bufio.NewScanner(os.Stdin)
-				for s.Scan() {
-					line := s.Text()
-					if line == "" {
-						break
-					}
-					parts := strings.SplitN(line, "=", 2)
-					if len(parts) < 2 {
-						continue
-					}
-					key, value := parts[0], parts[1]
-					if key == "url" {
-						u, err := url.Parse(value)
-						if err != nil {
-							return err
-						}
-						wants["protocol"] = u.Scheme
-						wants["host"] = u.Host
-						wants["path"] = u.Path
-						wants["username"] = u.User.Username()
-						wants["password"], _ = u.User.Password()
-					} else {
-						wants[key] = value
-					}
-				}
-
-				if len(wants["host"]) == 0 {
-					log.Fatal("Require hostname")
-				} else if len(wants["protocol"]) == 0 {
-					wants["protocol"] = "http"
-				}
-
-				userConfig := config.GetLoginByHost(wants["host"])
-				if userConfig == nil {
-					log.Fatal("host not exists")
-				} else if len(userConfig.Token) == 0 {
-					log.Fatal("User no set")
-				}
-
-				host, err := url.Parse(userConfig.URL)
-				if err != nil {
-					return err
-				}
-
-				if userConfig.TokenExpiry > 0 && time.Now().Unix() > userConfig.TokenExpiry {
-					// Token is expired, refresh it
-					err = auth.RefreshAccessToken(userConfig)
-					if err != nil {
-						return err
-					}
-
-					// Once token is refreshed, get the latest from the updated config
-					refreshedConfig := config.GetLoginByHost(wants["host"])
-					if refreshedConfig != nil {
-						userConfig = refreshedConfig
-					}
-				}
-
-				_, err = fmt.Fprintf(os.Stdout, "protocol=%s\nhost=%s\nusername=%s\npassword=%s\n", host.Scheme, host.Host, userConfig.User, userConfig.Token)
-				if err != nil {
-					return err
-				}
-
-				return nil
-			},
-		},
-	},
-}

cmd/login/list.go

@@ -1,16 +1,15 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package login
 
 import (
-	"context"
-
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/config"
 	"code.gitea.io/tea/modules/print"
 
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdLoginList represents to login a gitea server.
@@ -25,7 +24,7 @@ var CmdLoginList = cli.Command{
 }
 
 // RunLoginList list all logins
-func RunLoginList(_ context.Context, cmd *cli.Command) error {
+func RunLoginList(cmd *cli.Context) error {
 	logins, err := config.GetLogins()
 	if err != nil {
 		return err

cmd/login/oauth_refresh.go

@@ -1,59 +0,0 @@
-// Copyright 2025 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package login
-
-import (
-	"context"
-	"fmt"
-
-	"code.gitea.io/tea/modules/auth"
-	"code.gitea.io/tea/modules/config"
-
-	"github.com/urfave/cli/v3"
-)
-
-// CmdLoginOAuthRefresh represents a command to refresh an OAuth token
-var CmdLoginOAuthRefresh = cli.Command{
-	Name:        "oauth-refresh",
-	Usage:       "Refresh an OAuth token",
-	Description: "Manually refresh an expired OAuth token. Usually only used when troubleshooting authentication.",
-	ArgsUsage:   "[<login name>]",
-	Action:      runLoginOAuthRefresh,
-}
-
-func runLoginOAuthRefresh(_ context.Context, cmd *cli.Command) error {
-	var loginName string
-
-	// Get login name from args or use default
-	if cmd.Args().Len() > 0 {
-		loginName = cmd.Args().First()
-	} else {
-		// Get default login
-		login, err := config.GetDefaultLogin()
-		if err != nil {
-			return fmt.Errorf("no login specified and no default login found: %s", err)
-		}
-		loginName = login.Name
-	}
-
-	// Get the login from config
-	login := config.GetLoginByName(loginName)
-	if login == nil {
-		return fmt.Errorf("login '%s' not found", loginName)
-	}
-
-	// Check if the login has a refresh token
-	if login.RefreshToken == "" {
-		return fmt.Errorf("login '%s' does not have a refresh token. It may have been created using a different authentication method", loginName)
-	}
-
-	// Refresh the token
-	err := auth.RefreshAccessToken(login)
-	if err != nil {
-		return fmt.Errorf("failed to refresh token: %s", err)
-	}
-
-	fmt.Printf("Successfully refreshed OAuth token for %s\n", loginName)
-	return nil
-}

cmd/logout.go

@@ -1,12 +1,13 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package cmd
 
 import (
 	"code.gitea.io/tea/cmd/login"
 
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdLogout represents to logout a gitea server.

cmd/man.go

@@ -1,62 +0,0 @@
-// Copyright 2025 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package cmd
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path/filepath"
-
-	docs "github.com/urfave/cli-docs/v3"
-	"github.com/urfave/cli/v3"
-)
-
-// DocRenderFlags are the flags for documentation generation, used by `./docs/docs.go` and the `generate-man-page` sub command
-var DocRenderFlags = []cli.Flag{
-	&cli.StringFlag{
-		Name:    "out",
-		Usage:   "Path to output docs to, otherwise prints to stdout",
-		Aliases: []string{"o"},
-	},
-}
-
-// CmdGenerateManPage is the sub command to generate the `tea` man page
-var CmdGenerateManPage = cli.Command{
-	Name:   "man",
-	Usage:  "Generate man page",
-	Hidden: true,
-	Flags:  DocRenderFlags,
-	Action: func(ctx context.Context, cmd *cli.Command) error {
-		return RenderDocs(cmd, cmd.Root(), docs.ToMan)
-	},
-}
-
-// RenderDocs renders the documentation for `target` using the supplied `render` function
-func RenderDocs(cmd, target *cli.Command, render func(*cli.Command) (string, error)) error {
-	out, err := render(target)
-	if err != nil {
-		return err
-	}
-	outPath := cmd.String("out")
-	if outPath == "" {
-		fmt.Print(out)
-		return nil
-	}
-
-	if err = os.MkdirAll(filepath.Dir(outPath), os.ModePerm); err != nil {
-		return err
-	}
-
-	fi, err := os.Create(outPath)
-	if err != nil {
-		return err
-	}
-	defer fi.Close()
-	if _, err = fi.WriteString(out); err != nil {
-		return err
-	}
-
-	return nil
-}

cmd/milestones.go

@@ -1,15 +1,15 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package cmd
 
 import (
-	stdctx "context"
-
 	"code.gitea.io/tea/cmd/milestones"
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/print"
-	"github.com/urfave/cli/v3"
+
+	"github.com/urfave/cli/v2"
 )
 
 // CmdMilestones represents to operate repositories milestones.
@@ -21,7 +21,7 @@ var CmdMilestones = cli.Command{
 	Description: `List and create milestones`,
 	ArgsUsage:   "[<milestone name>]",
 	Action:      runMilestones,
-	Commands: []*cli.Command{
+	Subcommands: []*cli.Command{
 		&milestones.CmdMilestonesList,
 		&milestones.CmdMilestonesCreate,
 		&milestones.CmdMilestonesClose,
@@ -32,14 +32,14 @@ var CmdMilestones = cli.Command{
 	Flags: milestones.CmdMilestonesList.Flags,
 }
 
-func runMilestones(ctx stdctx.Context, cmd *cli.Command) error {
-	if cmd.Args().Len() == 1 {
-		return runMilestoneDetail(ctx, cmd, cmd.Args().First())
+func runMilestones(ctx *cli.Context) error {
+	if ctx.Args().Len() == 1 {
+		return runMilestoneDetail(ctx, ctx.Args().First())
 	}
-	return milestones.RunMilestonesList(ctx, cmd)
+	return milestones.RunMilestonesList(ctx)
 }
 
-func runMilestoneDetail(_ stdctx.Context, cmd *cli.Command, name string) error {
+func runMilestoneDetail(cmd *cli.Context, name string) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 	client := ctx.Login.Client()

cmd/milestones/close.go

@@ -1,26 +1,26 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package milestones
 
 import (
-	"context"
-
 	"code.gitea.io/tea/cmd/flags"
-	"github.com/urfave/cli/v3"
+
+	"github.com/urfave/cli/v2"
 )
 
 // CmdMilestonesClose represents a sub command of milestones to close an milestone
 var CmdMilestonesClose = cli.Command{
 	Name:        "close",
-	Usage:       "Change state of one or more milestones to 'closed'",
-	Description: `Change state of one or more milestones to 'closed'`,
-	ArgsUsage:   "<milestone name> [<milestone name>...]",
-	Action: func(ctx context.Context, cmd *cli.Command) error {
-		if cmd.Bool("force") {
-			return deleteMilestone(ctx, cmd)
+	Usage:       "Change state of an milestone to 'closed'",
+	Description: `Change state of an milestone to 'closed'`,
+	ArgsUsage:   "<milestone name>",
+	Action: func(ctx *cli.Context) error {
+		if ctx.Bool("force") {
+			return deleteMilestone(ctx)
 		}
-		return editMilestoneStatus(ctx, cmd, true)
+		return editMilestoneStatus(ctx, true)
 	},
 	Flags: append([]cli.Flag{
 		&cli.BoolFlag{

cmd/milestones/create.go

@@ -1,20 +1,20 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package milestones
 
 import (
 	"time"
 
-	stdctx "context"
-
-	"code.gitea.io/sdk/gitea"
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/interact"
 	"code.gitea.io/tea/modules/task"
+
+	"code.gitea.io/sdk/gitea"
 	"github.com/araddon/dateparse"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdMilestonesCreate represents a sub command of milestones to create milestone
@@ -49,7 +49,7 @@ var CmdMilestonesCreate = cli.Command{
 	}, flags.AllDefaultFlags...),
 }
 
-func runMilestonesCreate(_ stdctx.Context, cmd *cli.Command) error {
+func runMilestonesCreate(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 
 	date := ctx.String("deadline")
@@ -68,10 +68,7 @@ func runMilestonesCreate(_ stdctx.Context, cmd *cli.Command) error {
 	}
 
 	if ctx.NumFlags() == 0 {
-		if err := interact.CreateMilestone(ctx.Login, ctx.Owner, ctx.Repo); err != nil && !interact.IsQuitting(err) {
-			return err
-		}
-		return nil
+		return interact.CreateMilestone(ctx.Login, ctx.Owner, ctx.Repo)
 	}
 
 	return task.CreateMilestone(

cmd/milestones/delete.go

@@ -1,15 +1,14 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package milestones
 
 import (
-	stdctx "context"
-
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
 
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdMilestonesDelete represents a sub command of milestones to delete an milestone
@@ -23,7 +22,7 @@ var CmdMilestonesDelete = cli.Command{
 	Flags:       flags.AllDefaultFlags,
 }
 
-func deleteMilestone(_ stdctx.Context, cmd *cli.Command) error {
+func deleteMilestone(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 	client := ctx.Login.Client()

cmd/milestones/issues.go

@@ -1,19 +1,19 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package milestones
 
 import (
 	"fmt"
 
-	stdctx "context"
-
-	"code.gitea.io/sdk/gitea"
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/print"
 	"code.gitea.io/tea/modules/utils"
-	"github.com/urfave/cli/v3"
+
+	"code.gitea.io/sdk/gitea"
+	"github.com/urfave/cli/v2"
 )
 
 var msIssuesFieldsFlag = flags.FieldsFlag(print.IssueFields, []string{
@@ -28,7 +28,7 @@ var CmdMilestonesIssues = cli.Command{
 	Description: "manage issue/pull of an milestone",
 	ArgsUsage:   "<milestone name>",
 	Action:      runMilestoneIssueList,
-	Commands: []*cli.Command{
+	Subcommands: []*cli.Command{
 		&CmdMilestoneAddIssue,
 		&CmdMilestoneRemoveIssue,
 	},
@@ -70,7 +70,7 @@ var CmdMilestoneRemoveIssue = cli.Command{
 	Flags:       flags.AllDefaultFlags,
 }
 
-func runMilestoneIssueList(_ stdctx.Context, cmd *cli.Command) error {
+func runMilestoneIssueList(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 	client := ctx.Login.Client()
@@ -103,7 +103,7 @@ func runMilestoneIssueList(_ stdctx.Context, cmd *cli.Command) error {
 	}
 
 	issues, _, err := client.ListRepoIssues(ctx.Owner, ctx.Repo, gitea.ListIssueOption{
-		ListOptions: flags.GetListOptions(),
+		ListOptions: ctx.GetListOptions(),
 		Milestones:  []string{milestone},
 		Type:        kind,
 		State:       state,
@@ -120,7 +120,7 @@ func runMilestoneIssueList(_ stdctx.Context, cmd *cli.Command) error {
 	return nil
 }
 
-func runMilestoneIssueAdd(_ stdctx.Context, cmd *cli.Command) error {
+func runMilestoneIssueAdd(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 	client := ctx.Login.Client()
@@ -147,7 +147,7 @@ func runMilestoneIssueAdd(_ stdctx.Context, cmd *cli.Command) error {
 	return err
 }
 
-func runMilestoneIssueRemove(_ stdctx.Context, cmd *cli.Command) error {
+func runMilestoneIssueRemove(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 	client := ctx.Login.Client()

cmd/milestones/list.go

@@ -1,17 +1,16 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package milestones
 
 import (
-	stdctx "context"
-
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/print"
 
 	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 var fieldsFlag = flags.FieldsFlag(print.MilestoneFields, []string{
@@ -39,7 +38,7 @@ var CmdMilestonesList = cli.Command{
 }
 
 // RunMilestonesList list milestones
-func RunMilestonesList(_ stdctx.Context, cmd *cli.Command) error {
+func RunMilestonesList(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 
@@ -61,7 +60,7 @@ func RunMilestonesList(_ stdctx.Context, cmd *cli.Command) error {
 
 	client := ctx.Login.Client()
 	milestones, _, err := client.ListRepoMilestones(ctx.Owner, ctx.Repo, gitea.ListMilestoneOption{
-		ListOptions: flags.GetListOptions(),
+		ListOptions: ctx.GetListOptions(),
 		State:       state,
 	})
 

cmd/milestones/reopen.go

@@ -1,62 +1,43 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package milestones
 
 import (
-	stdctx "context"
-	"errors"
-	"fmt"
-
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
-	"code.gitea.io/tea/modules/print"
 
 	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdMilestonesReopen represents a sub command of milestones to open an milestone
 var CmdMilestonesReopen = cli.Command{
 	Name:        "reopen",
 	Aliases:     []string{"open"},
-	Usage:       "Change state of one or more milestones to 'open'",
-	Description: `Change state of one or more milestones to 'open'`,
-	ArgsUsage:   "<milestone name> [<milestone name> ...]",
-	Action: func(ctx stdctx.Context, cmd *cli.Command) error {
-		return editMilestoneStatus(ctx, cmd, false)
+	Usage:       "Change state of an milestone to 'open'",
+	Description: `Change state of an milestone to 'open'`,
+	ArgsUsage:   "<milestone name>",
+	Action: func(ctx *cli.Context) error {
+		return editMilestoneStatus(ctx, false)
 	},
 	Flags: flags.AllDefaultFlags,
 }
 
-func editMilestoneStatus(_ stdctx.Context, cmd *cli.Command, close bool) error {
+func editMilestoneStatus(cmd *cli.Context, close bool) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
-	if ctx.Args().Len() == 0 {
-		return errors.New(ctx.Command.ArgsUsage)
-	}
+	client := ctx.Login.Client()
 
 	state := gitea.StateOpen
 	if close {
 		state = gitea.StateClosed
 	}
+	_, _, err := client.EditMilestoneByName(ctx.Owner, ctx.Repo, ctx.Args().First(), gitea.EditMilestoneOption{
+		State: &state,
+		Title: ctx.Args().First(),
+	})
 
-	client := ctx.Login.Client()
-	for _, ms := range ctx.Args().Slice() {
-		opts := gitea.EditMilestoneOption{
-			State: &state,
-			Title: ms,
-		}
-		milestone, _, err := client.EditMilestoneByName(ctx.Owner, ctx.Repo, ms, opts)
-		if err != nil {
-			return err
-		}
-
-		if ctx.Args().Len() > 1 {
-			fmt.Printf("%s/milestone/%d\n", ctx.GetRemoteRepoHTMLURL(), milestone.ID)
-		} else {
-			print.MilestoneDetails(milestone)
-		}
-	}
-	return nil
+	return err
 }

cmd/notifications.go

@@ -1,12 +1,13 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package cmd
 
 import (
 	"code.gitea.io/tea/cmd/notifications"
 
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdNotifications is the main command to operate with notifications
@@ -17,7 +18,7 @@ var CmdNotifications = cli.Command{
 	Usage:       "Show notifications",
 	Description: "Show notifications, by default based on the current repo if available",
 	Action:      notifications.RunNotificationsList,
-	Commands: []*cli.Command{
+	Subcommands: []*cli.Command{
 		&notifications.CmdNotificationsList,
 		&notifications.CmdNotificationsMarkRead,
 		&notifications.CmdNotificationsMarkUnread,

cmd/notifications/list.go

@@ -1,10 +1,10 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package notifications
 
 import (
-	stdctx "context"
 	"log"
 
 	"code.gitea.io/tea/cmd/flags"
@@ -12,7 +12,7 @@ import (
 	"code.gitea.io/tea/modules/print"
 
 	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 var notifyFieldsFlag = flags.FieldsFlag(print.NotificationFields, []string{
@@ -37,9 +37,9 @@ var CmdNotificationsList = cli.Command{
 }
 
 // RunNotificationsList list notifications
-func RunNotificationsList(ctx stdctx.Context, cmd *cli.Command) error {
+func RunNotificationsList(ctx *cli.Context) error {
 	var states []gitea.NotifyStatus
-	statesStr, err := flags.NotificationStateFlag.GetValues(cmd)
+	statesStr, err := flags.NotificationStateFlag.GetValues(ctx)
 	if err != nil {
 		return err
 	}
@@ -48,7 +48,7 @@ func RunNotificationsList(ctx stdctx.Context, cmd *cli.Command) error {
 	}
 
 	var types []gitea.NotifySubjectType
-	typesStr, err := notifyTypeFlag.GetValues(cmd)
+	typesStr, err := notifyTypeFlag.GetValues(ctx)
 	if err != nil {
 		return err
 	}
@@ -56,11 +56,11 @@ func RunNotificationsList(ctx stdctx.Context, cmd *cli.Command) error {
 		types = append(types, gitea.NotifySubjectType(t))
 	}
 
-	return listNotifications(ctx, cmd, states, types)
+	return listNotifications(ctx, states, types)
 }
 
 // listNotifications will get the notifications based on status and subject type
-func listNotifications(_ stdctx.Context, cmd *cli.Command, status []gitea.NotifyStatus, subjects []gitea.NotifySubjectType) error {
+func listNotifications(cmd *cli.Context, status []gitea.NotifyStatus, subjects []gitea.NotifySubjectType) error {
 	var news []*gitea.NotificationThread
 	var err error
 
@@ -69,7 +69,7 @@ func listNotifications(_ stdctx.Context, cmd *cli.Command, status []gitea.Notify
 	all := ctx.Bool("mine")
 
 	// This enforces pagination (see https://github.com/go-gitea/gitea/issues/16733)
-	listOpts := flags.GetListOptions()
+	listOpts := ctx.GetListOptions()
 	if listOpts.Page == 0 {
 		listOpts.Page = 1
 	}

cmd/notifications/mark_as.go

@@ -1,17 +1,17 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package notifications
 
 import (
-	stdctx "context"
 	"fmt"
 
 	"code.gitea.io/sdk/gitea"
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/utils"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdNotificationsMarkRead represents a sub command of notifications to list read notifications
@@ -22,16 +22,16 @@ var CmdNotificationsMarkRead = cli.Command{
 	Description: "Mark all filtered or a specific notification as read",
 	ArgsUsage:   "[all | <notification id>]",
 	Flags:       flags.NotificationFlags,
-	Action: func(_ stdctx.Context, cmd *cli.Command) error {
-		ctx := context.InitCommand(cmd)
-		filter, err := flags.NotificationStateFlag.GetValues(cmd)
+	Action: func(ctx *cli.Context) error {
+		cmd := context.InitCommand(ctx)
+		filter, err := flags.NotificationStateFlag.GetValues(ctx)
 		if err != nil {
 			return err
 		}
-		if !ctx.IsSet(flags.NotificationStateFlag.Name) {
+		if !cmd.IsSet(flags.NotificationStateFlag.Name) {
 			filter = []string{string(gitea.NotifyStatusUnread)}
 		}
-		return markNotificationAs(ctx, filter, gitea.NotifyStatusRead)
+		return markNotificationAs(cmd, filter, gitea.NotifyStatusRead)
 	},
 }
 
@@ -43,16 +43,16 @@ var CmdNotificationsMarkUnread = cli.Command{
 	Description: "Mark all filtered or a specific notification as unread",
 	ArgsUsage:   "[all | <notification id>]",
 	Flags:       flags.NotificationFlags,
-	Action: func(_ stdctx.Context, cmd *cli.Command) error {
-		ctx := context.InitCommand(cmd)
-		filter, err := flags.NotificationStateFlag.GetValues(cmd)
+	Action: func(ctx *cli.Context) error {
+		cmd := context.InitCommand(ctx)
+		filter, err := flags.NotificationStateFlag.GetValues(ctx)
 		if err != nil {
 			return err
 		}
-		if !ctx.IsSet(flags.NotificationStateFlag.Name) {
+		if !cmd.IsSet(flags.NotificationStateFlag.Name) {
 			filter = []string{string(gitea.NotifyStatusRead)}
 		}
-		return markNotificationAs(ctx, filter, gitea.NotifyStatusUnread)
+		return markNotificationAs(cmd, filter, gitea.NotifyStatusUnread)
 	},
 }
 
@@ -64,16 +64,16 @@ var CmdNotificationsMarkPinned = cli.Command{
 	Description: "Mark all filtered or a specific notification as pinned",
 	ArgsUsage:   "[all | <notification id>]",
 	Flags:       flags.NotificationFlags,
-	Action: func(_ stdctx.Context, cmd *cli.Command) error {
-		ctx := context.InitCommand(cmd)
-		filter, err := flags.NotificationStateFlag.GetValues(cmd)
+	Action: func(ctx *cli.Context) error {
+		cmd := context.InitCommand(ctx)
+		filter, err := flags.NotificationStateFlag.GetValues(ctx)
 		if err != nil {
 			return err
 		}
-		if !ctx.IsSet(flags.NotificationStateFlag.Name) {
+		if !cmd.IsSet(flags.NotificationStateFlag.Name) {
 			filter = []string{string(gitea.NotifyStatusUnread)}
 		}
-		return markNotificationAs(ctx, filter, gitea.NotifyStatusPinned)
+		return markNotificationAs(cmd, filter, gitea.NotifyStatusPinned)
 	},
 }
 
@@ -84,11 +84,11 @@ var CmdNotificationsUnpin = cli.Command{
 	Description: "Marks all pinned or a specific notification as read",
 	ArgsUsage:   "[all | <notification id>]",
 	Flags:       flags.NotificationFlags,
-	Action: func(_ stdctx.Context, cmd *cli.Command) error {
-		ctx := context.InitCommand(cmd)
+	Action: func(ctx *cli.Context) error {
+		cmd := context.InitCommand(ctx)
 		filter := []string{string(gitea.NotifyStatusPinned)}
 		// NOTE: we implicitly mark it as read, to match web UI semantics. marking as unread might be more useful?
-		return markNotificationAs(ctx, filter, gitea.NotifyStatusRead)
+		return markNotificationAs(cmd, filter, gitea.NotifyStatusRead)
 	},
 }
 

cmd/open.go

@@ -1,10 +1,10 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package cmd
 
 import (
-	stdctx "context"
 	"path"
 	"strings"
 
@@ -13,7 +13,7 @@ import (
 	local_git "code.gitea.io/tea/modules/git"
 
 	"github.com/skratchdot/open-golang/open"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdOpen represents a sub command of issues to open issue on the web browser
@@ -27,7 +27,7 @@ var CmdOpen = cli.Command{
 	Flags:       append([]cli.Flag{}, flags.LoginRepoFlags...),
 }
 
-func runOpen(_ stdctx.Context, cmd *cli.Command) error {
+func runOpen(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 
@@ -74,5 +74,6 @@ func runOpen(_ stdctx.Context, cmd *cli.Command) error {
 		suffix = number
 	}
 
-	return open.Run(path.Join(ctx.GetRemoteRepoHTMLURL(), suffix))
+	u := path.Join(ctx.Login.URL, ctx.Owner, ctx.Repo, suffix)
+	return open.Run(u)
 }

cmd/organizations.go

@@ -1,16 +1,15 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package cmd
 
 import (
-	stdctx "context"
-
 	"code.gitea.io/tea/cmd/organizations"
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/print"
 
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdOrgs represents handle organization
@@ -22,7 +21,7 @@ var CmdOrgs = cli.Command{
 	Description: "Show organization details",
 	ArgsUsage:   "[<organization>]",
 	Action:      runOrganizations,
-	Commands: []*cli.Command{
+	Subcommands: []*cli.Command{
 		&organizations.CmdOrganizationList,
 		&organizations.CmdOrganizationCreate,
 		&organizations.CmdOrganizationDelete,
@@ -30,12 +29,12 @@ var CmdOrgs = cli.Command{
 	Flags: organizations.CmdOrganizationList.Flags,
 }
 
-func runOrganizations(ctx stdctx.Context, cmd *cli.Command) error {
-	teaCtx := context.InitCommand(cmd)
-	if teaCtx.Args().Len() == 1 {
-		return runOrganizationDetail(teaCtx)
+func runOrganizations(cmd *cli.Context) error {
+	ctx := context.InitCommand(cmd)
+	if ctx.Args().Len() == 1 {
+		return runOrganizationDetail(ctx)
 	}
-	return organizations.RunOrganizationList(ctx, cmd)
+	return organizations.RunOrganizationList(cmd)
 }
 
 func runOrganizationDetail(ctx *context.TeaContext) error {

cmd/organizations/create.go

@@ -1,18 +1,18 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package organizations
 
 import (
 	"fmt"
 
-	stdctx "context"
-
-	"code.gitea.io/sdk/gitea"
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/print"
-	"github.com/urfave/cli/v3"
+
+	"code.gitea.io/sdk/gitea"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdOrganizationCreate represents a sub command of organizations to delete a given user organization
@@ -52,7 +52,7 @@ var CmdOrganizationCreate = cli.Command{
 }
 
 // RunOrganizationCreate sets up a new organization
-func RunOrganizationCreate(_ stdctx.Context, cmd *cli.Command) error {
+func RunOrganizationCreate(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 
 	if ctx.Args().Len() < 1 {

cmd/organizations/delete.go

@@ -1,15 +1,15 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package organizations
 
 import (
-	stdctx "context"
 	"fmt"
 
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdOrganizationDelete represents a sub command of organizations to delete a given user organization
@@ -27,7 +27,7 @@ var CmdOrganizationDelete = cli.Command{
 }
 
 // RunOrganizationDelete delete user organization
-func RunOrganizationDelete(_ stdctx.Context, cmd *cli.Command) error {
+func RunOrganizationDelete(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 
 	client := ctx.Login.Client()

cmd/organizations/list.go

@@ -1,16 +1,16 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package organizations
 
 import (
-	stdctx "context"
-
-	"code.gitea.io/sdk/gitea"
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/print"
-	"github.com/urfave/cli/v3"
+
+	"code.gitea.io/sdk/gitea"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdOrganizationList represents a sub command of organizations to list users organizations
@@ -28,12 +28,12 @@ var CmdOrganizationList = cli.Command{
 }
 
 // RunOrganizationList list user organizations
-func RunOrganizationList(_ stdctx.Context, cmd *cli.Command) error {
+func RunOrganizationList(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 	client := ctx.Login.Client()
 
 	userOrganizations, _, err := client.ListUserOrgs(ctx.Login.User, gitea.ListOrgsOptions{
-		ListOptions: flags.GetListOptions(),
+		ListOptions: ctx.GetListOptions(),
 	})
 	if err != nil {
 		return err

cmd/pulls.go

@@ -1,10 +1,10 @@
 // Copyright 2018 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package cmd
 
 import (
-	stdctx "context"
 	"fmt"
 
 	"code.gitea.io/tea/cmd/pulls"
@@ -15,7 +15,7 @@ import (
 	"code.gitea.io/tea/modules/workaround"
 
 	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdPulls is the main command to operate on PRs
@@ -33,7 +33,7 @@ var CmdPulls = cli.Command{
 			Usage: "Whether to display comments (will prompt if not provided & run interactively)",
 		},
 	}, pulls.CmdPullsList.Flags...),
-	Commands: []*cli.Command{
+	Subcommands: []*cli.Command{
 		&pulls.CmdPullsList,
 		&pulls.CmdPullsCheckout,
 		&pulls.CmdPullsClean,
@@ -47,14 +47,14 @@ var CmdPulls = cli.Command{
 	},
 }
 
-func runPulls(ctx stdctx.Context, cmd *cli.Command) error {
-	if cmd.Args().Len() == 1 {
-		return runPullDetail(ctx, cmd, cmd.Args().First())
+func runPulls(ctx *cli.Context) error {
+	if ctx.Args().Len() == 1 {
+		return runPullDetail(ctx, ctx.Args().First())
 	}
-	return pulls.RunPullsList(ctx, cmd)
+	return pulls.RunPullsList(ctx)
 }
 
-func runPullDetail(_ stdctx.Context, cmd *cli.Command, index string) error {
+func runPullDetail(cmd *cli.Context, index string) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 	idx, err := utils.ArgToIndex(index)

cmd/pulls/approve.go

@@ -1,5 +1,6 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package pulls
 
@@ -7,14 +8,13 @@ import (
 	"fmt"
 	"strings"
 
-	stdctx "context"
-
-	"code.gitea.io/sdk/gitea"
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/task"
 	"code.gitea.io/tea/modules/utils"
-	"github.com/urfave/cli/v3"
+
+	"code.gitea.io/sdk/gitea"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdPullsApprove approves a PR
@@ -24,7 +24,7 @@ var CmdPullsApprove = cli.Command{
 	Usage:       "Approve a pull request",
 	Description: "Approve a pull request",
 	ArgsUsage:   "<pull index> [<comment>]",
-	Action: func(_ stdctx.Context, cmd *cli.Command) error {
+	Action: func(cmd *cli.Context) error {
 		ctx := context.InitCommand(cmd)
 		ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 

cmd/pulls/checkout.go

@@ -1,10 +1,10 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package pulls
 
 import (
-	stdctx "context"
 	"fmt"
 
 	"code.gitea.io/tea/cmd/flags"
@@ -13,7 +13,7 @@ import (
 	"code.gitea.io/tea/modules/task"
 	"code.gitea.io/tea/modules/utils"
 
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdPullsCheckout is a command to locally checkout the given PR
@@ -33,7 +33,7 @@ var CmdPullsCheckout = cli.Command{
 	}, flags.AllDefaultFlags...),
 }
 
-func runPullsCheckout(_ stdctx.Context, cmd *cli.Command) error {
+func runPullsCheckout(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{
 		LocalRepo:  true,
@@ -47,8 +47,5 @@ func runPullsCheckout(_ stdctx.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	if err := task.PullCheckout(ctx.Login, ctx.Owner, ctx.Repo, ctx.Bool("branch"), idx, interact.PromptPassword); err != nil && !interact.IsQuitting(err) {
-		return err
-	}
-	return nil
+	return task.PullCheckout(ctx.Login, ctx.Owner, ctx.Repo, ctx.Bool("branch"), idx, interact.PromptPassword)
 }

cmd/pulls/clean.go

@@ -1,19 +1,19 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package pulls
 
 import (
 	"fmt"
 
-	stdctx "context"
-
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/interact"
 	"code.gitea.io/tea/modules/task"
 	"code.gitea.io/tea/modules/utils"
-	"github.com/urfave/cli/v3"
+
+	"github.com/urfave/cli/v2"
 )
 
 // CmdPullsClean removes the remote and local feature branches, if a PR is merged.
@@ -31,7 +31,7 @@ var CmdPullsClean = cli.Command{
 	}, flags.AllDefaultFlags...),
 }
 
-func runPullsClean(_ stdctx.Context, cmd *cli.Command) error {
+func runPullsClean(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{LocalRepo: true})
 	if ctx.Args().Len() != 1 {
@@ -43,8 +43,5 @@ func runPullsClean(_ stdctx.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	if err := task.PullClean(ctx.Login, ctx.Owner, ctx.Repo, idx, ctx.Bool("ignore-sha"), interact.PromptPassword); err != nil && !interact.IsQuitting(err) {
-		return err
-	}
-	return nil
+	return task.PullClean(ctx.Login, ctx.Owner, ctx.Repo, idx, ctx.Bool("ignore-sha"), interact.PromptPassword)
 }

cmd/pulls/close.go

@@ -1,26 +1,25 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package pulls
 
 import (
-	"context"
-
 	"code.gitea.io/tea/cmd/flags"
 
 	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdPullsClose closes a given open pull request
 var CmdPullsClose = cli.Command{
 	Name:        "close",
-	Usage:       "Change state of one or more pull requests to 'closed'",
-	Description: `Change state of one or more pull requests to 'closed'`,
-	ArgsUsage:   "<pull index> [<pull index>...]",
-	Action: func(ctx context.Context, cmd *cli.Command) error {
+	Usage:       "Change state of a pull request to 'closed'",
+	Description: `Change state of a pull request to 'closed'`,
+	ArgsUsage:   "<pull index>",
+	Action: func(ctx *cli.Context) error {
 		var s = gitea.StateClosed
-		return editPullState(ctx, cmd, gitea.EditPullRequestOption{State: &s})
+		return editPullState(ctx, gitea.EditPullRequestOption{State: &s})
 	},
 	Flags: flags.AllDefaultFlags,
 }

cmd/pulls/create.go

@@ -1,17 +1,16 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package pulls
 
 import (
-	stdctx "context"
-
-	"code.gitea.io/sdk/gitea"
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/interact"
 	"code.gitea.io/tea/modules/task"
-	"github.com/urfave/cli/v3"
+
+	"github.com/urfave/cli/v2"
 )
 
 // CmdPullsCreate creates a pull request
@@ -31,46 +30,27 @@ var CmdPullsCreate = cli.Command{
 			Aliases: []string{"b"},
 			Usage:   "Branch name of the PR target (default is repos default branch)",
 		},
-		&cli.BoolFlag{
-			Name:    "allow-maintainer-edits",
-			Aliases: []string{"edits"},
-			Usage:   "Enable maintainers to push to the base branch of created pull",
-			Value:   true,
-		},
-	}, flags.IssuePRCreateFlags...),
+	}, flags.IssuePREditFlags...),
 }
 
-func runPullsCreate(_ stdctx.Context, cmd *cli.Command) error {
+func runPullsCreate(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
-	ctx.Ensure(context.CtxRequirement{
-		LocalRepo:  true,
-		RemoteRepo: true,
-	})
 
 	// no args -> interactive mode
 	if ctx.NumFlags() == 0 {
-		if err := interact.CreatePull(ctx); err != nil && !interact.IsQuitting(err) {
-			return err
-		}
-		return nil
+		return interact.CreatePull(ctx)
 	}
 
 	// else use args to create PR
-	opts, err := flags.GetIssuePRCreateFlags(ctx)
+	opts, err := flags.GetIssuePREditFlags(ctx)
 	if err != nil {
 		return err
 	}
 
-	var allowMaintainerEdits *bool
-	if ctx.IsSet("allow-maintainer-edits") {
-		allowMaintainerEdits = gitea.OptionalBool(ctx.Bool("allow-maintainer-edits"))
-	}
-
 	return task.CreatePull(
 		ctx,
 		ctx.String("base"),
 		ctx.String("head"),
-		allowMaintainerEdits,
 		opts,
 	)
 }

cmd/pulls/edit.go

@@ -1,10 +1,10 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package pulls
 
 import (
-	stdctx "context"
 	"fmt"
 
 	"code.gitea.io/tea/modules/context"
@@ -12,34 +12,27 @@ import (
 	"code.gitea.io/tea/modules/utils"
 
 	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // editPullState abstracts the arg parsing to edit the given pull request
-func editPullState(_ stdctx.Context, cmd *cli.Command, opts gitea.EditPullRequestOption) error {
+func editPullState(cmd *cli.Context, opts gitea.EditPullRequestOption) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 	if ctx.Args().Len() == 0 {
 		return fmt.Errorf("Please provide a Pull Request index")
 	}
 
-	indices, err := utils.ArgsToIndices(ctx.Args().Slice())
+	index, err := utils.ArgToIndex(ctx.Args().First())
 	if err != nil {
 		return err
 	}
 
-	client := ctx.Login.Client()
-	for _, index := range indices {
-		pr, _, err := client.EditPullRequest(ctx.Owner, ctx.Repo, index, opts)
-		if err != nil {
-			return err
-		}
-
-		if len(indices) > 1 {
-			fmt.Println(pr.HTMLURL)
-		} else {
-			print.PullDetails(pr, nil, nil)
-		}
+	pr, _, err := ctx.Login.Client().EditPullRequest(ctx.Owner, ctx.Repo, index, opts)
+	if err != nil {
+		return err
 	}
+
+	print.PullDetails(pr, nil, nil)
 	return nil
 }

cmd/pulls/list.go

@@ -1,16 +1,16 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package pulls
 
 import (
-	stdctx "context"
-
-	"code.gitea.io/sdk/gitea"
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
 	"code.gitea.io/tea/modules/print"
-	"github.com/urfave/cli/v3"
+
+	"code.gitea.io/sdk/gitea"
+	"github.com/urfave/cli/v2"
 )
 
 var pullFieldsFlag = flags.FieldsFlag(print.PullFields, []string{
@@ -29,7 +29,7 @@ var CmdPullsList = cli.Command{
 }
 
 // RunPullsList return list of pulls
-func RunPullsList(_ stdctx.Context, cmd *cli.Command) error {
+func RunPullsList(cmd *cli.Context) error {
 	ctx := context.InitCommand(cmd)
 	ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 
@@ -44,8 +44,7 @@ func RunPullsList(_ stdctx.Context, cmd *cli.Command) error {
 	}
 
 	prs, _, err := ctx.Login.Client().ListRepoPullRequests(ctx.Owner, ctx.Repo, gitea.ListPullRequestsOptions{
-		ListOptions: flags.GetListOptions(),
-		State:       state,
+		State: state,
 	})
 
 	if err != nil {

cmd/pulls/merge.go

@@ -1,18 +1,18 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package pulls
 
 import (
-	stdctx "context"
+	"fmt"
 
 	"code.gitea.io/sdk/gitea"
 	"code.gitea.io/tea/cmd/flags"
 	"code.gitea.io/tea/modules/context"
-	"code.gitea.io/tea/modules/interact"
-	"code.gitea.io/tea/modules/task"
 	"code.gitea.io/tea/modules/utils"
-	"github.com/urfave/cli/v3"
+
+	"github.com/urfave/cli/v2"
 )
 
 // CmdPullsMerge merges a PR
@@ -40,16 +40,12 @@ var CmdPullsMerge = cli.Command{
 			Usage:   "Merge commit message",
 		},
 	}, flags.AllDefaultFlags...),
-	Action: func(_ stdctx.Context, cmd *cli.Command) error {
+	Action: func(cmd *cli.Context) error {
 		ctx := context.InitCommand(cmd)
 		ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 
 		if ctx.Args().Len() != 1 {
-			// If no PR index is provided, try interactive mode
-			if err := interact.MergePull(ctx); err != nil && !interact.IsQuitting(err) {
-				return err
-			}
-			return nil
+			return fmt.Errorf("Must specify a PR index")
 		}
 
 		idx, err := utils.ArgToIndex(ctx.Args().First())
@@ -57,10 +53,18 @@ var CmdPullsMerge = cli.Command{
 			return err
 		}
 
-		return task.PullMerge(ctx.Login, ctx.Owner, ctx.Repo, idx, gitea.MergePullRequestOption{
+		success, _, err := ctx.Login.Client().MergePullRequest(ctx.Owner, ctx.Repo, idx, gitea.MergePullRequestOption{
 			Style:   gitea.MergeStyle(ctx.String("style")),
 			Title:   ctx.String("title"),
 			Message: ctx.String("message"),
 		})
+
+		if err != nil {
+			return err
+		}
+		if !success {
+			return fmt.Errorf("Failed to merge PR. Is it still open?")
+		}
+		return nil
 	},
 }

cmd/pulls/reject.go

@@ -1,10 +1,10 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package pulls
 
 import (
-	stdctx "context"
 	"fmt"
 	"strings"
 
@@ -14,7 +14,7 @@ import (
 	"code.gitea.io/tea/modules/utils"
 
 	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdPullsReject requests changes to a PR
@@ -23,7 +23,7 @@ var CmdPullsReject = cli.Command{
 	Usage:       "Request changes to a pull request",
 	Description: "Request changes to a pull request",
 	ArgsUsage:   "<pull index> <reason>",
-	Action: func(_ stdctx.Context, cmd *cli.Command) error {
+	Action: func(cmd *cli.Context) error {
 		ctx := context.InitCommand(cmd)
 		ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 

cmd/pulls/reopen.go

@@ -1,27 +1,26 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package pulls
 
 import (
-	"context"
-
 	"code.gitea.io/tea/cmd/flags"
 
 	"code.gitea.io/sdk/gitea"
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdPullsReopen reopens a given closed pull request
 var CmdPullsReopen = cli.Command{
 	Name:        "reopen",
 	Aliases:     []string{"open"},
-	Usage:       "Change state of one or more pull requests to 'open'",
-	Description: `Change state of one or more pull requests to 'open'`,
-	ArgsUsage:   "<pull index> [<pull index>...]",
-	Action: func(ctx context.Context, cmd *cli.Command) error {
+	Usage:       "Change state of a pull request to 'open'",
+	Description: `Change state of a pull request to 'open'`,
+	ArgsUsage:   "<pull index>",
+	Action: func(ctx *cli.Context) error {
 		var s = gitea.StateOpen
-		return editPullState(ctx, cmd, gitea.EditPullRequestOption{State: &s})
+		return editPullState(ctx, gitea.EditPullRequestOption{State: &s})
 	},
 	Flags: flags.AllDefaultFlags,
 }

cmd/pulls/review.go

@@ -1,10 +1,10 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
 
 package pulls
 
 import (
-	stdctx "context"
 	"fmt"
 
 	"code.gitea.io/tea/cmd/flags"
@@ -12,7 +12,7 @@ import (
 	"code.gitea.io/tea/modules/interact"
 	"code.gitea.io/tea/modules/utils"
 
-	"github.com/urfave/cli/v3"
+	"github.com/urfave/cli/v2"
 )
 
 // CmdPullsReview starts an interactive review session
@@ -21,12 +21,12 @@ var CmdPullsReview = cli.Command{
 	Usage:       "Interactively review a pull request",
 	Description: "Interactively review a pull request",
 	ArgsUsage:   "<pull index>",
-	Action: func(_ stdctx.Context, cmd *cli.Command) error {
+	Action: func(cmd *cli.Context) error {
 		ctx := context.InitCommand(cmd)
 		ctx.Ensure(context.CtxRequirement{RemoteRepo: true})
 
 		if ctx.Args().Len() != 1 {
-			return fmt.Errorf("must specify a PR index")
+			return fmt.Errorf("Must specify a PR index")
 		}
 
 		idx, err := utils.ArgToIndex(ctx.Args().First())
@@ -34,10 +34,7 @@ var CmdPullsReview = cli.Command{
 			return err
 		}
 
-		if err := interact.ReviewPull(ctx, idx); err != nil && !interact.IsQuitting(err) {
-			return err
-		}
-		return nil
+		return interact.ReviewPull(ctx, idx)
 	},
 	Flags: flags.AllDefaultFlags,
 }