forked from forgejo/forgejo
[Vendor] Update directly used dependencys (#15593)
* update github.com/blevesearch/bleve v2.0.2 -> v2.0.3 * github.com/denisenkom/go-mssqldb v0.9.0 -> v0.10.0 * github.com/editorconfig/editorconfig-core-go v2.4.1 -> v2.4.2 * github.com/go-chi/cors v1.1.1 -> v1.2.0 * github.com/go-git/go-billy v5.0.0 -> v5.1.0 * github.com/go-git/go-git v5.2.0 -> v5.3.0 * github.com/go-ldap/ldap v3.2.4 -> v3.3.0 * github.com/go-redis/redis v8.6.0 -> v8.8.2 * github.com/go-sql-driver/mysql v1.5.0 -> v1.6.0 * github.com/go-swagger/go-swagger v0.26.1 -> v0.27.0 * github.com/lib/pq v1.9.0 -> v1.10.1 * github.com/mattn/go-sqlite3 v1.14.6 -> v1.14.7 * github.com/go-testfixtures/testfixtures v3.5.0 -> v3.6.0 * github.com/issue9/identicon v1.0.1 -> v1.2.0 * github.com/klauspost/compress v1.11.8 -> v1.12.1 * github.com/mgechev/revive v1.0.3 -> v1.0.6 * github.com/microcosm-cc/bluemonday v1.0.7 -> v1.0.8 * github.com/niklasfasching/go-org v1.4.0 -> v1.5.0 * github.com/olivere/elastic v7.0.22 -> v7.0.24 * github.com/pelletier/go-toml v1.8.1 -> v1.9.0 * github.com/prometheus/client_golang v1.9.0 -> v1.10.0 * github.com/xanzy/go-gitlab v0.44.0 -> v0.48.0 * github.com/yuin/goldmark v1.3.3 -> v1.3.5 * github.com/6543/go-version v1.2.4 -> v1.3.1 * do github.com/lib/pq v1.10.0 -> v1.10.1 again ...
This commit is contained in:
6543
GitHub
parent
834fc74873
commit
792b4dba2c
558 changed files with 32080 additions and 24669 deletions
102
vendor/github.com/jessevdk/go-flags/parser.go
generated
vendored
102
vendor/github.com/jessevdk/go-flags/parser.go
generated
vendored
|
|
@ -9,6 +9,7 @@ import (
|
|||
"fmt"
|
||||
"os"
|
||||
"path"
|
||||
"reflect"
|
||||
"sort"
|
||||
"strings"
|
||||
"unicode/utf8"
|
||||
|
|
@ -29,6 +30,9 @@ type Parser struct {
|
|||
// NamespaceDelimiter separates group namespaces and option long names
|
||||
NamespaceDelimiter string
|
||||
|
||||
// EnvNamespaceDelimiter separates group env namespaces and env keys
|
||||
EnvNamespaceDelimiter string
|
||||
|
||||
// UnknownOptionsHandler is a function which gets called when the parser
|
||||
// encounters an unknown option. The function receives the unknown option
|
||||
// name, a SplitArgument which specifies its value if set with an argument
|
||||
|
|
@ -170,9 +174,10 @@ func NewParser(data interface{}, options Options) *Parser {
|
|||
// be added to this parser by using AddGroup and AddCommand.
|
||||
func NewNamedParser(appname string, options Options) *Parser {
|
||||
p := &Parser{
|
||||
Command: newCommand(appname, "", "", nil),
|
||||
Options: options,
|
||||
NamespaceDelimiter: ".",
|
||||
Command: newCommand(appname, "", "", nil),
|
||||
Options: options,
|
||||
NamespaceDelimiter: ".",
|
||||
EnvNamespaceDelimiter: "_",
|
||||
}
|
||||
|
||||
p.Command.parent = p
|
||||
|
|
@ -203,8 +208,7 @@ func (p *Parser) ParseArgs(args []string) ([]string, error) {
|
|||
}
|
||||
|
||||
p.eachOption(func(c *Command, g *Group, option *Option) {
|
||||
option.isSet = false
|
||||
option.isSetDefault = false
|
||||
option.clearReferenceBeforeSet = true
|
||||
option.updateDefaultLiteral()
|
||||
})
|
||||
|
||||
|
|
@ -237,6 +241,7 @@ func (p *Parser) ParseArgs(args []string) ([]string, error) {
|
|||
p.fillParseState(s)
|
||||
|
||||
for !s.eof() {
|
||||
var err error
|
||||
arg := s.pop()
|
||||
|
||||
// When PassDoubleDash is set and we encounter a --, then
|
||||
|
|
@ -247,6 +252,20 @@ func (p *Parser) ParseArgs(args []string) ([]string, error) {
|
|||
}
|
||||
|
||||
if !argumentIsOption(arg) {
|
||||
if (p.Options&PassAfterNonOption) != None && s.lookup.commands[arg] == nil {
|
||||
// If PassAfterNonOption is set then all remaining arguments
|
||||
// are considered positional
|
||||
if err = s.addArgs(s.arg); err != nil {
|
||||
break
|
||||
}
|
||||
|
||||
if err = s.addArgs(s.args...); err != nil {
|
||||
break
|
||||
}
|
||||
|
||||
break
|
||||
}
|
||||
|
||||
// Note: this also sets s.err, so we can just check for
|
||||
// nil here and use s.err later
|
||||
if p.parseNonOption(s) != nil {
|
||||
|
|
@ -256,8 +275,6 @@ func (p *Parser) ParseArgs(args []string) ([]string, error) {
|
|||
continue
|
||||
}
|
||||
|
||||
var err error
|
||||
|
||||
prefix, optname, islong := stripOptionPrefix(arg)
|
||||
optname, _, argument := splitOption(prefix, optname, islong)
|
||||
|
||||
|
|
@ -293,11 +310,13 @@ func (p *Parser) ParseArgs(args []string) ([]string, error) {
|
|||
|
||||
if s.err == nil {
|
||||
p.eachOption(func(c *Command, g *Group, option *Option) {
|
||||
if option.preventDefault {
|
||||
return
|
||||
err := option.clearDefault()
|
||||
if err != nil {
|
||||
if _, ok := err.(*Error); !ok {
|
||||
err = p.marshalError(option, err)
|
||||
}
|
||||
s.err = err
|
||||
}
|
||||
|
||||
option.clearDefault()
|
||||
})
|
||||
|
||||
s.checkRequired(p)
|
||||
|
|
@ -515,8 +534,8 @@ func (p *Parser) parseOption(s *parseState, name string, option *Option, canarg
|
|||
} else {
|
||||
arg = s.pop()
|
||||
|
||||
if argumentIsOption(arg) && !(option.isSignedNumber() && len(arg) > 1 && arg[0] == '-' && arg[1] >= '0' && arg[1] <= '9') {
|
||||
return newErrorf(ErrExpectedArgument, "expected argument for flag `%s', but got option `%s'", option, arg)
|
||||
if validationErr := option.isValidValue(arg); validationErr != nil {
|
||||
return newErrorf(ErrExpectedArgument, validationErr.Error())
|
||||
} else if p.Options&PassDoubleDash != 0 && arg == "--" {
|
||||
return newErrorf(ErrExpectedArgument, "expected argument for flag `%s', but got double dash `--'", option)
|
||||
}
|
||||
|
|
@ -545,16 +564,37 @@ func (p *Parser) parseOption(s *parseState, name string, option *Option, canarg
|
|||
|
||||
if err != nil {
|
||||
if _, ok := err.(*Error); !ok {
|
||||
err = newErrorf(ErrMarshal, "invalid argument for flag `%s' (expected %s): %s",
|
||||
option,
|
||||
option.value.Type(),
|
||||
err.Error())
|
||||
err = p.marshalError(option, err)
|
||||
}
|
||||
}
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
func (p *Parser) marshalError(option *Option, err error) *Error {
|
||||
s := "invalid argument for flag `%s'"
|
||||
|
||||
expected := p.expectedType(option)
|
||||
|
||||
if expected != "" {
|
||||
s = s + " (expected " + expected + ")"
|
||||
}
|
||||
|
||||
return newErrorf(ErrMarshal, s+": %s",
|
||||
option,
|
||||
err.Error())
|
||||
}
|
||||
|
||||
func (p *Parser) expectedType(option *Option) string {
|
||||
valueType := option.value.Type()
|
||||
|
||||
if valueType.Kind() == reflect.Func {
|
||||
return ""
|
||||
}
|
||||
|
||||
return valueType.String()
|
||||
}
|
||||
|
||||
func (p *Parser) parseLong(s *parseState, name string, argument *string) error {
|
||||
if option := s.lookup.longNames[name]; option != nil {
|
||||
// Only long options that are required can consume an argument
|
||||
|
|
@ -649,23 +689,7 @@ func (p *Parser) parseNonOption(s *parseState) error {
|
|||
}
|
||||
}
|
||||
|
||||
if (p.Options & PassAfterNonOption) != None {
|
||||
// If PassAfterNonOption is set then all remaining arguments
|
||||
// are considered positional
|
||||
if err := s.addArgs(s.arg); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := s.addArgs(s.args...); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
s.args = []string{}
|
||||
} else {
|
||||
return s.addArgs(s.arg)
|
||||
}
|
||||
|
||||
return nil
|
||||
return s.addArgs(s.arg)
|
||||
}
|
||||
|
||||
func (p *Parser) showBuiltinHelp() error {
|
||||
|
|
@ -688,13 +712,3 @@ func (p *Parser) printError(err error) error {
|
|||
|
||||
return err
|
||||
}
|
||||
|
||||
func (p *Parser) clearIsSet() {
|
||||
p.eachCommand(func(c *Command) {
|
||||
c.eachGroup(func(g *Group) {
|
||||
for _, option := range g.options {
|
||||
option.isSet = false
|
||||
}
|
||||
})
|
||||
}, true)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue