forgejo/cmd/main.go

229 lines
7.4 KiB
Go
Raw Permalink Normal View History

// Copyright 2023 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT
package cmd
import (
[CLI] implement forgejo-cli (cherry picked from commit 2555e315f7561302484b15576d34c5da0d4cdb12) (cherry picked from commit 51b9c9092e21a451695ee0154e7d49753574f525) [CLI] implement forgejo-cli (squash) support initDB (cherry picked from commit 5c31ae602a45f1d9a90b86bece5393bc9faddf25) (cherry picked from commit bbf76489a73bad83d68ca7c8e7a75cf8e27b2198) Conflicts: because of d0dbe52e76f3038777c3b50066e3636105387ca3 upgrade to https://pkg.go.dev/github.com/urfave/cli/v2 (cherry picked from commit b6c1bcc008fcff0e297d570a0069bf41bc74e53d) [CLI] implement forgejo-cli actions (cherry picked from commit 08be2b226e46d9f41e08f66e936b317bcfb4a257) (cherry picked from commit b6cfa88c6e2ae00e30c832ce4cf93c9e3f2cd6e4) (cherry picked from commit 59704200de59b65a4f37c39569a3b43e1ee38862) [CLI] implement forgejo-cli actions generate-secret (cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d) (cherry picked from commit e085d6d2737e6238a4ff00f19f40cf839ac16b34) [CLI] implement forgejo-cli actions generate-secret (squash) NoInit (cherry picked from commit 962c944eb20268a394030495c3caab3e3d4bd8b7) [CLI] implement forgejo-cli actions register (cherry picked from commit 2f95143000e4ccc94ef14332777b58fe778edbd6) (cherry picked from commit 42f2f8731e876564b6627a43a248f262f50c04cd) [CLI] implement forgejo-cli actions register (squash) no private Do not go through the private API, directly modify the database (cherry picked from commit 1ba7c0d39d0ecd190b7d9c517bd26af6c84341aa) [CLI] implement forgejo-cli actions (cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d) (cherry picked from commit e085d6d2737e6238a4ff00f19f40cf839ac16b34) [CLI] implement forgejo-cli actions generate-secret (squash) NoInit (cherry picked from commit 962c944eb20268a394030495c3caab3e3d4bd8b7) (cherry picked from commit 4c121ef022597e66d902c17e0f46839c26924b18) Conflicts: cmd/forgejo/actions.go tests/integration/cmd_forgejo_actions_test.go (cherry picked from commit 36997a48e38286579850abe4b55e75a235b56537) [CLI] implement forgejo-cli actions (squash) restore --version Refs: https://codeberg.org/forgejo/forgejo/issues/1134 (cherry picked from commit 9739eb52d8f94d32f61068d7209958e8d2582818) [CI] implement forgejo-cli (squash) the actions subcommand needs config (cherry picked from commit def638475122a26082ab3835842c84cd03839154) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1209 (cherry picked from commit a1758a391043123903607338cb11490161ac946d) (cherry picked from commit 935fa650c77b151752a58f621d846b166b97cd79) (cherry picked from commit cd21026bc94922043dce8e2a5baba68111d1e569) (cherry picked from commit 1700b8973a58f0fc3469492d8a39b931019d2461) (cherry picked from commit 1def42a37945cfe88947803f9afe9468fb8798fe) (cherry picked from commit 839d97521d59a012b06e6c2b9b0655c56b41b6cd) (cherry picked from commit fd8c13be6b45f9aa939be482c0a4e5a60c89344c) (cherry picked from commit 588e5d552f044d91218a07fa46e84259d4892c5d) (cherry picked from commit 151a726620f662ff9af37316dfda38a6bd6744bb) [v1.22] [CLI] implement forgejo-cli https://codeberg.org/forgejo/forgejo/pulls/1541 (cherry picked from commit 46708de7b9a3efac74aced8361327a39f45b6892) (cherry picked from commit a8e5c1369ee3ee197579a30aeba519b4384360aa) (cherry picked from commit c8a32aaf24fd851927432f140fcc59a274824d33) Conflicts: models/actions/main_test.go https://codeberg.org/forgejo/forgejo/pulls/1656 (cherry picked from commit 79f4553063c4f4ee70c98f95d9e62facd9d33c67) (cherry picked from commit 0379da0cf5b14e7915f2f38502bd00036723071d) (cherry picked from commit 331d58c085d6533ebcc528c1ac69d4f99e8e9acd) (cherry picked from commit 89705502c477ec833bd7ce46c3cedc53fbd454bc) (cherry picked from commit 4723d5febf4a5748b2ca038bc95235995ebb8c11) (cherry picked from commit e71b26013039d5d029ec4c38befd25e6a447b3f1) (cherry picked from commit 6a376a5b48b0b5187f492ddd73c72896cc8ae0a8) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1969 (cherry picked from commit 6ba97cf4b5bae19426fef9d65a20bc5527e41a90) (cherry picked from commit e0a6ebfeca1ff20d53fe8d0baf4a737d6e10fce1) (cherry picked from commit 5702aeab2d25fa1f79fb1d11ec359a5460dc0f91) (cherry picked from commit f919c4d6c11423ac2d3ab624d9a6390661c07aa7) (cherry picked from commit a26799a88aa2f320b498372717019fa601545931)
2023-07-09 12:52:21 +00:00
"context"
"fmt"
"os"
[CLI] implement forgejo-cli (cherry picked from commit 2555e315f7561302484b15576d34c5da0d4cdb12) (cherry picked from commit 51b9c9092e21a451695ee0154e7d49753574f525) [CLI] implement forgejo-cli (squash) support initDB (cherry picked from commit 5c31ae602a45f1d9a90b86bece5393bc9faddf25) (cherry picked from commit bbf76489a73bad83d68ca7c8e7a75cf8e27b2198) Conflicts: because of d0dbe52e76f3038777c3b50066e3636105387ca3 upgrade to https://pkg.go.dev/github.com/urfave/cli/v2 (cherry picked from commit b6c1bcc008fcff0e297d570a0069bf41bc74e53d) [CLI] implement forgejo-cli actions (cherry picked from commit 08be2b226e46d9f41e08f66e936b317bcfb4a257) (cherry picked from commit b6cfa88c6e2ae00e30c832ce4cf93c9e3f2cd6e4) (cherry picked from commit 59704200de59b65a4f37c39569a3b43e1ee38862) [CLI] implement forgejo-cli actions generate-secret (cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d) (cherry picked from commit e085d6d2737e6238a4ff00f19f40cf839ac16b34) [CLI] implement forgejo-cli actions generate-secret (squash) NoInit (cherry picked from commit 962c944eb20268a394030495c3caab3e3d4bd8b7) [CLI] implement forgejo-cli actions register (cherry picked from commit 2f95143000e4ccc94ef14332777b58fe778edbd6) (cherry picked from commit 42f2f8731e876564b6627a43a248f262f50c04cd) [CLI] implement forgejo-cli actions register (squash) no private Do not go through the private API, directly modify the database (cherry picked from commit 1ba7c0d39d0ecd190b7d9c517bd26af6c84341aa) [CLI] implement forgejo-cli actions (cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d) (cherry picked from commit e085d6d2737e6238a4ff00f19f40cf839ac16b34) [CLI] implement forgejo-cli actions generate-secret (squash) NoInit (cherry picked from commit 962c944eb20268a394030495c3caab3e3d4bd8b7) (cherry picked from commit 4c121ef022597e66d902c17e0f46839c26924b18) Conflicts: cmd/forgejo/actions.go tests/integration/cmd_forgejo_actions_test.go (cherry picked from commit 36997a48e38286579850abe4b55e75a235b56537) [CLI] implement forgejo-cli actions (squash) restore --version Refs: https://codeberg.org/forgejo/forgejo/issues/1134 (cherry picked from commit 9739eb52d8f94d32f61068d7209958e8d2582818) [CI] implement forgejo-cli (squash) the actions subcommand needs config (cherry picked from commit def638475122a26082ab3835842c84cd03839154) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1209 (cherry picked from commit a1758a391043123903607338cb11490161ac946d) (cherry picked from commit 935fa650c77b151752a58f621d846b166b97cd79) (cherry picked from commit cd21026bc94922043dce8e2a5baba68111d1e569) (cherry picked from commit 1700b8973a58f0fc3469492d8a39b931019d2461) (cherry picked from commit 1def42a37945cfe88947803f9afe9468fb8798fe) (cherry picked from commit 839d97521d59a012b06e6c2b9b0655c56b41b6cd) (cherry picked from commit fd8c13be6b45f9aa939be482c0a4e5a60c89344c) (cherry picked from commit 588e5d552f044d91218a07fa46e84259d4892c5d) (cherry picked from commit 151a726620f662ff9af37316dfda38a6bd6744bb) [v1.22] [CLI] implement forgejo-cli https://codeberg.org/forgejo/forgejo/pulls/1541 (cherry picked from commit 46708de7b9a3efac74aced8361327a39f45b6892) (cherry picked from commit a8e5c1369ee3ee197579a30aeba519b4384360aa) (cherry picked from commit c8a32aaf24fd851927432f140fcc59a274824d33) Conflicts: models/actions/main_test.go https://codeberg.org/forgejo/forgejo/pulls/1656 (cherry picked from commit 79f4553063c4f4ee70c98f95d9e62facd9d33c67) (cherry picked from commit 0379da0cf5b14e7915f2f38502bd00036723071d) (cherry picked from commit 331d58c085d6533ebcc528c1ac69d4f99e8e9acd) (cherry picked from commit 89705502c477ec833bd7ce46c3cedc53fbd454bc) (cherry picked from commit 4723d5febf4a5748b2ca038bc95235995ebb8c11) (cherry picked from commit e71b26013039d5d029ec4c38befd25e6a447b3f1) (cherry picked from commit 6a376a5b48b0b5187f492ddd73c72896cc8ae0a8) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1969 (cherry picked from commit 6ba97cf4b5bae19426fef9d65a20bc5527e41a90) (cherry picked from commit e0a6ebfeca1ff20d53fe8d0baf4a737d6e10fce1) (cherry picked from commit 5702aeab2d25fa1f79fb1d11ec359a5460dc0f91) (cherry picked from commit f919c4d6c11423ac2d3ab624d9a6390661c07aa7) (cherry picked from commit a26799a88aa2f320b498372717019fa601545931)
2023-07-09 12:52:21 +00:00
"path/filepath"
"strings"
[CLI] implement forgejo-cli (cherry picked from commit 2555e315f7561302484b15576d34c5da0d4cdb12) (cherry picked from commit 51b9c9092e21a451695ee0154e7d49753574f525) [CLI] implement forgejo-cli (squash) support initDB (cherry picked from commit 5c31ae602a45f1d9a90b86bece5393bc9faddf25) (cherry picked from commit bbf76489a73bad83d68ca7c8e7a75cf8e27b2198) Conflicts: because of d0dbe52e76f3038777c3b50066e3636105387ca3 upgrade to https://pkg.go.dev/github.com/urfave/cli/v2 (cherry picked from commit b6c1bcc008fcff0e297d570a0069bf41bc74e53d) [CLI] implement forgejo-cli actions (cherry picked from commit 08be2b226e46d9f41e08f66e936b317bcfb4a257) (cherry picked from commit b6cfa88c6e2ae00e30c832ce4cf93c9e3f2cd6e4) (cherry picked from commit 59704200de59b65a4f37c39569a3b43e1ee38862) [CLI] implement forgejo-cli actions generate-secret (cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d) (cherry picked from commit e085d6d2737e6238a4ff00f19f40cf839ac16b34) [CLI] implement forgejo-cli actions generate-secret (squash) NoInit (cherry picked from commit 962c944eb20268a394030495c3caab3e3d4bd8b7) [CLI] implement forgejo-cli actions register (cherry picked from commit 2f95143000e4ccc94ef14332777b58fe778edbd6) (cherry picked from commit 42f2f8731e876564b6627a43a248f262f50c04cd) [CLI] implement forgejo-cli actions register (squash) no private Do not go through the private API, directly modify the database (cherry picked from commit 1ba7c0d39d0ecd190b7d9c517bd26af6c84341aa) [CLI] implement forgejo-cli actions (cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d) (cherry picked from commit e085d6d2737e6238a4ff00f19f40cf839ac16b34) [CLI] implement forgejo-cli actions generate-secret (squash) NoInit (cherry picked from commit 962c944eb20268a394030495c3caab3e3d4bd8b7) (cherry picked from commit 4c121ef022597e66d902c17e0f46839c26924b18) Conflicts: cmd/forgejo/actions.go tests/integration/cmd_forgejo_actions_test.go (cherry picked from commit 36997a48e38286579850abe4b55e75a235b56537) [CLI] implement forgejo-cli actions (squash) restore --version Refs: https://codeberg.org/forgejo/forgejo/issues/1134 (cherry picked from commit 9739eb52d8f94d32f61068d7209958e8d2582818) [CI] implement forgejo-cli (squash) the actions subcommand needs config (cherry picked from commit def638475122a26082ab3835842c84cd03839154) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1209 (cherry picked from commit a1758a391043123903607338cb11490161ac946d) (cherry picked from commit 935fa650c77b151752a58f621d846b166b97cd79) (cherry picked from commit cd21026bc94922043dce8e2a5baba68111d1e569) (cherry picked from commit 1700b8973a58f0fc3469492d8a39b931019d2461) (cherry picked from commit 1def42a37945cfe88947803f9afe9468fb8798fe) (cherry picked from commit 839d97521d59a012b06e6c2b9b0655c56b41b6cd) (cherry picked from commit fd8c13be6b45f9aa939be482c0a4e5a60c89344c) (cherry picked from commit 588e5d552f044d91218a07fa46e84259d4892c5d) (cherry picked from commit 151a726620f662ff9af37316dfda38a6bd6744bb) [v1.22] [CLI] implement forgejo-cli https://codeberg.org/forgejo/forgejo/pulls/1541 (cherry picked from commit 46708de7b9a3efac74aced8361327a39f45b6892) (cherry picked from commit a8e5c1369ee3ee197579a30aeba519b4384360aa) (cherry picked from commit c8a32aaf24fd851927432f140fcc59a274824d33) Conflicts: models/actions/main_test.go https://codeberg.org/forgejo/forgejo/pulls/1656 (cherry picked from commit 79f4553063c4f4ee70c98f95d9e62facd9d33c67) (cherry picked from commit 0379da0cf5b14e7915f2f38502bd00036723071d) (cherry picked from commit 331d58c085d6533ebcc528c1ac69d4f99e8e9acd) (cherry picked from commit 89705502c477ec833bd7ce46c3cedc53fbd454bc) (cherry picked from commit 4723d5febf4a5748b2ca038bc95235995ebb8c11) (cherry picked from commit e71b26013039d5d029ec4c38befd25e6a447b3f1) (cherry picked from commit 6a376a5b48b0b5187f492ddd73c72896cc8ae0a8) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1969 (cherry picked from commit 6ba97cf4b5bae19426fef9d65a20bc5527e41a90) (cherry picked from commit e0a6ebfeca1ff20d53fe8d0baf4a737d6e10fce1) (cherry picked from commit 5702aeab2d25fa1f79fb1d11ec359a5460dc0f91) (cherry picked from commit f919c4d6c11423ac2d3ab624d9a6390661c07aa7) (cherry picked from commit a26799a88aa2f320b498372717019fa601545931)
2023-07-09 12:52:21 +00:00
"code.gitea.io/gitea/cmd/forgejo"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"github.com/urfave/cli/v2"
)
// cmdHelp is our own help subcommand with more information
// Keep in mind that the "./gitea help"(subcommand) is different from "./gitea --help"(flag), the flag doesn't parse the config or output "DEFAULT CONFIGURATION:" information
func cmdHelp() *cli.Command {
c := &cli.Command{
Name: "help",
Aliases: []string{"h"},
Usage: "Shows a list of commands or help for one command",
ArgsUsage: "[command]",
Action: func(c *cli.Context) (err error) {
lineage := c.Lineage() // The order is from child to parent: help, doctor, Gitea, {Command:nil}
targetCmdIdx := 0
if c.Command.Name == "help" {
targetCmdIdx = 1
}
if lineage[targetCmdIdx+1].Command != nil {
err = cli.ShowCommandHelp(lineage[targetCmdIdx+1], lineage[targetCmdIdx].Command.Name)
} else {
err = cli.ShowAppHelp(c)
}
_, _ = fmt.Fprintf(c.App.Writer, `
DEFAULT CONFIGURATION:
AppPath: %s
WorkPath: %s
CustomPath: %s
ConfigFile: %s
`, setting.AppPath, setting.AppWorkPath, setting.CustomPath, setting.CustomConf)
return err
},
}
return c
}
func appGlobalFlags() []cli.Flag {
return []cli.Flag{
// make the builtin flags at the top
cli.HelpFlag,
// shared configuration flags, they are for global and for each sub-command at the same time
// eg: such command is valid: "./gitea --config /tmp/app.ini web --config /tmp/app.ini", while it's discouraged indeed
// keep in mind that the short flags like "-C", "-c" and "-w" are globally polluted, they can't be used for sub-commands anymore.
&cli.StringFlag{
Name: "custom-path",
Aliases: []string{"C"},
Usage: "Set custom path (defaults to '{WorkPath}/custom')",
},
&cli.StringFlag{
Name: "config",
Aliases: []string{"c"},
Value: setting.CustomConf,
Usage: "Set custom config file (defaults to '{WorkPath}/custom/conf/app.ini')",
},
&cli.StringFlag{
Name: "work-path",
Aliases: []string{"w"},
Usage: "Set Gitea's working path (defaults to the Gitea's binary directory)",
},
}
}
func prepareSubcommandWithConfig(command *cli.Command, globalFlags []cli.Flag) {
command.Flags = append(append([]cli.Flag{}, globalFlags...), command.Flags...)
command.Action = prepareWorkPathAndCustomConf(command.Action)
command.HideHelp = true
if command.Name != "help" {
command.Subcommands = append(command.Subcommands, cmdHelp())
}
for i := range command.Subcommands {
prepareSubcommandWithConfig(command.Subcommands[i], globalFlags)
}
}
// prepareWorkPathAndCustomConf wraps the Action to prepare the work path and custom config
// It can't use "Before", because each level's sub-command's Before will be called one by one, so the "init" would be done multiple times
func prepareWorkPathAndCustomConf(action cli.ActionFunc) func(ctx *cli.Context) error {
return func(ctx *cli.Context) error {
var args setting.ArgWorkPathAndCustomConf
// from children to parent, check the global flags
for _, curCtx := range ctx.Lineage() {
if curCtx.IsSet("work-path") && args.WorkPath == "" {
args.WorkPath = curCtx.String("work-path")
}
if curCtx.IsSet("custom-path") && args.CustomPath == "" {
args.CustomPath = curCtx.String("custom-path")
}
if curCtx.IsSet("config") && args.CustomConf == "" {
args.CustomConf = curCtx.String("config")
}
}
setting.InitWorkPathAndCommonConfig(os.Getenv, args)
if ctx.Bool("help") || action == nil {
// the default behavior of "urfave/cli": "nil action" means "show help"
return cmdHelp().Action(ctx)
}
return action(ctx)
}
}
func NewMainApp(version, versionExtra string) *cli.App {
[CLI] implement forgejo-cli (cherry picked from commit 2555e315f7561302484b15576d34c5da0d4cdb12) (cherry picked from commit 51b9c9092e21a451695ee0154e7d49753574f525) [CLI] implement forgejo-cli (squash) support initDB (cherry picked from commit 5c31ae602a45f1d9a90b86bece5393bc9faddf25) (cherry picked from commit bbf76489a73bad83d68ca7c8e7a75cf8e27b2198) Conflicts: because of d0dbe52e76f3038777c3b50066e3636105387ca3 upgrade to https://pkg.go.dev/github.com/urfave/cli/v2 (cherry picked from commit b6c1bcc008fcff0e297d570a0069bf41bc74e53d) [CLI] implement forgejo-cli actions (cherry picked from commit 08be2b226e46d9f41e08f66e936b317bcfb4a257) (cherry picked from commit b6cfa88c6e2ae00e30c832ce4cf93c9e3f2cd6e4) (cherry picked from commit 59704200de59b65a4f37c39569a3b43e1ee38862) [CLI] implement forgejo-cli actions generate-secret (cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d) (cherry picked from commit e085d6d2737e6238a4ff00f19f40cf839ac16b34) [CLI] implement forgejo-cli actions generate-secret (squash) NoInit (cherry picked from commit 962c944eb20268a394030495c3caab3e3d4bd8b7) [CLI] implement forgejo-cli actions register (cherry picked from commit 2f95143000e4ccc94ef14332777b58fe778edbd6) (cherry picked from commit 42f2f8731e876564b6627a43a248f262f50c04cd) [CLI] implement forgejo-cli actions register (squash) no private Do not go through the private API, directly modify the database (cherry picked from commit 1ba7c0d39d0ecd190b7d9c517bd26af6c84341aa) [CLI] implement forgejo-cli actions (cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d) (cherry picked from commit e085d6d2737e6238a4ff00f19f40cf839ac16b34) [CLI] implement forgejo-cli actions generate-secret (squash) NoInit (cherry picked from commit 962c944eb20268a394030495c3caab3e3d4bd8b7) (cherry picked from commit 4c121ef022597e66d902c17e0f46839c26924b18) Conflicts: cmd/forgejo/actions.go tests/integration/cmd_forgejo_actions_test.go (cherry picked from commit 36997a48e38286579850abe4b55e75a235b56537) [CLI] implement forgejo-cli actions (squash) restore --version Refs: https://codeberg.org/forgejo/forgejo/issues/1134 (cherry picked from commit 9739eb52d8f94d32f61068d7209958e8d2582818) [CI] implement forgejo-cli (squash) the actions subcommand needs config (cherry picked from commit def638475122a26082ab3835842c84cd03839154) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1209 (cherry picked from commit a1758a391043123903607338cb11490161ac946d) (cherry picked from commit 935fa650c77b151752a58f621d846b166b97cd79) (cherry picked from commit cd21026bc94922043dce8e2a5baba68111d1e569) (cherry picked from commit 1700b8973a58f0fc3469492d8a39b931019d2461) (cherry picked from commit 1def42a37945cfe88947803f9afe9468fb8798fe) (cherry picked from commit 839d97521d59a012b06e6c2b9b0655c56b41b6cd) (cherry picked from commit fd8c13be6b45f9aa939be482c0a4e5a60c89344c) (cherry picked from commit 588e5d552f044d91218a07fa46e84259d4892c5d) (cherry picked from commit 151a726620f662ff9af37316dfda38a6bd6744bb) [v1.22] [CLI] implement forgejo-cli https://codeberg.org/forgejo/forgejo/pulls/1541 (cherry picked from commit 46708de7b9a3efac74aced8361327a39f45b6892) (cherry picked from commit a8e5c1369ee3ee197579a30aeba519b4384360aa) (cherry picked from commit c8a32aaf24fd851927432f140fcc59a274824d33) Conflicts: models/actions/main_test.go https://codeberg.org/forgejo/forgejo/pulls/1656 (cherry picked from commit 79f4553063c4f4ee70c98f95d9e62facd9d33c67) (cherry picked from commit 0379da0cf5b14e7915f2f38502bd00036723071d) (cherry picked from commit 331d58c085d6533ebcc528c1ac69d4f99e8e9acd) (cherry picked from commit 89705502c477ec833bd7ce46c3cedc53fbd454bc) (cherry picked from commit 4723d5febf4a5748b2ca038bc95235995ebb8c11) (cherry picked from commit e71b26013039d5d029ec4c38befd25e6a447b3f1) (cherry picked from commit 6a376a5b48b0b5187f492ddd73c72896cc8ae0a8) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1969 (cherry picked from commit 6ba97cf4b5bae19426fef9d65a20bc5527e41a90) (cherry picked from commit e0a6ebfeca1ff20d53fe8d0baf4a737d6e10fce1) (cherry picked from commit 5702aeab2d25fa1f79fb1d11ec359a5460dc0f91) (cherry picked from commit f919c4d6c11423ac2d3ab624d9a6390661c07aa7) (cherry picked from commit a26799a88aa2f320b498372717019fa601545931)
2023-07-09 12:52:21 +00:00
path, err := os.Executable()
if err != nil {
panic(err)
}
executable := filepath.Base(path)
var subCmdsStandalone []*cli.Command = make([]*cli.Command, 0, 10)
var subCmdWithConfig []*cli.Command = make([]*cli.Command, 0, 10)
[F3] Forgejo driver and CLI user, topic, project, label, milestone, repository, pull_request, release, asset, comment, reaction, review providers Signed-off-by: Earl Warren <contact@earl-warren.org> Preserve file size when creating attachments Introduced in c6f50297084ebd9ec8b8c25370b9b963167274eb repoList.LoadAttributes has a ctx argument now Rename `repo.GetOwner` to `repo.LoadOwner` bd66fa586a0da58c4cf2f5f8390aef4bac9d0527 upgrade to the latest gof3 (cherry picked from commit c77071365629984c1dc39a7a83e7252fd5b298e2) [F3] ID remapping logic is in place, remove workaround (cherry picked from commit d0fee301670c37c0e73afb271e0a8dd6b622f6f6) [F3] it is experimental, do not enable by default (cherry picked from commit de325b21d0adad199ec05652cb8d9fff19248ddb) (cherry picked from commit 547e7b3c40f15766deb569cf2acface3290cf092) (cherry picked from commit 820df3a56bc194645b482ef77a8845255d1185fe) (cherry picked from commit eaba87689bbea84a215558033fc7d514b1b44f3e) (cherry picked from commit 1b86896b3b4144254ed27064a167650b4e12c690) (cherry picked from commit 0046aac1c639e021e719408e374cfc84fcbaa1d8) (cherry picked from commit f14220df8ff692bdcfdcc94660acf64c77e732f5) (cherry picked from commit 559b73100149978173b0ca8085280cc7fb79982f) (cherry picked from commit 801f7d600de923afb9f24b74f2b28cc380f09cd0) (cherry picked from commit 6aa76e9bcf243500675b5dbd543ee89d301ca44e) (cherry picked from commit a8757dcb071093faea8a398413ee5681193b0627) [F3] promote F3 users to matching OAuth2 users on first sign-in (cherry picked from commit bd7fef7496c6f50e1559eac5922ec3280745864d) (cherry picked from commit 07412698e8828bff3e1894d57356d92bb0063665) (cherry picked from commit d143e5b2a3dda118529d29caea5e12423b5f5116) [F3] upgrade to gof3 50a6e740ac04 Add new methods GetIDString() & SetIDString() & ToFormatInterface() Change the prototype of the fixture function (cherry picked from commit d7b263ff8b6fda188fe51b2ce75fa333d4aaa23e) (cherry picked from commit b3eaf2249d3a8b35a564890674f9f50c4e2fde35) (cherry picked from commit d492ddd9bba3df102e513e748fcafe7808206cb2) [F3] add GetLocalMatchingRemote with a default implementation (cherry picked from commit 0a2201503960a18a4308fcf9c13843c6b48569b0) (cherry picked from commit f1310c38fbc4b2b941af323be215a6313de08232) (cherry picked from commit deb68552f24ce22e35b5c7a88ceb45190b9df0a2) [F3] GetLocalMatchingRemote for user (cherry picked from commit e73cb837f57be0d6c65d6ecb13da621a362351da) (cherry picked from commit a24bc0b85e1702917a6b39282a869b26654b1aa0) (cherry picked from commit 846a522ecc5fcdfff1e875e3d006ea68f26137dd) [F3] GetAdminUser now has a ctx argument (cherry picked from commit 37357a92afe74405909721a0e0062c3eebcb3454) (cherry picked from commit 660bc1673c189a16e88bd492947280a6e25fc7dd) (cherry picked from commit 72d692a76743279b5dd74ff69ecf85d0994be265) [F3] introduce UserTypeF3 To avoid conflicts should UserTypeRemoteUser be used differently by Gitea (cherry picked from commit 6de2701bb34da3ab0e9f9e6038541eecbec1d7e4) [F3] user.Put: idempotency (cherry picked from commit 821e38573ceaa62ffa067b4e173fad50f0f20f05) (cherry picked from commit f7638f5414e8dadbb3d982827d52c9529a4e9298) [F3] upgrade to urfave v2 (cherry picked from commit cc3dbdfd1d1f6814cf8f047805dccf80efd8554c) [F3] update gof3 (cherry picked from commit 2eee960751e1481f007c00e50406104a614e1255) [F3] move f3 under forgejo-cli * simplify the tests by re-using the forgejo-cli helpers to capture the output * unify CmdF3 to be structured in the same way CmdActions is (cherry picked from commit 4c9fe58b7475529aecae2c85a4a51f7dcee86df8) [F3] replace f3 with forgejo-cli f3 (cherry picked from commit 7ba7ceef1b22ed43d5e89f7c4a48d883332ac512) [F3] s/ListOptions/Paginator/ [F3] user: add unit tests [F3] user comparison of F3 managed users is on content [F3] issue: add unit tests [F3] gof3 now has one more argument to Put() [F3] re-use gof3 unit tests for the driver (cherry picked from commit af7ee6200cba7fcc2fa8bb7ca1e0aa0a5942a7df) Conflicts: tests/integration/integration_test.go because of some code removed in forgejo-development, trivial context conflict resolution [F3] more idempotent tests (#1275) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1275 Co-authored-by: Loïc Dachary <loic@dachary.org> Co-committed-by: Loïc Dachary <loic@dachary.org> [F3] tests: do SQL update if nothing changes [F3] tests comment idempotence [F3] tests milestone idempotence [F3] tests pull_request idempotence [F3] tests release idempotence [F3] tests asset idempotence [F3] tests project idempotence [F3] tests review idempotence (cherry picked from commit 91038bb4e8d1f45d496ccf05d4fc8be88ded8093) (cherry picked from commit a7d2a65214d30d2b75961da8eed16378eb445766) (cherry picked from commit 59a17e5a3404a320b85a2b2ee5838e704f558cea) [F3] sub command of forgejo-cli (cherry picked from commit 4d098e9b83a7d43e46086a84606ab627d6ae3138) [F3] implement --quiet, --debug, --verbose (cherry picked from commit 82e2e17b4524900ae5afd68ec3ea23d58cabba54) [F3] fix off by one error when importing repositories (cherry picked from commit 31689b13979cb54521a09cf95be9c77f4b718fe3) [F3] upgrade gof3 (cherry picked from commit 87b8cfe5a1e4790848f76ccec1055782cf2e493e) [F3] set the logger for all drivers The logger is set for the local Forgejo driver only. Even when --debug is specified, the other drivers do not display debug information. Use the gof3 context to set the logger for all of them at once. (cherry picked from commit 8aa7de8ba0ddac1c696063aa1c5c9e52ff3e11b4) [F3] the closed date of an issue may be nil (cherry picked from commit 93d3eaf0b5026f003fcc071ba9596d9d225e9b17) [F3] update gof3 to support system users there now is a workaround to hardcode system users when they are not supported by the API (cherry picked from commit 915484daa7365186d77a218af1c11ef9dba53d7c) (cherry picked from commit b47ac73b8a6452b636bfdb0cca702567c77a581b) [F3] upgrade gof3 with a version that can deal with system users When they are missing from what the API returns, it will replace the missing user with the Ghost user instead of leaving it be a null pointer. (cherry picked from commit 9eeeab7f8e79bc512a1c2e73945a3b1be418b519) [F3] tests do not need a running Forgejo server (cherry picked from commit b2b9749ac9d59d2d460d4b50533dd26a93659b80) [F3] upgrade gof3 to correctly fetch PRs from forks (cherry picked from commit d2448de302a4fe3c070f6dd78d350b6e6d2a592d) [F3] upgrade gof3 to resolve incorrect object ID mappings (cherry picked from commit af8c9de89ffa3bc6adf659f01850e08959797b15) [F3] mirroring a repository needs --mirror instead of --bare (cherry picked from commit 9941131920d0c9122121cd733d11779fa2ec8f00) [F3] PR create the pull/N/head from the original PR head It is incorrect to assume they are identical because: * the IDs of a PR may be remapped and pull/N/head will become pull/M/head * the head of a remote fork is a branch named after the fork (cherry picked from commit 9c220bf23e8a2d1e62862b7f5582b9269ea7e729) [F3] gof3 upgrade with non overlapping PR references (cherry picked from commit f1b2f82e7eede4ecb65db6e4ba5f9b59ac3b03fd) [F3] refactor issue insertion to preserve the creation date issues_model.NewIssue() is convenient but will override the creation date. Update the database instead. (cherry picked from commit 729f4be1e45472d190b6fb842c5ee0e93ddea094) [F3] gof3 upgrade to get performance improvements (cherry picked from commit 996ac35d4d859601c203e50ac3b49f8453bd5880) (cherry picked from commit 906e9eb3f5a6987e7a10b430db807507909d3fbc) (cherry picked from commit c340e221970f932d3f494918c983fb9b473289c8) (cherry picked from commit bb0ed72e08396004dd6612d3110418e36ac2602f) (cherry picked from commit 500e640d6d366437d88f4e3f6a047fdd86f0719e) [F3] TestForgeMethods needs to populate the database (cherry picked from commit e6da71229f6f940ec4b14ee5726d940e297e57c8) (cherry picked from commit e3bd08889584ab9afb9c1fcdfc6d8b5ce34207a5) (cherry picked from commit 22551361877dbaa3e397e4f75e79f995aae2b665) (cherry picked from commit 69584b1baf5e5918c644304ba4bc2bf721d5bbfa) (cherry picked from commit bc37771dc3c0eeeed248e334b4b629a527005d85) (cherry picked from commit 90592146c613bbb42af45e60de33224cf7fddb61) (cherry picked from commit 6160eb38d93c11d88893f424a4908b38625114b9) (cherry picked from commit 4ed79ea8eb4fcd8741d748fcc5eaae5cba749e95) (cherry picked from commit 8cb9c266ab72bc9063f7c155faa585ef30cc7b10) (cherry picked from commit 7b346e7bb202d206de8dfbdc5540bd8c807dbd20) (cherry picked from commit 0345dd562de4266a90e6c7691c3075a1dd9a7691) (cherry picked from commit 0f8821c1b1bc6e63dc1398936b53cf81b5939e7f) [F3] resolve (cherry picked from commit 2acd211536a7b49dc3198d5cf80dcd3c8ff6a837) (cherry picked from commit 704317c24e3969e1240eaeac7fd02aac0225d769) (cherry picked from commit b127296da6742cf1b0380f0779f5dd59d5be34fa) (cherry picked from commit 000b6f823e242f965628f205bcbdeb924b983e56) (cherry picked from commit 7bd1b351390d14c79e5c39a16e720eebe995d307) (cherry picked from commit 6ba434bf2fcea63204f6d6cd4db7521e30f2b564) (cherry picked from commit 5c0826c529d8205f2b303c5a40336de8b905bfa0) (cherry picked from commit 00f7d12512db003f5e2d9267351e46e6d8e1905c) (cherry picked from commit 13550cb0b51b12785a26a227af2bd7226aabb445) (cherry picked from commit 3b16d9e1143a14a5351de51286ac67ec974c47e7) (cherry picked from commit 1b0db139d68c616270f96382f6f7c8340692f6f7) [F3] licenses (cherry picked from commit 2bccd8c1ef47cf169ac705ed6839d857bc1dddc4) (cherry picked from commit a92c48c8c2387ccdf135e1ef7cad2dd7fdf375b6) (cherry picked from commit 5ca885122497d2a3086d2f7f8ec6fe3cb3fcaf7a)
2022-09-06 04:35:43 +00:00
var globalFlags []cli.Flag = make([]cli.Flag, 0, 10)
[CLI] implement forgejo-cli (cherry picked from commit 2555e315f7561302484b15576d34c5da0d4cdb12) (cherry picked from commit 51b9c9092e21a451695ee0154e7d49753574f525) [CLI] implement forgejo-cli (squash) support initDB (cherry picked from commit 5c31ae602a45f1d9a90b86bece5393bc9faddf25) (cherry picked from commit bbf76489a73bad83d68ca7c8e7a75cf8e27b2198) Conflicts: because of d0dbe52e76f3038777c3b50066e3636105387ca3 upgrade to https://pkg.go.dev/github.com/urfave/cli/v2 (cherry picked from commit b6c1bcc008fcff0e297d570a0069bf41bc74e53d) [CLI] implement forgejo-cli actions (cherry picked from commit 08be2b226e46d9f41e08f66e936b317bcfb4a257) (cherry picked from commit b6cfa88c6e2ae00e30c832ce4cf93c9e3f2cd6e4) (cherry picked from commit 59704200de59b65a4f37c39569a3b43e1ee38862) [CLI] implement forgejo-cli actions generate-secret (cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d) (cherry picked from commit e085d6d2737e6238a4ff00f19f40cf839ac16b34) [CLI] implement forgejo-cli actions generate-secret (squash) NoInit (cherry picked from commit 962c944eb20268a394030495c3caab3e3d4bd8b7) [CLI] implement forgejo-cli actions register (cherry picked from commit 2f95143000e4ccc94ef14332777b58fe778edbd6) (cherry picked from commit 42f2f8731e876564b6627a43a248f262f50c04cd) [CLI] implement forgejo-cli actions register (squash) no private Do not go through the private API, directly modify the database (cherry picked from commit 1ba7c0d39d0ecd190b7d9c517bd26af6c84341aa) [CLI] implement forgejo-cli actions (cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d) (cherry picked from commit e085d6d2737e6238a4ff00f19f40cf839ac16b34) [CLI] implement forgejo-cli actions generate-secret (squash) NoInit (cherry picked from commit 962c944eb20268a394030495c3caab3e3d4bd8b7) (cherry picked from commit 4c121ef022597e66d902c17e0f46839c26924b18) Conflicts: cmd/forgejo/actions.go tests/integration/cmd_forgejo_actions_test.go (cherry picked from commit 36997a48e38286579850abe4b55e75a235b56537) [CLI] implement forgejo-cli actions (squash) restore --version Refs: https://codeberg.org/forgejo/forgejo/issues/1134 (cherry picked from commit 9739eb52d8f94d32f61068d7209958e8d2582818) [CI] implement forgejo-cli (squash) the actions subcommand needs config (cherry picked from commit def638475122a26082ab3835842c84cd03839154) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1209 (cherry picked from commit a1758a391043123903607338cb11490161ac946d) (cherry picked from commit 935fa650c77b151752a58f621d846b166b97cd79) (cherry picked from commit cd21026bc94922043dce8e2a5baba68111d1e569) (cherry picked from commit 1700b8973a58f0fc3469492d8a39b931019d2461) (cherry picked from commit 1def42a37945cfe88947803f9afe9468fb8798fe) (cherry picked from commit 839d97521d59a012b06e6c2b9b0655c56b41b6cd) (cherry picked from commit fd8c13be6b45f9aa939be482c0a4e5a60c89344c) (cherry picked from commit 588e5d552f044d91218a07fa46e84259d4892c5d) (cherry picked from commit 151a726620f662ff9af37316dfda38a6bd6744bb) [v1.22] [CLI] implement forgejo-cli https://codeberg.org/forgejo/forgejo/pulls/1541 (cherry picked from commit 46708de7b9a3efac74aced8361327a39f45b6892) (cherry picked from commit a8e5c1369ee3ee197579a30aeba519b4384360aa) (cherry picked from commit c8a32aaf24fd851927432f140fcc59a274824d33) Conflicts: models/actions/main_test.go https://codeberg.org/forgejo/forgejo/pulls/1656 (cherry picked from commit 79f4553063c4f4ee70c98f95d9e62facd9d33c67) (cherry picked from commit 0379da0cf5b14e7915f2f38502bd00036723071d) (cherry picked from commit 331d58c085d6533ebcc528c1ac69d4f99e8e9acd) (cherry picked from commit 89705502c477ec833bd7ce46c3cedc53fbd454bc) (cherry picked from commit 4723d5febf4a5748b2ca038bc95235995ebb8c11) (cherry picked from commit e71b26013039d5d029ec4c38befd25e6a447b3f1) (cherry picked from commit 6a376a5b48b0b5187f492ddd73c72896cc8ae0a8) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1969 (cherry picked from commit 6ba97cf4b5bae19426fef9d65a20bc5527e41a90) (cherry picked from commit e0a6ebfeca1ff20d53fe8d0baf4a737d6e10fce1) (cherry picked from commit 5702aeab2d25fa1f79fb1d11ec359a5460dc0f91) (cherry picked from commit f919c4d6c11423ac2d3ab624d9a6390661c07aa7) (cherry picked from commit a26799a88aa2f320b498372717019fa601545931)
2023-07-09 12:52:21 +00:00
//
// If the executable is forgejo-cli, provide a Forgejo specific CLI
// that is NOT compatible with Gitea.
//
if executable == "forgejo-cli" {
subCmdsStandalone = append(subCmdsStandalone, forgejo.CmdActions(context.Background()))
[F3] Forgejo driver and CLI user, topic, project, label, milestone, repository, pull_request, release, asset, comment, reaction, review providers Signed-off-by: Earl Warren <contact@earl-warren.org> Preserve file size when creating attachments Introduced in c6f50297084ebd9ec8b8c25370b9b963167274eb repoList.LoadAttributes has a ctx argument now Rename `repo.GetOwner` to `repo.LoadOwner` bd66fa586a0da58c4cf2f5f8390aef4bac9d0527 upgrade to the latest gof3 (cherry picked from commit c77071365629984c1dc39a7a83e7252fd5b298e2) [F3] ID remapping logic is in place, remove workaround (cherry picked from commit d0fee301670c37c0e73afb271e0a8dd6b622f6f6) [F3] it is experimental, do not enable by default (cherry picked from commit de325b21d0adad199ec05652cb8d9fff19248ddb) (cherry picked from commit 547e7b3c40f15766deb569cf2acface3290cf092) (cherry picked from commit 820df3a56bc194645b482ef77a8845255d1185fe) (cherry picked from commit eaba87689bbea84a215558033fc7d514b1b44f3e) (cherry picked from commit 1b86896b3b4144254ed27064a167650b4e12c690) (cherry picked from commit 0046aac1c639e021e719408e374cfc84fcbaa1d8) (cherry picked from commit f14220df8ff692bdcfdcc94660acf64c77e732f5) (cherry picked from commit 559b73100149978173b0ca8085280cc7fb79982f) (cherry picked from commit 801f7d600de923afb9f24b74f2b28cc380f09cd0) (cherry picked from commit 6aa76e9bcf243500675b5dbd543ee89d301ca44e) (cherry picked from commit a8757dcb071093faea8a398413ee5681193b0627) [F3] promote F3 users to matching OAuth2 users on first sign-in (cherry picked from commit bd7fef7496c6f50e1559eac5922ec3280745864d) (cherry picked from commit 07412698e8828bff3e1894d57356d92bb0063665) (cherry picked from commit d143e5b2a3dda118529d29caea5e12423b5f5116) [F3] upgrade to gof3 50a6e740ac04 Add new methods GetIDString() & SetIDString() & ToFormatInterface() Change the prototype of the fixture function (cherry picked from commit d7b263ff8b6fda188fe51b2ce75fa333d4aaa23e) (cherry picked from commit b3eaf2249d3a8b35a564890674f9f50c4e2fde35) (cherry picked from commit d492ddd9bba3df102e513e748fcafe7808206cb2) [F3] add GetLocalMatchingRemote with a default implementation (cherry picked from commit 0a2201503960a18a4308fcf9c13843c6b48569b0) (cherry picked from commit f1310c38fbc4b2b941af323be215a6313de08232) (cherry picked from commit deb68552f24ce22e35b5c7a88ceb45190b9df0a2) [F3] GetLocalMatchingRemote for user (cherry picked from commit e73cb837f57be0d6c65d6ecb13da621a362351da) (cherry picked from commit a24bc0b85e1702917a6b39282a869b26654b1aa0) (cherry picked from commit 846a522ecc5fcdfff1e875e3d006ea68f26137dd) [F3] GetAdminUser now has a ctx argument (cherry picked from commit 37357a92afe74405909721a0e0062c3eebcb3454) (cherry picked from commit 660bc1673c189a16e88bd492947280a6e25fc7dd) (cherry picked from commit 72d692a76743279b5dd74ff69ecf85d0994be265) [F3] introduce UserTypeF3 To avoid conflicts should UserTypeRemoteUser be used differently by Gitea (cherry picked from commit 6de2701bb34da3ab0e9f9e6038541eecbec1d7e4) [F3] user.Put: idempotency (cherry picked from commit 821e38573ceaa62ffa067b4e173fad50f0f20f05) (cherry picked from commit f7638f5414e8dadbb3d982827d52c9529a4e9298) [F3] upgrade to urfave v2 (cherry picked from commit cc3dbdfd1d1f6814cf8f047805dccf80efd8554c) [F3] update gof3 (cherry picked from commit 2eee960751e1481f007c00e50406104a614e1255) [F3] move f3 under forgejo-cli * simplify the tests by re-using the forgejo-cli helpers to capture the output * unify CmdF3 to be structured in the same way CmdActions is (cherry picked from commit 4c9fe58b7475529aecae2c85a4a51f7dcee86df8) [F3] replace f3 with forgejo-cli f3 (cherry picked from commit 7ba7ceef1b22ed43d5e89f7c4a48d883332ac512) [F3] s/ListOptions/Paginator/ [F3] user: add unit tests [F3] user comparison of F3 managed users is on content [F3] issue: add unit tests [F3] gof3 now has one more argument to Put() [F3] re-use gof3 unit tests for the driver (cherry picked from commit af7ee6200cba7fcc2fa8bb7ca1e0aa0a5942a7df) Conflicts: tests/integration/integration_test.go because of some code removed in forgejo-development, trivial context conflict resolution [F3] more idempotent tests (#1275) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1275 Co-authored-by: Loïc Dachary <loic@dachary.org> Co-committed-by: Loïc Dachary <loic@dachary.org> [F3] tests: do SQL update if nothing changes [F3] tests comment idempotence [F3] tests milestone idempotence [F3] tests pull_request idempotence [F3] tests release idempotence [F3] tests asset idempotence [F3] tests project idempotence [F3] tests review idempotence (cherry picked from commit 91038bb4e8d1f45d496ccf05d4fc8be88ded8093) (cherry picked from commit a7d2a65214d30d2b75961da8eed16378eb445766) (cherry picked from commit 59a17e5a3404a320b85a2b2ee5838e704f558cea) [F3] sub command of forgejo-cli (cherry picked from commit 4d098e9b83a7d43e46086a84606ab627d6ae3138) [F3] implement --quiet, --debug, --verbose (cherry picked from commit 82e2e17b4524900ae5afd68ec3ea23d58cabba54) [F3] fix off by one error when importing repositories (cherry picked from commit 31689b13979cb54521a09cf95be9c77f4b718fe3) [F3] upgrade gof3 (cherry picked from commit 87b8cfe5a1e4790848f76ccec1055782cf2e493e) [F3] set the logger for all drivers The logger is set for the local Forgejo driver only. Even when --debug is specified, the other drivers do not display debug information. Use the gof3 context to set the logger for all of them at once. (cherry picked from commit 8aa7de8ba0ddac1c696063aa1c5c9e52ff3e11b4) [F3] the closed date of an issue may be nil (cherry picked from commit 93d3eaf0b5026f003fcc071ba9596d9d225e9b17) [F3] update gof3 to support system users there now is a workaround to hardcode system users when they are not supported by the API (cherry picked from commit 915484daa7365186d77a218af1c11ef9dba53d7c) (cherry picked from commit b47ac73b8a6452b636bfdb0cca702567c77a581b) [F3] upgrade gof3 with a version that can deal with system users When they are missing from what the API returns, it will replace the missing user with the Ghost user instead of leaving it be a null pointer. (cherry picked from commit 9eeeab7f8e79bc512a1c2e73945a3b1be418b519) [F3] tests do not need a running Forgejo server (cherry picked from commit b2b9749ac9d59d2d460d4b50533dd26a93659b80) [F3] upgrade gof3 to correctly fetch PRs from forks (cherry picked from commit d2448de302a4fe3c070f6dd78d350b6e6d2a592d) [F3] upgrade gof3 to resolve incorrect object ID mappings (cherry picked from commit af8c9de89ffa3bc6adf659f01850e08959797b15) [F3] mirroring a repository needs --mirror instead of --bare (cherry picked from commit 9941131920d0c9122121cd733d11779fa2ec8f00) [F3] PR create the pull/N/head from the original PR head It is incorrect to assume they are identical because: * the IDs of a PR may be remapped and pull/N/head will become pull/M/head * the head of a remote fork is a branch named after the fork (cherry picked from commit 9c220bf23e8a2d1e62862b7f5582b9269ea7e729) [F3] gof3 upgrade with non overlapping PR references (cherry picked from commit f1b2f82e7eede4ecb65db6e4ba5f9b59ac3b03fd) [F3] refactor issue insertion to preserve the creation date issues_model.NewIssue() is convenient but will override the creation date. Update the database instead. (cherry picked from commit 729f4be1e45472d190b6fb842c5ee0e93ddea094) [F3] gof3 upgrade to get performance improvements (cherry picked from commit 996ac35d4d859601c203e50ac3b49f8453bd5880) (cherry picked from commit 906e9eb3f5a6987e7a10b430db807507909d3fbc) (cherry picked from commit c340e221970f932d3f494918c983fb9b473289c8) (cherry picked from commit bb0ed72e08396004dd6612d3110418e36ac2602f) (cherry picked from commit 500e640d6d366437d88f4e3f6a047fdd86f0719e) [F3] TestForgeMethods needs to populate the database (cherry picked from commit e6da71229f6f940ec4b14ee5726d940e297e57c8) (cherry picked from commit e3bd08889584ab9afb9c1fcdfc6d8b5ce34207a5) (cherry picked from commit 22551361877dbaa3e397e4f75e79f995aae2b665) (cherry picked from commit 69584b1baf5e5918c644304ba4bc2bf721d5bbfa) (cherry picked from commit bc37771dc3c0eeeed248e334b4b629a527005d85) (cherry picked from commit 90592146c613bbb42af45e60de33224cf7fddb61) (cherry picked from commit 6160eb38d93c11d88893f424a4908b38625114b9) (cherry picked from commit 4ed79ea8eb4fcd8741d748fcc5eaae5cba749e95) (cherry picked from commit 8cb9c266ab72bc9063f7c155faa585ef30cc7b10) (cherry picked from commit 7b346e7bb202d206de8dfbdc5540bd8c807dbd20) (cherry picked from commit 0345dd562de4266a90e6c7691c3075a1dd9a7691) (cherry picked from commit 0f8821c1b1bc6e63dc1398936b53cf81b5939e7f) [F3] resolve (cherry picked from commit 2acd211536a7b49dc3198d5cf80dcd3c8ff6a837) (cherry picked from commit 704317c24e3969e1240eaeac7fd02aac0225d769) (cherry picked from commit b127296da6742cf1b0380f0779f5dd59d5be34fa) (cherry picked from commit 000b6f823e242f965628f205bcbdeb924b983e56) (cherry picked from commit 7bd1b351390d14c79e5c39a16e720eebe995d307) (cherry picked from commit 6ba434bf2fcea63204f6d6cd4db7521e30f2b564) (cherry picked from commit 5c0826c529d8205f2b303c5a40336de8b905bfa0) (cherry picked from commit 00f7d12512db003f5e2d9267351e46e6d8e1905c) (cherry picked from commit 13550cb0b51b12785a26a227af2bd7226aabb445) (cherry picked from commit 3b16d9e1143a14a5351de51286ac67ec974c47e7) (cherry picked from commit 1b0db139d68c616270f96382f6f7c8340692f6f7) [F3] licenses (cherry picked from commit 2bccd8c1ef47cf169ac705ed6839d857bc1dddc4) (cherry picked from commit a92c48c8c2387ccdf135e1ef7cad2dd7fdf375b6) (cherry picked from commit 5ca885122497d2a3086d2f7f8ec6fe3cb3fcaf7a)
2022-09-06 04:35:43 +00:00
subCmdWithConfig = append(subCmdWithConfig, forgejo.CmdF3(context.Background()))
globalFlags = append(globalFlags, []cli.Flag{
&cli.BoolFlag{
Name: "quiet",
},
&cli.BoolFlag{
Name: "verbose",
},
&cli.BoolFlag{
Name: "debug",
},
}...)
[CLI] implement forgejo-cli (cherry picked from commit 2555e315f7561302484b15576d34c5da0d4cdb12) (cherry picked from commit 51b9c9092e21a451695ee0154e7d49753574f525) [CLI] implement forgejo-cli (squash) support initDB (cherry picked from commit 5c31ae602a45f1d9a90b86bece5393bc9faddf25) (cherry picked from commit bbf76489a73bad83d68ca7c8e7a75cf8e27b2198) Conflicts: because of d0dbe52e76f3038777c3b50066e3636105387ca3 upgrade to https://pkg.go.dev/github.com/urfave/cli/v2 (cherry picked from commit b6c1bcc008fcff0e297d570a0069bf41bc74e53d) [CLI] implement forgejo-cli actions (cherry picked from commit 08be2b226e46d9f41e08f66e936b317bcfb4a257) (cherry picked from commit b6cfa88c6e2ae00e30c832ce4cf93c9e3f2cd6e4) (cherry picked from commit 59704200de59b65a4f37c39569a3b43e1ee38862) [CLI] implement forgejo-cli actions generate-secret (cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d) (cherry picked from commit e085d6d2737e6238a4ff00f19f40cf839ac16b34) [CLI] implement forgejo-cli actions generate-secret (squash) NoInit (cherry picked from commit 962c944eb20268a394030495c3caab3e3d4bd8b7) [CLI] implement forgejo-cli actions register (cherry picked from commit 2f95143000e4ccc94ef14332777b58fe778edbd6) (cherry picked from commit 42f2f8731e876564b6627a43a248f262f50c04cd) [CLI] implement forgejo-cli actions register (squash) no private Do not go through the private API, directly modify the database (cherry picked from commit 1ba7c0d39d0ecd190b7d9c517bd26af6c84341aa) [CLI] implement forgejo-cli actions (cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d) (cherry picked from commit e085d6d2737e6238a4ff00f19f40cf839ac16b34) [CLI] implement forgejo-cli actions generate-secret (squash) NoInit (cherry picked from commit 962c944eb20268a394030495c3caab3e3d4bd8b7) (cherry picked from commit 4c121ef022597e66d902c17e0f46839c26924b18) Conflicts: cmd/forgejo/actions.go tests/integration/cmd_forgejo_actions_test.go (cherry picked from commit 36997a48e38286579850abe4b55e75a235b56537) [CLI] implement forgejo-cli actions (squash) restore --version Refs: https://codeberg.org/forgejo/forgejo/issues/1134 (cherry picked from commit 9739eb52d8f94d32f61068d7209958e8d2582818) [CI] implement forgejo-cli (squash) the actions subcommand needs config (cherry picked from commit def638475122a26082ab3835842c84cd03839154) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1209 (cherry picked from commit a1758a391043123903607338cb11490161ac946d) (cherry picked from commit 935fa650c77b151752a58f621d846b166b97cd79) (cherry picked from commit cd21026bc94922043dce8e2a5baba68111d1e569) (cherry picked from commit 1700b8973a58f0fc3469492d8a39b931019d2461) (cherry picked from commit 1def42a37945cfe88947803f9afe9468fb8798fe) (cherry picked from commit 839d97521d59a012b06e6c2b9b0655c56b41b6cd) (cherry picked from commit fd8c13be6b45f9aa939be482c0a4e5a60c89344c) (cherry picked from commit 588e5d552f044d91218a07fa46e84259d4892c5d) (cherry picked from commit 151a726620f662ff9af37316dfda38a6bd6744bb) [v1.22] [CLI] implement forgejo-cli https://codeberg.org/forgejo/forgejo/pulls/1541 (cherry picked from commit 46708de7b9a3efac74aced8361327a39f45b6892) (cherry picked from commit a8e5c1369ee3ee197579a30aeba519b4384360aa) (cherry picked from commit c8a32aaf24fd851927432f140fcc59a274824d33) Conflicts: models/actions/main_test.go https://codeberg.org/forgejo/forgejo/pulls/1656 (cherry picked from commit 79f4553063c4f4ee70c98f95d9e62facd9d33c67) (cherry picked from commit 0379da0cf5b14e7915f2f38502bd00036723071d) (cherry picked from commit 331d58c085d6533ebcc528c1ac69d4f99e8e9acd) (cherry picked from commit 89705502c477ec833bd7ce46c3cedc53fbd454bc) (cherry picked from commit 4723d5febf4a5748b2ca038bc95235995ebb8c11) (cherry picked from commit e71b26013039d5d029ec4c38befd25e6a447b3f1) (cherry picked from commit 6a376a5b48b0b5187f492ddd73c72896cc8ae0a8) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1969 (cherry picked from commit 6ba97cf4b5bae19426fef9d65a20bc5527e41a90) (cherry picked from commit e0a6ebfeca1ff20d53fe8d0baf4a737d6e10fce1) (cherry picked from commit 5702aeab2d25fa1f79fb1d11ec359a5460dc0f91) (cherry picked from commit f919c4d6c11423ac2d3ab624d9a6390661c07aa7) (cherry picked from commit a26799a88aa2f320b498372717019fa601545931)
2023-07-09 12:52:21 +00:00
} else {
//
// Otherwise provide a Gitea compatible CLI which includes Forgejo
// specific additions under the forgejo-cli subcommand. It allows
// admins to migration from Gitea to Forgejo by replacing the gitea
// binary and rename it to forgejo if they want.
//
subCmdsStandalone = append(subCmdsStandalone, forgejo.CmdForgejo(context.Background()))
subCmdWithConfig = append(subCmdWithConfig, CmdActions)
}
[F3] Forgejo driver and CLI user, topic, project, label, milestone, repository, pull_request, release, asset, comment, reaction, review providers Signed-off-by: Earl Warren <contact@earl-warren.org> Preserve file size when creating attachments Introduced in c6f50297084ebd9ec8b8c25370b9b963167274eb repoList.LoadAttributes has a ctx argument now Rename `repo.GetOwner` to `repo.LoadOwner` bd66fa586a0da58c4cf2f5f8390aef4bac9d0527 upgrade to the latest gof3 (cherry picked from commit c77071365629984c1dc39a7a83e7252fd5b298e2) [F3] ID remapping logic is in place, remove workaround (cherry picked from commit d0fee301670c37c0e73afb271e0a8dd6b622f6f6) [F3] it is experimental, do not enable by default (cherry picked from commit de325b21d0adad199ec05652cb8d9fff19248ddb) (cherry picked from commit 547e7b3c40f15766deb569cf2acface3290cf092) (cherry picked from commit 820df3a56bc194645b482ef77a8845255d1185fe) (cherry picked from commit eaba87689bbea84a215558033fc7d514b1b44f3e) (cherry picked from commit 1b86896b3b4144254ed27064a167650b4e12c690) (cherry picked from commit 0046aac1c639e021e719408e374cfc84fcbaa1d8) (cherry picked from commit f14220df8ff692bdcfdcc94660acf64c77e732f5) (cherry picked from commit 559b73100149978173b0ca8085280cc7fb79982f) (cherry picked from commit 801f7d600de923afb9f24b74f2b28cc380f09cd0) (cherry picked from commit 6aa76e9bcf243500675b5dbd543ee89d301ca44e) (cherry picked from commit a8757dcb071093faea8a398413ee5681193b0627) [F3] promote F3 users to matching OAuth2 users on first sign-in (cherry picked from commit bd7fef7496c6f50e1559eac5922ec3280745864d) (cherry picked from commit 07412698e8828bff3e1894d57356d92bb0063665) (cherry picked from commit d143e5b2a3dda118529d29caea5e12423b5f5116) [F3] upgrade to gof3 50a6e740ac04 Add new methods GetIDString() & SetIDString() & ToFormatInterface() Change the prototype of the fixture function (cherry picked from commit d7b263ff8b6fda188fe51b2ce75fa333d4aaa23e) (cherry picked from commit b3eaf2249d3a8b35a564890674f9f50c4e2fde35) (cherry picked from commit d492ddd9bba3df102e513e748fcafe7808206cb2) [F3] add GetLocalMatchingRemote with a default implementation (cherry picked from commit 0a2201503960a18a4308fcf9c13843c6b48569b0) (cherry picked from commit f1310c38fbc4b2b941af323be215a6313de08232) (cherry picked from commit deb68552f24ce22e35b5c7a88ceb45190b9df0a2) [F3] GetLocalMatchingRemote for user (cherry picked from commit e73cb837f57be0d6c65d6ecb13da621a362351da) (cherry picked from commit a24bc0b85e1702917a6b39282a869b26654b1aa0) (cherry picked from commit 846a522ecc5fcdfff1e875e3d006ea68f26137dd) [F3] GetAdminUser now has a ctx argument (cherry picked from commit 37357a92afe74405909721a0e0062c3eebcb3454) (cherry picked from commit 660bc1673c189a16e88bd492947280a6e25fc7dd) (cherry picked from commit 72d692a76743279b5dd74ff69ecf85d0994be265) [F3] introduce UserTypeF3 To avoid conflicts should UserTypeRemoteUser be used differently by Gitea (cherry picked from commit 6de2701bb34da3ab0e9f9e6038541eecbec1d7e4) [F3] user.Put: idempotency (cherry picked from commit 821e38573ceaa62ffa067b4e173fad50f0f20f05) (cherry picked from commit f7638f5414e8dadbb3d982827d52c9529a4e9298) [F3] upgrade to urfave v2 (cherry picked from commit cc3dbdfd1d1f6814cf8f047805dccf80efd8554c) [F3] update gof3 (cherry picked from commit 2eee960751e1481f007c00e50406104a614e1255) [F3] move f3 under forgejo-cli * simplify the tests by re-using the forgejo-cli helpers to capture the output * unify CmdF3 to be structured in the same way CmdActions is (cherry picked from commit 4c9fe58b7475529aecae2c85a4a51f7dcee86df8) [F3] replace f3 with forgejo-cli f3 (cherry picked from commit 7ba7ceef1b22ed43d5e89f7c4a48d883332ac512) [F3] s/ListOptions/Paginator/ [F3] user: add unit tests [F3] user comparison of F3 managed users is on content [F3] issue: add unit tests [F3] gof3 now has one more argument to Put() [F3] re-use gof3 unit tests for the driver (cherry picked from commit af7ee6200cba7fcc2fa8bb7ca1e0aa0a5942a7df) Conflicts: tests/integration/integration_test.go because of some code removed in forgejo-development, trivial context conflict resolution [F3] more idempotent tests (#1275) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1275 Co-authored-by: Loïc Dachary <loic@dachary.org> Co-committed-by: Loïc Dachary <loic@dachary.org> [F3] tests: do SQL update if nothing changes [F3] tests comment idempotence [F3] tests milestone idempotence [F3] tests pull_request idempotence [F3] tests release idempotence [F3] tests asset idempotence [F3] tests project idempotence [F3] tests review idempotence (cherry picked from commit 91038bb4e8d1f45d496ccf05d4fc8be88ded8093) (cherry picked from commit a7d2a65214d30d2b75961da8eed16378eb445766) (cherry picked from commit 59a17e5a3404a320b85a2b2ee5838e704f558cea) [F3] sub command of forgejo-cli (cherry picked from commit 4d098e9b83a7d43e46086a84606ab627d6ae3138) [F3] implement --quiet, --debug, --verbose (cherry picked from commit 82e2e17b4524900ae5afd68ec3ea23d58cabba54) [F3] fix off by one error when importing repositories (cherry picked from commit 31689b13979cb54521a09cf95be9c77f4b718fe3) [F3] upgrade gof3 (cherry picked from commit 87b8cfe5a1e4790848f76ccec1055782cf2e493e) [F3] set the logger for all drivers The logger is set for the local Forgejo driver only. Even when --debug is specified, the other drivers do not display debug information. Use the gof3 context to set the logger for all of them at once. (cherry picked from commit 8aa7de8ba0ddac1c696063aa1c5c9e52ff3e11b4) [F3] the closed date of an issue may be nil (cherry picked from commit 93d3eaf0b5026f003fcc071ba9596d9d225e9b17) [F3] update gof3 to support system users there now is a workaround to hardcode system users when they are not supported by the API (cherry picked from commit 915484daa7365186d77a218af1c11ef9dba53d7c) (cherry picked from commit b47ac73b8a6452b636bfdb0cca702567c77a581b) [F3] upgrade gof3 with a version that can deal with system users When they are missing from what the API returns, it will replace the missing user with the Ghost user instead of leaving it be a null pointer. (cherry picked from commit 9eeeab7f8e79bc512a1c2e73945a3b1be418b519) [F3] tests do not need a running Forgejo server (cherry picked from commit b2b9749ac9d59d2d460d4b50533dd26a93659b80) [F3] upgrade gof3 to correctly fetch PRs from forks (cherry picked from commit d2448de302a4fe3c070f6dd78d350b6e6d2a592d) [F3] upgrade gof3 to resolve incorrect object ID mappings (cherry picked from commit af8c9de89ffa3bc6adf659f01850e08959797b15) [F3] mirroring a repository needs --mirror instead of --bare (cherry picked from commit 9941131920d0c9122121cd733d11779fa2ec8f00) [F3] PR create the pull/N/head from the original PR head It is incorrect to assume they are identical because: * the IDs of a PR may be remapped and pull/N/head will become pull/M/head * the head of a remote fork is a branch named after the fork (cherry picked from commit 9c220bf23e8a2d1e62862b7f5582b9269ea7e729) [F3] gof3 upgrade with non overlapping PR references (cherry picked from commit f1b2f82e7eede4ecb65db6e4ba5f9b59ac3b03fd) [F3] refactor issue insertion to preserve the creation date issues_model.NewIssue() is convenient but will override the creation date. Update the database instead. (cherry picked from commit 729f4be1e45472d190b6fb842c5ee0e93ddea094) [F3] gof3 upgrade to get performance improvements (cherry picked from commit 996ac35d4d859601c203e50ac3b49f8453bd5880) (cherry picked from commit 906e9eb3f5a6987e7a10b430db807507909d3fbc) (cherry picked from commit c340e221970f932d3f494918c983fb9b473289c8) (cherry picked from commit bb0ed72e08396004dd6612d3110418e36ac2602f) (cherry picked from commit 500e640d6d366437d88f4e3f6a047fdd86f0719e) [F3] TestForgeMethods needs to populate the database (cherry picked from commit e6da71229f6f940ec4b14ee5726d940e297e57c8) (cherry picked from commit e3bd08889584ab9afb9c1fcdfc6d8b5ce34207a5) (cherry picked from commit 22551361877dbaa3e397e4f75e79f995aae2b665) (cherry picked from commit 69584b1baf5e5918c644304ba4bc2bf721d5bbfa) (cherry picked from commit bc37771dc3c0eeeed248e334b4b629a527005d85) (cherry picked from commit 90592146c613bbb42af45e60de33224cf7fddb61) (cherry picked from commit 6160eb38d93c11d88893f424a4908b38625114b9) (cherry picked from commit 4ed79ea8eb4fcd8741d748fcc5eaae5cba749e95) (cherry picked from commit 8cb9c266ab72bc9063f7c155faa585ef30cc7b10) (cherry picked from commit 7b346e7bb202d206de8dfbdc5540bd8c807dbd20) (cherry picked from commit 0345dd562de4266a90e6c7691c3075a1dd9a7691) (cherry picked from commit 0f8821c1b1bc6e63dc1398936b53cf81b5939e7f) [F3] resolve (cherry picked from commit 2acd211536a7b49dc3198d5cf80dcd3c8ff6a837) (cherry picked from commit 704317c24e3969e1240eaeac7fd02aac0225d769) (cherry picked from commit b127296da6742cf1b0380f0779f5dd59d5be34fa) (cherry picked from commit 000b6f823e242f965628f205bcbdeb924b983e56) (cherry picked from commit 7bd1b351390d14c79e5c39a16e720eebe995d307) (cherry picked from commit 6ba434bf2fcea63204f6d6cd4db7521e30f2b564) (cherry picked from commit 5c0826c529d8205f2b303c5a40336de8b905bfa0) (cherry picked from commit 00f7d12512db003f5e2d9267351e46e6d8e1905c) (cherry picked from commit 13550cb0b51b12785a26a227af2bd7226aabb445) (cherry picked from commit 3b16d9e1143a14a5351de51286ac67ec974c47e7) (cherry picked from commit 1b0db139d68c616270f96382f6f7c8340692f6f7) [F3] licenses (cherry picked from commit 2bccd8c1ef47cf169ac705ed6839d857bc1dddc4) (cherry picked from commit a92c48c8c2387ccdf135e1ef7cad2dd7fdf375b6) (cherry picked from commit 5ca885122497d2a3086d2f7f8ec6fe3cb3fcaf7a)
2022-09-06 04:35:43 +00:00
return innerNewMainApp(version, versionExtra, subCmdsStandalone, subCmdWithConfig, globalFlags)
[CLI] implement forgejo-cli (cherry picked from commit 2555e315f7561302484b15576d34c5da0d4cdb12) (cherry picked from commit 51b9c9092e21a451695ee0154e7d49753574f525) [CLI] implement forgejo-cli (squash) support initDB (cherry picked from commit 5c31ae602a45f1d9a90b86bece5393bc9faddf25) (cherry picked from commit bbf76489a73bad83d68ca7c8e7a75cf8e27b2198) Conflicts: because of d0dbe52e76f3038777c3b50066e3636105387ca3 upgrade to https://pkg.go.dev/github.com/urfave/cli/v2 (cherry picked from commit b6c1bcc008fcff0e297d570a0069bf41bc74e53d) [CLI] implement forgejo-cli actions (cherry picked from commit 08be2b226e46d9f41e08f66e936b317bcfb4a257) (cherry picked from commit b6cfa88c6e2ae00e30c832ce4cf93c9e3f2cd6e4) (cherry picked from commit 59704200de59b65a4f37c39569a3b43e1ee38862) [CLI] implement forgejo-cli actions generate-secret (cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d) (cherry picked from commit e085d6d2737e6238a4ff00f19f40cf839ac16b34) [CLI] implement forgejo-cli actions generate-secret (squash) NoInit (cherry picked from commit 962c944eb20268a394030495c3caab3e3d4bd8b7) [CLI] implement forgejo-cli actions register (cherry picked from commit 2f95143000e4ccc94ef14332777b58fe778edbd6) (cherry picked from commit 42f2f8731e876564b6627a43a248f262f50c04cd) [CLI] implement forgejo-cli actions register (squash) no private Do not go through the private API, directly modify the database (cherry picked from commit 1ba7c0d39d0ecd190b7d9c517bd26af6c84341aa) [CLI] implement forgejo-cli actions (cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d) (cherry picked from commit e085d6d2737e6238a4ff00f19f40cf839ac16b34) [CLI] implement forgejo-cli actions generate-secret (squash) NoInit (cherry picked from commit 962c944eb20268a394030495c3caab3e3d4bd8b7) (cherry picked from commit 4c121ef022597e66d902c17e0f46839c26924b18) Conflicts: cmd/forgejo/actions.go tests/integration/cmd_forgejo_actions_test.go (cherry picked from commit 36997a48e38286579850abe4b55e75a235b56537) [CLI] implement forgejo-cli actions (squash) restore --version Refs: https://codeberg.org/forgejo/forgejo/issues/1134 (cherry picked from commit 9739eb52d8f94d32f61068d7209958e8d2582818) [CI] implement forgejo-cli (squash) the actions subcommand needs config (cherry picked from commit def638475122a26082ab3835842c84cd03839154) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1209 (cherry picked from commit a1758a391043123903607338cb11490161ac946d) (cherry picked from commit 935fa650c77b151752a58f621d846b166b97cd79) (cherry picked from commit cd21026bc94922043dce8e2a5baba68111d1e569) (cherry picked from commit 1700b8973a58f0fc3469492d8a39b931019d2461) (cherry picked from commit 1def42a37945cfe88947803f9afe9468fb8798fe) (cherry picked from commit 839d97521d59a012b06e6c2b9b0655c56b41b6cd) (cherry picked from commit fd8c13be6b45f9aa939be482c0a4e5a60c89344c) (cherry picked from commit 588e5d552f044d91218a07fa46e84259d4892c5d) (cherry picked from commit 151a726620f662ff9af37316dfda38a6bd6744bb) [v1.22] [CLI] implement forgejo-cli https://codeberg.org/forgejo/forgejo/pulls/1541 (cherry picked from commit 46708de7b9a3efac74aced8361327a39f45b6892) (cherry picked from commit a8e5c1369ee3ee197579a30aeba519b4384360aa) (cherry picked from commit c8a32aaf24fd851927432f140fcc59a274824d33) Conflicts: models/actions/main_test.go https://codeberg.org/forgejo/forgejo/pulls/1656 (cherry picked from commit 79f4553063c4f4ee70c98f95d9e62facd9d33c67) (cherry picked from commit 0379da0cf5b14e7915f2f38502bd00036723071d) (cherry picked from commit 331d58c085d6533ebcc528c1ac69d4f99e8e9acd) (cherry picked from commit 89705502c477ec833bd7ce46c3cedc53fbd454bc) (cherry picked from commit 4723d5febf4a5748b2ca038bc95235995ebb8c11) (cherry picked from commit e71b26013039d5d029ec4c38befd25e6a447b3f1) (cherry picked from commit 6a376a5b48b0b5187f492ddd73c72896cc8ae0a8) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1969 (cherry picked from commit 6ba97cf4b5bae19426fef9d65a20bc5527e41a90) (cherry picked from commit e0a6ebfeca1ff20d53fe8d0baf4a737d6e10fce1) (cherry picked from commit 5702aeab2d25fa1f79fb1d11ec359a5460dc0f91) (cherry picked from commit f919c4d6c11423ac2d3ab624d9a6390661c07aa7) (cherry picked from commit a26799a88aa2f320b498372717019fa601545931)
2023-07-09 12:52:21 +00:00
}
[F3] Forgejo driver and CLI user, topic, project, label, milestone, repository, pull_request, release, asset, comment, reaction, review providers Signed-off-by: Earl Warren <contact@earl-warren.org> Preserve file size when creating attachments Introduced in c6f50297084ebd9ec8b8c25370b9b963167274eb repoList.LoadAttributes has a ctx argument now Rename `repo.GetOwner` to `repo.LoadOwner` bd66fa586a0da58c4cf2f5f8390aef4bac9d0527 upgrade to the latest gof3 (cherry picked from commit c77071365629984c1dc39a7a83e7252fd5b298e2) [F3] ID remapping logic is in place, remove workaround (cherry picked from commit d0fee301670c37c0e73afb271e0a8dd6b622f6f6) [F3] it is experimental, do not enable by default (cherry picked from commit de325b21d0adad199ec05652cb8d9fff19248ddb) (cherry picked from commit 547e7b3c40f15766deb569cf2acface3290cf092) (cherry picked from commit 820df3a56bc194645b482ef77a8845255d1185fe) (cherry picked from commit eaba87689bbea84a215558033fc7d514b1b44f3e) (cherry picked from commit 1b86896b3b4144254ed27064a167650b4e12c690) (cherry picked from commit 0046aac1c639e021e719408e374cfc84fcbaa1d8) (cherry picked from commit f14220df8ff692bdcfdcc94660acf64c77e732f5) (cherry picked from commit 559b73100149978173b0ca8085280cc7fb79982f) (cherry picked from commit 801f7d600de923afb9f24b74f2b28cc380f09cd0) (cherry picked from commit 6aa76e9bcf243500675b5dbd543ee89d301ca44e) (cherry picked from commit a8757dcb071093faea8a398413ee5681193b0627) [F3] promote F3 users to matching OAuth2 users on first sign-in (cherry picked from commit bd7fef7496c6f50e1559eac5922ec3280745864d) (cherry picked from commit 07412698e8828bff3e1894d57356d92bb0063665) (cherry picked from commit d143e5b2a3dda118529d29caea5e12423b5f5116) [F3] upgrade to gof3 50a6e740ac04 Add new methods GetIDString() & SetIDString() & ToFormatInterface() Change the prototype of the fixture function (cherry picked from commit d7b263ff8b6fda188fe51b2ce75fa333d4aaa23e) (cherry picked from commit b3eaf2249d3a8b35a564890674f9f50c4e2fde35) (cherry picked from commit d492ddd9bba3df102e513e748fcafe7808206cb2) [F3] add GetLocalMatchingRemote with a default implementation (cherry picked from commit 0a2201503960a18a4308fcf9c13843c6b48569b0) (cherry picked from commit f1310c38fbc4b2b941af323be215a6313de08232) (cherry picked from commit deb68552f24ce22e35b5c7a88ceb45190b9df0a2) [F3] GetLocalMatchingRemote for user (cherry picked from commit e73cb837f57be0d6c65d6ecb13da621a362351da) (cherry picked from commit a24bc0b85e1702917a6b39282a869b26654b1aa0) (cherry picked from commit 846a522ecc5fcdfff1e875e3d006ea68f26137dd) [F3] GetAdminUser now has a ctx argument (cherry picked from commit 37357a92afe74405909721a0e0062c3eebcb3454) (cherry picked from commit 660bc1673c189a16e88bd492947280a6e25fc7dd) (cherry picked from commit 72d692a76743279b5dd74ff69ecf85d0994be265) [F3] introduce UserTypeF3 To avoid conflicts should UserTypeRemoteUser be used differently by Gitea (cherry picked from commit 6de2701bb34da3ab0e9f9e6038541eecbec1d7e4) [F3] user.Put: idempotency (cherry picked from commit 821e38573ceaa62ffa067b4e173fad50f0f20f05) (cherry picked from commit f7638f5414e8dadbb3d982827d52c9529a4e9298) [F3] upgrade to urfave v2 (cherry picked from commit cc3dbdfd1d1f6814cf8f047805dccf80efd8554c) [F3] update gof3 (cherry picked from commit 2eee960751e1481f007c00e50406104a614e1255) [F3] move f3 under forgejo-cli * simplify the tests by re-using the forgejo-cli helpers to capture the output * unify CmdF3 to be structured in the same way CmdActions is (cherry picked from commit 4c9fe58b7475529aecae2c85a4a51f7dcee86df8) [F3] replace f3 with forgejo-cli f3 (cherry picked from commit 7ba7ceef1b22ed43d5e89f7c4a48d883332ac512) [F3] s/ListOptions/Paginator/ [F3] user: add unit tests [F3] user comparison of F3 managed users is on content [F3] issue: add unit tests [F3] gof3 now has one more argument to Put() [F3] re-use gof3 unit tests for the driver (cherry picked from commit af7ee6200cba7fcc2fa8bb7ca1e0aa0a5942a7df) Conflicts: tests/integration/integration_test.go because of some code removed in forgejo-development, trivial context conflict resolution [F3] more idempotent tests (#1275) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1275 Co-authored-by: Loïc Dachary <loic@dachary.org> Co-committed-by: Loïc Dachary <loic@dachary.org> [F3] tests: do SQL update if nothing changes [F3] tests comment idempotence [F3] tests milestone idempotence [F3] tests pull_request idempotence [F3] tests release idempotence [F3] tests asset idempotence [F3] tests project idempotence [F3] tests review idempotence (cherry picked from commit 91038bb4e8d1f45d496ccf05d4fc8be88ded8093) (cherry picked from commit a7d2a65214d30d2b75961da8eed16378eb445766) (cherry picked from commit 59a17e5a3404a320b85a2b2ee5838e704f558cea) [F3] sub command of forgejo-cli (cherry picked from commit 4d098e9b83a7d43e46086a84606ab627d6ae3138) [F3] implement --quiet, --debug, --verbose (cherry picked from commit 82e2e17b4524900ae5afd68ec3ea23d58cabba54) [F3] fix off by one error when importing repositories (cherry picked from commit 31689b13979cb54521a09cf95be9c77f4b718fe3) [F3] upgrade gof3 (cherry picked from commit 87b8cfe5a1e4790848f76ccec1055782cf2e493e) [F3] set the logger for all drivers The logger is set for the local Forgejo driver only. Even when --debug is specified, the other drivers do not display debug information. Use the gof3 context to set the logger for all of them at once. (cherry picked from commit 8aa7de8ba0ddac1c696063aa1c5c9e52ff3e11b4) [F3] the closed date of an issue may be nil (cherry picked from commit 93d3eaf0b5026f003fcc071ba9596d9d225e9b17) [F3] update gof3 to support system users there now is a workaround to hardcode system users when they are not supported by the API (cherry picked from commit 915484daa7365186d77a218af1c11ef9dba53d7c) (cherry picked from commit b47ac73b8a6452b636bfdb0cca702567c77a581b) [F3] upgrade gof3 with a version that can deal with system users When they are missing from what the API returns, it will replace the missing user with the Ghost user instead of leaving it be a null pointer. (cherry picked from commit 9eeeab7f8e79bc512a1c2e73945a3b1be418b519) [F3] tests do not need a running Forgejo server (cherry picked from commit b2b9749ac9d59d2d460d4b50533dd26a93659b80) [F3] upgrade gof3 to correctly fetch PRs from forks (cherry picked from commit d2448de302a4fe3c070f6dd78d350b6e6d2a592d) [F3] upgrade gof3 to resolve incorrect object ID mappings (cherry picked from commit af8c9de89ffa3bc6adf659f01850e08959797b15) [F3] mirroring a repository needs --mirror instead of --bare (cherry picked from commit 9941131920d0c9122121cd733d11779fa2ec8f00) [F3] PR create the pull/N/head from the original PR head It is incorrect to assume they are identical because: * the IDs of a PR may be remapped and pull/N/head will become pull/M/head * the head of a remote fork is a branch named after the fork (cherry picked from commit 9c220bf23e8a2d1e62862b7f5582b9269ea7e729) [F3] gof3 upgrade with non overlapping PR references (cherry picked from commit f1b2f82e7eede4ecb65db6e4ba5f9b59ac3b03fd) [F3] refactor issue insertion to preserve the creation date issues_model.NewIssue() is convenient but will override the creation date. Update the database instead. (cherry picked from commit 729f4be1e45472d190b6fb842c5ee0e93ddea094) [F3] gof3 upgrade to get performance improvements (cherry picked from commit 996ac35d4d859601c203e50ac3b49f8453bd5880) (cherry picked from commit 906e9eb3f5a6987e7a10b430db807507909d3fbc) (cherry picked from commit c340e221970f932d3f494918c983fb9b473289c8) (cherry picked from commit bb0ed72e08396004dd6612d3110418e36ac2602f) (cherry picked from commit 500e640d6d366437d88f4e3f6a047fdd86f0719e) [F3] TestForgeMethods needs to populate the database (cherry picked from commit e6da71229f6f940ec4b14ee5726d940e297e57c8) (cherry picked from commit e3bd08889584ab9afb9c1fcdfc6d8b5ce34207a5) (cherry picked from commit 22551361877dbaa3e397e4f75e79f995aae2b665) (cherry picked from commit 69584b1baf5e5918c644304ba4bc2bf721d5bbfa) (cherry picked from commit bc37771dc3c0eeeed248e334b4b629a527005d85) (cherry picked from commit 90592146c613bbb42af45e60de33224cf7fddb61) (cherry picked from commit 6160eb38d93c11d88893f424a4908b38625114b9) (cherry picked from commit 4ed79ea8eb4fcd8741d748fcc5eaae5cba749e95) (cherry picked from commit 8cb9c266ab72bc9063f7c155faa585ef30cc7b10) (cherry picked from commit 7b346e7bb202d206de8dfbdc5540bd8c807dbd20) (cherry picked from commit 0345dd562de4266a90e6c7691c3075a1dd9a7691) (cherry picked from commit 0f8821c1b1bc6e63dc1398936b53cf81b5939e7f) [F3] resolve (cherry picked from commit 2acd211536a7b49dc3198d5cf80dcd3c8ff6a837) (cherry picked from commit 704317c24e3969e1240eaeac7fd02aac0225d769) (cherry picked from commit b127296da6742cf1b0380f0779f5dd59d5be34fa) (cherry picked from commit 000b6f823e242f965628f205bcbdeb924b983e56) (cherry picked from commit 7bd1b351390d14c79e5c39a16e720eebe995d307) (cherry picked from commit 6ba434bf2fcea63204f6d6cd4db7521e30f2b564) (cherry picked from commit 5c0826c529d8205f2b303c5a40336de8b905bfa0) (cherry picked from commit 00f7d12512db003f5e2d9267351e46e6d8e1905c) (cherry picked from commit 13550cb0b51b12785a26a227af2bd7226aabb445) (cherry picked from commit 3b16d9e1143a14a5351de51286ac67ec974c47e7) (cherry picked from commit 1b0db139d68c616270f96382f6f7c8340692f6f7) [F3] licenses (cherry picked from commit 2bccd8c1ef47cf169ac705ed6839d857bc1dddc4) (cherry picked from commit a92c48c8c2387ccdf135e1ef7cad2dd7fdf375b6) (cherry picked from commit 5ca885122497d2a3086d2f7f8ec6fe3cb3fcaf7a)
2022-09-06 04:35:43 +00:00
func innerNewMainApp(version, versionExtra string, subCmdsStandaloneArgs, subCmdWithConfigArgs []*cli.Command, globalFlagsArgs []cli.Flag) *cli.App {
app := cli.NewApp()
app.Name = "Gitea"
app.HelpName = "gitea"
app.Usage = "A painless self-hosted Git service"
app.Description = `Gitea program contains "web" and other subcommands. If no subcommand is given, it starts the web server by default. Use "web" subcommand for more web server arguments, use other subcommands for other purposes.`
app.Version = version + versionExtra
app.EnableBashCompletion = true
// these sub-commands need to use config file
subCmdWithConfig := []*cli.Command{
cmdHelp(), // the "help" sub-command was used to show the more information for "work path" and "custom config"
CmdWeb,
CmdServ,
CmdHook,
CmdKeys,
CmdDump,
CmdAdmin,
CmdMigrate,
CmdDoctor,
CmdManager,
CmdEmbedded,
CmdMigrateStorage,
CmdDumpRepository,
CmdRestoreRepository,
}
[CLI] implement forgejo-cli (cherry picked from commit 2555e315f7561302484b15576d34c5da0d4cdb12) (cherry picked from commit 51b9c9092e21a451695ee0154e7d49753574f525) [CLI] implement forgejo-cli (squash) support initDB (cherry picked from commit 5c31ae602a45f1d9a90b86bece5393bc9faddf25) (cherry picked from commit bbf76489a73bad83d68ca7c8e7a75cf8e27b2198) Conflicts: because of d0dbe52e76f3038777c3b50066e3636105387ca3 upgrade to https://pkg.go.dev/github.com/urfave/cli/v2 (cherry picked from commit b6c1bcc008fcff0e297d570a0069bf41bc74e53d) [CLI] implement forgejo-cli actions (cherry picked from commit 08be2b226e46d9f41e08f66e936b317bcfb4a257) (cherry picked from commit b6cfa88c6e2ae00e30c832ce4cf93c9e3f2cd6e4) (cherry picked from commit 59704200de59b65a4f37c39569a3b43e1ee38862) [CLI] implement forgejo-cli actions generate-secret (cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d) (cherry picked from commit e085d6d2737e6238a4ff00f19f40cf839ac16b34) [CLI] implement forgejo-cli actions generate-secret (squash) NoInit (cherry picked from commit 962c944eb20268a394030495c3caab3e3d4bd8b7) [CLI] implement forgejo-cli actions register (cherry picked from commit 2f95143000e4ccc94ef14332777b58fe778edbd6) (cherry picked from commit 42f2f8731e876564b6627a43a248f262f50c04cd) [CLI] implement forgejo-cli actions register (squash) no private Do not go through the private API, directly modify the database (cherry picked from commit 1ba7c0d39d0ecd190b7d9c517bd26af6c84341aa) [CLI] implement forgejo-cli actions (cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d) (cherry picked from commit e085d6d2737e6238a4ff00f19f40cf839ac16b34) [CLI] implement forgejo-cli actions generate-secret (squash) NoInit (cherry picked from commit 962c944eb20268a394030495c3caab3e3d4bd8b7) (cherry picked from commit 4c121ef022597e66d902c17e0f46839c26924b18) Conflicts: cmd/forgejo/actions.go tests/integration/cmd_forgejo_actions_test.go (cherry picked from commit 36997a48e38286579850abe4b55e75a235b56537) [CLI] implement forgejo-cli actions (squash) restore --version Refs: https://codeberg.org/forgejo/forgejo/issues/1134 (cherry picked from commit 9739eb52d8f94d32f61068d7209958e8d2582818) [CI] implement forgejo-cli (squash) the actions subcommand needs config (cherry picked from commit def638475122a26082ab3835842c84cd03839154) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1209 (cherry picked from commit a1758a391043123903607338cb11490161ac946d) (cherry picked from commit 935fa650c77b151752a58f621d846b166b97cd79) (cherry picked from commit cd21026bc94922043dce8e2a5baba68111d1e569) (cherry picked from commit 1700b8973a58f0fc3469492d8a39b931019d2461) (cherry picked from commit 1def42a37945cfe88947803f9afe9468fb8798fe) (cherry picked from commit 839d97521d59a012b06e6c2b9b0655c56b41b6cd) (cherry picked from commit fd8c13be6b45f9aa939be482c0a4e5a60c89344c) (cherry picked from commit 588e5d552f044d91218a07fa46e84259d4892c5d) (cherry picked from commit 151a726620f662ff9af37316dfda38a6bd6744bb) [v1.22] [CLI] implement forgejo-cli https://codeberg.org/forgejo/forgejo/pulls/1541 (cherry picked from commit 46708de7b9a3efac74aced8361327a39f45b6892) (cherry picked from commit a8e5c1369ee3ee197579a30aeba519b4384360aa) (cherry picked from commit c8a32aaf24fd851927432f140fcc59a274824d33) Conflicts: models/actions/main_test.go https://codeberg.org/forgejo/forgejo/pulls/1656 (cherry picked from commit 79f4553063c4f4ee70c98f95d9e62facd9d33c67) (cherry picked from commit 0379da0cf5b14e7915f2f38502bd00036723071d) (cherry picked from commit 331d58c085d6533ebcc528c1ac69d4f99e8e9acd) (cherry picked from commit 89705502c477ec833bd7ce46c3cedc53fbd454bc) (cherry picked from commit 4723d5febf4a5748b2ca038bc95235995ebb8c11) (cherry picked from commit e71b26013039d5d029ec4c38befd25e6a447b3f1) (cherry picked from commit 6a376a5b48b0b5187f492ddd73c72896cc8ae0a8) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1969 (cherry picked from commit 6ba97cf4b5bae19426fef9d65a20bc5527e41a90) (cherry picked from commit e0a6ebfeca1ff20d53fe8d0baf4a737d6e10fce1) (cherry picked from commit 5702aeab2d25fa1f79fb1d11ec359a5460dc0f91) (cherry picked from commit f919c4d6c11423ac2d3ab624d9a6390661c07aa7) (cherry picked from commit a26799a88aa2f320b498372717019fa601545931)
2023-07-09 12:52:21 +00:00
subCmdWithConfig = append(subCmdWithConfig, subCmdWithConfigArgs...)
// these sub-commands do not need the config file, and they do not depend on any path or environment variable.
subCmdStandalone := []*cli.Command{
CmdCert,
CmdGenerate,
CmdDocs,
}
[CLI] implement forgejo-cli (cherry picked from commit 2555e315f7561302484b15576d34c5da0d4cdb12) (cherry picked from commit 51b9c9092e21a451695ee0154e7d49753574f525) [CLI] implement forgejo-cli (squash) support initDB (cherry picked from commit 5c31ae602a45f1d9a90b86bece5393bc9faddf25) (cherry picked from commit bbf76489a73bad83d68ca7c8e7a75cf8e27b2198) Conflicts: because of d0dbe52e76f3038777c3b50066e3636105387ca3 upgrade to https://pkg.go.dev/github.com/urfave/cli/v2 (cherry picked from commit b6c1bcc008fcff0e297d570a0069bf41bc74e53d) [CLI] implement forgejo-cli actions (cherry picked from commit 08be2b226e46d9f41e08f66e936b317bcfb4a257) (cherry picked from commit b6cfa88c6e2ae00e30c832ce4cf93c9e3f2cd6e4) (cherry picked from commit 59704200de59b65a4f37c39569a3b43e1ee38862) [CLI] implement forgejo-cli actions generate-secret (cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d) (cherry picked from commit e085d6d2737e6238a4ff00f19f40cf839ac16b34) [CLI] implement forgejo-cli actions generate-secret (squash) NoInit (cherry picked from commit 962c944eb20268a394030495c3caab3e3d4bd8b7) [CLI] implement forgejo-cli actions register (cherry picked from commit 2f95143000e4ccc94ef14332777b58fe778edbd6) (cherry picked from commit 42f2f8731e876564b6627a43a248f262f50c04cd) [CLI] implement forgejo-cli actions register (squash) no private Do not go through the private API, directly modify the database (cherry picked from commit 1ba7c0d39d0ecd190b7d9c517bd26af6c84341aa) [CLI] implement forgejo-cli actions (cherry picked from commit 6f7905c8ecf17d5f74ac9a71a453d6768c212b6d) (cherry picked from commit e085d6d2737e6238a4ff00f19f40cf839ac16b34) [CLI] implement forgejo-cli actions generate-secret (squash) NoInit (cherry picked from commit 962c944eb20268a394030495c3caab3e3d4bd8b7) (cherry picked from commit 4c121ef022597e66d902c17e0f46839c26924b18) Conflicts: cmd/forgejo/actions.go tests/integration/cmd_forgejo_actions_test.go (cherry picked from commit 36997a48e38286579850abe4b55e75a235b56537) [CLI] implement forgejo-cli actions (squash) restore --version Refs: https://codeberg.org/forgejo/forgejo/issues/1134 (cherry picked from commit 9739eb52d8f94d32f61068d7209958e8d2582818) [CI] implement forgejo-cli (squash) the actions subcommand needs config (cherry picked from commit def638475122a26082ab3835842c84cd03839154) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1209 (cherry picked from commit a1758a391043123903607338cb11490161ac946d) (cherry picked from commit 935fa650c77b151752a58f621d846b166b97cd79) (cherry picked from commit cd21026bc94922043dce8e2a5baba68111d1e569) (cherry picked from commit 1700b8973a58f0fc3469492d8a39b931019d2461) (cherry picked from commit 1def42a37945cfe88947803f9afe9468fb8798fe) (cherry picked from commit 839d97521d59a012b06e6c2b9b0655c56b41b6cd) (cherry picked from commit fd8c13be6b45f9aa939be482c0a4e5a60c89344c) (cherry picked from commit 588e5d552f044d91218a07fa46e84259d4892c5d) (cherry picked from commit 151a726620f662ff9af37316dfda38a6bd6744bb) [v1.22] [CLI] implement forgejo-cli https://codeberg.org/forgejo/forgejo/pulls/1541 (cherry picked from commit 46708de7b9a3efac74aced8361327a39f45b6892) (cherry picked from commit a8e5c1369ee3ee197579a30aeba519b4384360aa) (cherry picked from commit c8a32aaf24fd851927432f140fcc59a274824d33) Conflicts: models/actions/main_test.go https://codeberg.org/forgejo/forgejo/pulls/1656 (cherry picked from commit 79f4553063c4f4ee70c98f95d9e62facd9d33c67) (cherry picked from commit 0379da0cf5b14e7915f2f38502bd00036723071d) (cherry picked from commit 331d58c085d6533ebcc528c1ac69d4f99e8e9acd) (cherry picked from commit 89705502c477ec833bd7ce46c3cedc53fbd454bc) (cherry picked from commit 4723d5febf4a5748b2ca038bc95235995ebb8c11) (cherry picked from commit e71b26013039d5d029ec4c38befd25e6a447b3f1) (cherry picked from commit 6a376a5b48b0b5187f492ddd73c72896cc8ae0a8) Conflicts: cmd/main.go https://codeberg.org/forgejo/forgejo/pulls/1969 (cherry picked from commit 6ba97cf4b5bae19426fef9d65a20bc5527e41a90) (cherry picked from commit e0a6ebfeca1ff20d53fe8d0baf4a737d6e10fce1) (cherry picked from commit 5702aeab2d25fa1f79fb1d11ec359a5460dc0f91) (cherry picked from commit f919c4d6c11423ac2d3ab624d9a6390661c07aa7) (cherry picked from commit a26799a88aa2f320b498372717019fa601545931)
2023-07-09 12:52:21 +00:00
subCmdStandalone = append(subCmdStandalone, subCmdsStandaloneArgs...)
app.DefaultCommand = CmdWeb.Name
globalFlags := appGlobalFlags()
[F3] Forgejo driver and CLI user, topic, project, label, milestone, repository, pull_request, release, asset, comment, reaction, review providers Signed-off-by: Earl Warren <contact@earl-warren.org> Preserve file size when creating attachments Introduced in c6f50297084ebd9ec8b8c25370b9b963167274eb repoList.LoadAttributes has a ctx argument now Rename `repo.GetOwner` to `repo.LoadOwner` bd66fa586a0da58c4cf2f5f8390aef4bac9d0527 upgrade to the latest gof3 (cherry picked from commit c77071365629984c1dc39a7a83e7252fd5b298e2) [F3] ID remapping logic is in place, remove workaround (cherry picked from commit d0fee301670c37c0e73afb271e0a8dd6b622f6f6) [F3] it is experimental, do not enable by default (cherry picked from commit de325b21d0adad199ec05652cb8d9fff19248ddb) (cherry picked from commit 547e7b3c40f15766deb569cf2acface3290cf092) (cherry picked from commit 820df3a56bc194645b482ef77a8845255d1185fe) (cherry picked from commit eaba87689bbea84a215558033fc7d514b1b44f3e) (cherry picked from commit 1b86896b3b4144254ed27064a167650b4e12c690) (cherry picked from commit 0046aac1c639e021e719408e374cfc84fcbaa1d8) (cherry picked from commit f14220df8ff692bdcfdcc94660acf64c77e732f5) (cherry picked from commit 559b73100149978173b0ca8085280cc7fb79982f) (cherry picked from commit 801f7d600de923afb9f24b74f2b28cc380f09cd0) (cherry picked from commit 6aa76e9bcf243500675b5dbd543ee89d301ca44e) (cherry picked from commit a8757dcb071093faea8a398413ee5681193b0627) [F3] promote F3 users to matching OAuth2 users on first sign-in (cherry picked from commit bd7fef7496c6f50e1559eac5922ec3280745864d) (cherry picked from commit 07412698e8828bff3e1894d57356d92bb0063665) (cherry picked from commit d143e5b2a3dda118529d29caea5e12423b5f5116) [F3] upgrade to gof3 50a6e740ac04 Add new methods GetIDString() & SetIDString() & ToFormatInterface() Change the prototype of the fixture function (cherry picked from commit d7b263ff8b6fda188fe51b2ce75fa333d4aaa23e) (cherry picked from commit b3eaf2249d3a8b35a564890674f9f50c4e2fde35) (cherry picked from commit d492ddd9bba3df102e513e748fcafe7808206cb2) [F3] add GetLocalMatchingRemote with a default implementation (cherry picked from commit 0a2201503960a18a4308fcf9c13843c6b48569b0) (cherry picked from commit f1310c38fbc4b2b941af323be215a6313de08232) (cherry picked from commit deb68552f24ce22e35b5c7a88ceb45190b9df0a2) [F3] GetLocalMatchingRemote for user (cherry picked from commit e73cb837f57be0d6c65d6ecb13da621a362351da) (cherry picked from commit a24bc0b85e1702917a6b39282a869b26654b1aa0) (cherry picked from commit 846a522ecc5fcdfff1e875e3d006ea68f26137dd) [F3] GetAdminUser now has a ctx argument (cherry picked from commit 37357a92afe74405909721a0e0062c3eebcb3454) (cherry picked from commit 660bc1673c189a16e88bd492947280a6e25fc7dd) (cherry picked from commit 72d692a76743279b5dd74ff69ecf85d0994be265) [F3] introduce UserTypeF3 To avoid conflicts should UserTypeRemoteUser be used differently by Gitea (cherry picked from commit 6de2701bb34da3ab0e9f9e6038541eecbec1d7e4) [F3] user.Put: idempotency (cherry picked from commit 821e38573ceaa62ffa067b4e173fad50f0f20f05) (cherry picked from commit f7638f5414e8dadbb3d982827d52c9529a4e9298) [F3] upgrade to urfave v2 (cherry picked from commit cc3dbdfd1d1f6814cf8f047805dccf80efd8554c) [F3] update gof3 (cherry picked from commit 2eee960751e1481f007c00e50406104a614e1255) [F3] move f3 under forgejo-cli * simplify the tests by re-using the forgejo-cli helpers to capture the output * unify CmdF3 to be structured in the same way CmdActions is (cherry picked from commit 4c9fe58b7475529aecae2c85a4a51f7dcee86df8) [F3] replace f3 with forgejo-cli f3 (cherry picked from commit 7ba7ceef1b22ed43d5e89f7c4a48d883332ac512) [F3] s/ListOptions/Paginator/ [F3] user: add unit tests [F3] user comparison of F3 managed users is on content [F3] issue: add unit tests [F3] gof3 now has one more argument to Put() [F3] re-use gof3 unit tests for the driver (cherry picked from commit af7ee6200cba7fcc2fa8bb7ca1e0aa0a5942a7df) Conflicts: tests/integration/integration_test.go because of some code removed in forgejo-development, trivial context conflict resolution [F3] more idempotent tests (#1275) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1275 Co-authored-by: Loïc Dachary <loic@dachary.org> Co-committed-by: Loïc Dachary <loic@dachary.org> [F3] tests: do SQL update if nothing changes [F3] tests comment idempotence [F3] tests milestone idempotence [F3] tests pull_request idempotence [F3] tests release idempotence [F3] tests asset idempotence [F3] tests project idempotence [F3] tests review idempotence (cherry picked from commit 91038bb4e8d1f45d496ccf05d4fc8be88ded8093) (cherry picked from commit a7d2a65214d30d2b75961da8eed16378eb445766) (cherry picked from commit 59a17e5a3404a320b85a2b2ee5838e704f558cea) [F3] sub command of forgejo-cli (cherry picked from commit 4d098e9b83a7d43e46086a84606ab627d6ae3138) [F3] implement --quiet, --debug, --verbose (cherry picked from commit 82e2e17b4524900ae5afd68ec3ea23d58cabba54) [F3] fix off by one error when importing repositories (cherry picked from commit 31689b13979cb54521a09cf95be9c77f4b718fe3) [F3] upgrade gof3 (cherry picked from commit 87b8cfe5a1e4790848f76ccec1055782cf2e493e) [F3] set the logger for all drivers The logger is set for the local Forgejo driver only. Even when --debug is specified, the other drivers do not display debug information. Use the gof3 context to set the logger for all of them at once. (cherry picked from commit 8aa7de8ba0ddac1c696063aa1c5c9e52ff3e11b4) [F3] the closed date of an issue may be nil (cherry picked from commit 93d3eaf0b5026f003fcc071ba9596d9d225e9b17) [F3] update gof3 to support system users there now is a workaround to hardcode system users when they are not supported by the API (cherry picked from commit 915484daa7365186d77a218af1c11ef9dba53d7c) (cherry picked from commit b47ac73b8a6452b636bfdb0cca702567c77a581b) [F3] upgrade gof3 with a version that can deal with system users When they are missing from what the API returns, it will replace the missing user with the Ghost user instead of leaving it be a null pointer. (cherry picked from commit 9eeeab7f8e79bc512a1c2e73945a3b1be418b519) [F3] tests do not need a running Forgejo server (cherry picked from commit b2b9749ac9d59d2d460d4b50533dd26a93659b80) [F3] upgrade gof3 to correctly fetch PRs from forks (cherry picked from commit d2448de302a4fe3c070f6dd78d350b6e6d2a592d) [F3] upgrade gof3 to resolve incorrect object ID mappings (cherry picked from commit af8c9de89ffa3bc6adf659f01850e08959797b15) [F3] mirroring a repository needs --mirror instead of --bare (cherry picked from commit 9941131920d0c9122121cd733d11779fa2ec8f00) [F3] PR create the pull/N/head from the original PR head It is incorrect to assume they are identical because: * the IDs of a PR may be remapped and pull/N/head will become pull/M/head * the head of a remote fork is a branch named after the fork (cherry picked from commit 9c220bf23e8a2d1e62862b7f5582b9269ea7e729) [F3] gof3 upgrade with non overlapping PR references (cherry picked from commit f1b2f82e7eede4ecb65db6e4ba5f9b59ac3b03fd) [F3] refactor issue insertion to preserve the creation date issues_model.NewIssue() is convenient but will override the creation date. Update the database instead. (cherry picked from commit 729f4be1e45472d190b6fb842c5ee0e93ddea094) [F3] gof3 upgrade to get performance improvements (cherry picked from commit 996ac35d4d859601c203e50ac3b49f8453bd5880) (cherry picked from commit 906e9eb3f5a6987e7a10b430db807507909d3fbc) (cherry picked from commit c340e221970f932d3f494918c983fb9b473289c8) (cherry picked from commit bb0ed72e08396004dd6612d3110418e36ac2602f) (cherry picked from commit 500e640d6d366437d88f4e3f6a047fdd86f0719e) [F3] TestForgeMethods needs to populate the database (cherry picked from commit e6da71229f6f940ec4b14ee5726d940e297e57c8) (cherry picked from commit e3bd08889584ab9afb9c1fcdfc6d8b5ce34207a5) (cherry picked from commit 22551361877dbaa3e397e4f75e79f995aae2b665) (cherry picked from commit 69584b1baf5e5918c644304ba4bc2bf721d5bbfa) (cherry picked from commit bc37771dc3c0eeeed248e334b4b629a527005d85) (cherry picked from commit 90592146c613bbb42af45e60de33224cf7fddb61) (cherry picked from commit 6160eb38d93c11d88893f424a4908b38625114b9) (cherry picked from commit 4ed79ea8eb4fcd8741d748fcc5eaae5cba749e95) (cherry picked from commit 8cb9c266ab72bc9063f7c155faa585ef30cc7b10) (cherry picked from commit 7b346e7bb202d206de8dfbdc5540bd8c807dbd20) (cherry picked from commit 0345dd562de4266a90e6c7691c3075a1dd9a7691) (cherry picked from commit 0f8821c1b1bc6e63dc1398936b53cf81b5939e7f) [F3] resolve (cherry picked from commit 2acd211536a7b49dc3198d5cf80dcd3c8ff6a837) (cherry picked from commit 704317c24e3969e1240eaeac7fd02aac0225d769) (cherry picked from commit b127296da6742cf1b0380f0779f5dd59d5be34fa) (cherry picked from commit 000b6f823e242f965628f205bcbdeb924b983e56) (cherry picked from commit 7bd1b351390d14c79e5c39a16e720eebe995d307) (cherry picked from commit 6ba434bf2fcea63204f6d6cd4db7521e30f2b564) (cherry picked from commit 5c0826c529d8205f2b303c5a40336de8b905bfa0) (cherry picked from commit 00f7d12512db003f5e2d9267351e46e6d8e1905c) (cherry picked from commit 13550cb0b51b12785a26a227af2bd7226aabb445) (cherry picked from commit 3b16d9e1143a14a5351de51286ac67ec974c47e7) (cherry picked from commit 1b0db139d68c616270f96382f6f7c8340692f6f7) [F3] licenses (cherry picked from commit 2bccd8c1ef47cf169ac705ed6839d857bc1dddc4) (cherry picked from commit a92c48c8c2387ccdf135e1ef7cad2dd7fdf375b6) (cherry picked from commit 5ca885122497d2a3086d2f7f8ec6fe3cb3fcaf7a)
2022-09-06 04:35:43 +00:00
globalFlags = append(globalFlags, globalFlagsArgs...)
app.Flags = append(app.Flags, cli.VersionFlag)
app.Flags = append(app.Flags, globalFlags...)
app.HideHelp = true // use our own help action to show helps (with more information like default config)
app.Before = PrepareConsoleLoggerLevel(log.INFO)
for i := range subCmdWithConfig {
prepareSubcommandWithConfig(subCmdWithConfig[i], globalFlags)
}
app.Commands = append(app.Commands, subCmdWithConfig...)
app.Commands = append(app.Commands, subCmdStandalone...)
return app
}
func RunMainApp(app *cli.App, args ...string) error {
err := app.Run(args)
if err == nil {
return nil
}
if strings.HasPrefix(err.Error(), "flag provided but not defined:") {
// the cli package should already have output the error message, so just exit
cli.OsExiter(1)
return err
}
_, _ = fmt.Fprintf(app.ErrWriter, "Command error: %v\n", err)
cli.OsExiter(1)
return err
}