mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-30 19:09:34 -06:00
Code Issues Packages Projects Releases 124 Wiki Activity

Rename ArgParser.TooManyArgsError to TooManyArgsErrorFunc

Browse Source
This commit is contained in:
Nick Tobey
2023-04-19 11:36:18 -07:00
parent 779de4804d
commit ebcaabc5b4
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go/cmd/dolt/cli/arg_parser_helpers.go
View File

@@ -157,7 +157,7 @@ func CreateConflictsResolveArgParser() *argparser.ArgParser {
func CreateMergeArgParser() *argparser.ArgParser {
ap := argparser.NewArgParserWithMaxArgs("merge", 1)
ap.TooManyArgsError = func(receivedArgs []string) error {
ap.TooManyArgsErrorFunc = func(receivedArgs []string) error {
return fmt.Errorf("Error: Dolt does not support merging from multiple commits. You probably meant to checkout one and then merge from the other.")
}
ap.SupportsFlag(NoFFParam, "", "Create a merge commit even when the merge resolves as a fast-forward.")
@@ -232,7 +232,7 @@ func CreateCheckoutArgParser() *argparser.ArgParser {
func CreateCherryPickArgParser() *argparser.ArgParser {
ap := argparser.NewArgParserWithMaxArgs("cherrypick", 1)
ap.TooManyArgsError = func(receivedArgs []string) error {
ap.TooManyArgsErrorFunc = func(receivedArgs []string) error {
return fmt.Errorf("cherry-picking multiple commits is not supported yet.")
}
return ap

2
go/cmd/dolt/commands/indexcmds/ls.go
View File

@@ -57,7 +57,7 @@ func (cmd LsCmd) ArgParser() *argparser.ArgParser {
func (cmd LsCmd) Exec(ctx context.Context, commandStr string, args []string, dEnv *env.DoltEnv) int {
ap := cmd.ArgParser()
ap.TooManyArgsError = func(receivedArgs []string) error {
ap.TooManyArgsErrorFunc = func(receivedArgs []string) error {
args := strings.Join(receivedArgs, ", ")
return fmt.Errorf("Only one table may be provided at a time. Received %d: %s", len(receivedArgs), args)
}

12
go/libraries/utils/argparser/parser.go
View File

@@ -49,12 +49,12 @@ func ValidatorFromStrList(paramName string, validStrList []string) ValidationFun
}
type ArgParser struct {
Name string
MaxArgs int
TooManyArgsError func(receivedArgs []string) error
Supported []*Option
nameOrAbbrevToOpt map[string]*Option
ArgListHelp [][2]string
Name string
MaxArgs int
TooManyArgsErrorFunc func(receivedArgs []string) error
Supported []*Option
nameOrAbbrevToOpt map[string]*Option
ArgListHelp [][2]string
}
func NewArgParserWithVariableArgs(name string) *ArgParser {