mirror of
https://gitea.com/gitea/tea.git
synced 2026-10-26 11:01:25 +01:00
revert: tea 1.0 rewrite (#1122–#1126) (#1146)
Reverts #1126, #1125, #1124, #1123 and #1122. `go.mod` keeps the Go 1.26 line with toolchain `go1.26.9` (instead of the original `go1.26.6`) so the security fix from #1131 isn't lost. reopens #69 reopens #141 reopens #162 reopens #172 reopens #197 reopens #232 reopens #240 reopens #246 reopens #323 reopens #325 reopens #326 reopens #328 reopens #344 reopens #351 reopens #373 reopens #403 reopens #406 reopens #417 reopens #430 reopens #457 reopens #480 reopens #482 reopens #489 reopens #490 reopens #498 reopens #500 reopens #504 reopens #510 reopens #516 reopens #523 reopens #556 reopens #560 reopens #569 reopens #571 reopens #602 reopens #632 reopens #633 reopens #643 reopens #666 reopens #670 reopens #672 reopens #677 reopens #683 reopens #697 reopens #726 reopens #737 reopens #770 reopens #779 reopens #804 reopens #817 reopens #831 reopens #833 reopens #834 reopens #908 reopens #966 reopens #1023 reopens #1029 reopens #1032 reopens #1050 reopens #1052 reopens #1069 reopens #1073 reopens #1087 reopens #1091 reopens #1094 reopens #1110 reopens #1115 reopens #1116 reopens #1118 Reviewed-on: https://gitea.com/gitea/tea/pulls/1146 Reviewed-by: TheFox0x7 <95654+thefox0x7@noreply.gitea.com>
This commit is contained in:
1 parent
33bb12729e
commit
c5f674111a
604 files changed
+33711
-35545
No files matched your search
@@ -0,0 +1,76 @@
|
||||
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package branches
|
||||
|
||||
import (
|
||||
stdctx "context"
|
||||
|
||||
gitea "gitea.dev/sdk"
|
||||
|
||||
"gitea.dev/tea/cmd/flags"
|
||||
"gitea.dev/tea/modules/context"
|
||||
"gitea.dev/tea/modules/print"
|
||||
"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(requestCtx stdctx.Context, cmd *cli.Command) error {
|
||||
ctx, err := context.InitCommand(cmd)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := ctx.Ensure(context.CtxRequirement{RemoteRepo: true}); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
owner := ctx.Owner
|
||||
if ctx.IsSet("owner") {
|
||||
owner = ctx.String("owner")
|
||||
}
|
||||
|
||||
var branches []*gitea.Branch
|
||||
var protections []*gitea.BranchProtection
|
||||
branches, _, err = ctx.Login.Client().Repositories.ListRepoBranches(requestCtx, owner, ctx.Repo, gitea.ListRepoBranchesOptions{
|
||||
ListOptions: flags.GetListOptions(cmd),
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
protections, _, err = ctx.Login.Client().Repositories.ListBranchProtections(requestCtx, owner, ctx.Repo, gitea.ListBranchProtectionsOptions{
|
||||
ListOptions: flags.GetListOptions(cmd),
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fields, err := branchFieldsFlag.GetValues(cmd)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return print.BranchesList(branches, protections, ctx.Output, fields)
|
||||
}
|
||||
@@ -0,0 +1,107 @@
|
||||
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package branches
|
||||
|
||||
import (
|
||||
stdctx "context"
|
||||
"fmt"
|
||||
|
||||
gitea "gitea.dev/sdk"
|
||||
|
||||
"gitea.dev/tea/cmd/flags"
|
||||
"gitea.dev/tea/modules/context"
|
||||
"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(requestCtx stdctx.Context, cmd *cli.Command) error {
|
||||
ctx, err := context.InitCommand(cmd)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := ctx.Ensure(context.CtxRequirement{RemoteRepo: true}); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
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().Repositories.CreateBranchProtection(requestCtx, 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().Repositories.DeleteBranchProtection(requestCtx, owner, ctx.Repo, branch)
|
||||
} else {
|
||||
return fmt.Errorf("command %s is not supported", command)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,78 @@
|
||||
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package branches
|
||||
|
||||
import (
|
||||
stdctx "context"
|
||||
"fmt"
|
||||
|
||||
gitea "gitea.dev/sdk"
|
||||
|
||||
"gitea.dev/tea/cmd/flags"
|
||||
"gitea.dev/tea/modules/context"
|
||||
"github.com/urfave/cli/v3"
|
||||
)
|
||||
|
||||
// CmdBranchesRenameFlags Flags for command rename
|
||||
var CmdBranchesRenameFlags = append([]cli.Flag{
|
||||
branchFieldsFlag,
|
||||
&flags.PaginationPageFlag,
|
||||
&flags.PaginationLimitFlag,
|
||||
}, flags.AllDefaultFlags...)
|
||||
|
||||
// CmdBranchesRename represents a sub command of branches to rename a branch
|
||||
var CmdBranchesRename = cli.Command{
|
||||
Name: "rename",
|
||||
Aliases: []string{"rn"},
|
||||
Usage: "Rename a branch",
|
||||
Description: `Rename a branch in a repository`,
|
||||
ArgsUsage: "<old_branch_name> <new_branch_name>",
|
||||
Action: RunBranchesRename,
|
||||
Flags: CmdBranchesRenameFlags,
|
||||
}
|
||||
|
||||
// RunBranchesRename function to rename a branch
|
||||
func RunBranchesRename(requestCtx stdctx.Context, cmd *cli.Command) error {
|
||||
ctx, err := context.InitCommand(cmd)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := ctx.Ensure(context.CtxRequirement{RemoteRepo: true}); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := ValidateRenameArgs(ctx.Args().Slice()); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
oldBranchName := ctx.Args().Get(0)
|
||||
newBranchName := ctx.Args().Get(1)
|
||||
|
||||
owner := ctx.Owner
|
||||
if ctx.IsSet("owner") {
|
||||
owner = ctx.String("owner")
|
||||
}
|
||||
|
||||
successful, _, err := ctx.Login.Client().Repositories.RenameRepoBranch(requestCtx, owner, ctx.Repo, oldBranchName, gitea.RenameRepoBranchOption{
|
||||
Name: newBranchName,
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to rename branch: %w", err)
|
||||
}
|
||||
if !successful {
|
||||
return fmt.Errorf("failed to rename branch")
|
||||
}
|
||||
|
||||
fmt.Printf("Successfully renamed branch '%s' to '%s'\n", oldBranchName, newBranchName)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// ValidateRenameArgs validates arguments for the rename command
|
||||
func ValidateRenameArgs(args []string) error {
|
||||
if len(args) != 2 {
|
||||
return fmt.Errorf("must specify exactly two arguments: <old_branch_name> <new_branch_name>")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package branches
|
||||
|
||||
import (
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestBranchesRenameArgs(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
args []string
|
||||
wantErr bool
|
||||
}{
|
||||
{
|
||||
name: "valid args",
|
||||
args: []string{"main", "develop"},
|
||||
wantErr: false,
|
||||
},
|
||||
{
|
||||
name: "missing both args",
|
||||
args: []string{},
|
||||
wantErr: true,
|
||||
},
|
||||
{
|
||||
name: "missing new branch name",
|
||||
args: []string{"main"},
|
||||
wantErr: true,
|
||||
},
|
||||
{
|
||||
name: "too many args",
|
||||
args: []string{"main", "develop", "extra"},
|
||||
wantErr: true,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
err := ValidateRenameArgs(tt.args)
|
||||
if (err != nil) != tt.wantErr {
|
||||
t.Errorf("ValidateRenameArgs() error = %v, wantErr %v", err, tt.wantErr)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user