mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
ed75c7727b
Use a tagged release of Cobra. All relevant PR's were merged, so the fork is no longer needed. Relevant changes: - spf13/cobra#552 Add a field to disable [flags] in UseLine() - spf13/cobra#567 Add `CalledAs` method to cobra.Command - spf13/cobra#580 Update error message for missing required flags - spf13/cobra#584 Add support for --version flag - spf13/cobra#614 If user has a project in symlink, just use its destination folder and work there - spf13/cobra#649 terminates the flags when -- is found in commandline - spf13/cobra#662 Add support for ignoring parse errors - spf13/cobra#686 doc: hide hidden parent flags Also various improvements were added for generating Bash completion scripts (currently not used by us) Fixes usage output for dockerd; Before this update: dockerd --help Usage: dockerd COMMAND A self-sufficient runtime for containers. After this update: dockerd --help Usage: dockerd [OPTIONS] [flags] A self-sufficient runtime for containers. Bump spf13/pflag to v1.0.1 Relevant changes: - spf13/pflag#106 allow lookup by shorthand - spf13/pflag#113 Add SortFlags option - spf13/pflag#138 Generate flag error output for errors returned from the parseFunc - spf13/pflag#141 Fixing Count flag usage string - spf13/pflag#143 add int16 flag - spf13/pflag#122 DurationSlice: implementation and tests - spf13/pflag#115 Implement BytesHex type of argument - spf13/pflag#150 Add uintSlice and boolSlice to name prettifier - spf13/pflag#155 Add multiline wrapping support - spf13/pflag#158 doc: clarify difference between string slice vs. array - spf13/pflag#160 add ability to ignore unknown flags - spf13/pflag#163 Allow Users To Show Deprecated Flags Hide [flags] in usage output Hides the [flags] in the usage output of commands (present in newer versions of Cobra), using the `.DisableFlagsInUseLine` option. Before this change: dockerd --help Usage: dockerd [OPTIONS] [flags] A self-sufficient runtime for containers. After this change: dockerd --help Usage: dockerd [OPTIONS] A self-sufficient runtime for containers. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Â# modified: vendor/github.com/spf13/pflag/string_array.go § Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
96 lines
2.9 KiB
Go
96 lines
2.9 KiB
Go
package pflag
|
|
|
|
import "strconv"
|
|
|
|
// -- count Value
|
|
type countValue int
|
|
|
|
func newCountValue(val int, p *int) *countValue {
|
|
*p = val
|
|
return (*countValue)(p)
|
|
}
|
|
|
|
func (i *countValue) Set(s string) error {
|
|
// "+1" means that no specific value was passed, so increment
|
|
if s == "+1" {
|
|
*i = countValue(*i + 1)
|
|
return nil
|
|
}
|
|
v, err := strconv.ParseInt(s, 0, 0)
|
|
*i = countValue(v)
|
|
return err
|
|
}
|
|
|
|
func (i *countValue) Type() string {
|
|
return "count"
|
|
}
|
|
|
|
func (i *countValue) String() string { return strconv.Itoa(int(*i)) }
|
|
|
|
func countConv(sval string) (interface{}, error) {
|
|
i, err := strconv.Atoi(sval)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return i, nil
|
|
}
|
|
|
|
// GetCount return the int value of a flag with the given name
|
|
func (f *FlagSet) GetCount(name string) (int, error) {
|
|
val, err := f.getFlagType(name, "count", countConv)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
return val.(int), nil
|
|
}
|
|
|
|
// CountVar defines a count flag with specified name, default value, and usage string.
|
|
// The argument p points to an int variable in which to store the value of the flag.
|
|
// A count flag will add 1 to its value evey time it is found on the command line
|
|
func (f *FlagSet) CountVar(p *int, name string, usage string) {
|
|
f.CountVarP(p, name, "", usage)
|
|
}
|
|
|
|
// CountVarP is like CountVar only take a shorthand for the flag name.
|
|
func (f *FlagSet) CountVarP(p *int, name, shorthand string, usage string) {
|
|
flag := f.VarPF(newCountValue(0, p), name, shorthand, usage)
|
|
flag.NoOptDefVal = "+1"
|
|
}
|
|
|
|
// CountVar like CountVar only the flag is placed on the CommandLine instead of a given flag set
|
|
func CountVar(p *int, name string, usage string) {
|
|
CommandLine.CountVar(p, name, usage)
|
|
}
|
|
|
|
// CountVarP is like CountVar only take a shorthand for the flag name.
|
|
func CountVarP(p *int, name, shorthand string, usage string) {
|
|
CommandLine.CountVarP(p, name, shorthand, usage)
|
|
}
|
|
|
|
// Count defines a count flag with specified name, default value, and usage string.
|
|
// The return value is the address of an int variable that stores the value of the flag.
|
|
// A count flag will add 1 to its value evey time it is found on the command line
|
|
func (f *FlagSet) Count(name string, usage string) *int {
|
|
p := new(int)
|
|
f.CountVarP(p, name, "", usage)
|
|
return p
|
|
}
|
|
|
|
// CountP is like Count only takes a shorthand for the flag name.
|
|
func (f *FlagSet) CountP(name, shorthand string, usage string) *int {
|
|
p := new(int)
|
|
f.CountVarP(p, name, shorthand, usage)
|
|
return p
|
|
}
|
|
|
|
// Count defines a count flag with specified name, default value, and usage string.
|
|
// The return value is the address of an int variable that stores the value of the flag.
|
|
// A count flag will add 1 to its value evey time it is found on the command line
|
|
func Count(name string, usage string) *int {
|
|
return CommandLine.CountP(name, "", usage)
|
|
}
|
|
|
|
// CountP is like Count only takes a shorthand for the flag name.
|
|
func CountP(name, shorthand string, usage string) *int {
|
|
return CommandLine.CountP(name, shorthand, usage)
|
|
}
|