From ebcaabc5b4bcd0cbfaf923ac6cc7642e85356fb6 Mon Sep 17 00:00:00 2001 From: Nick Tobey Date: Wed, 19 Apr 2023 11:36:18 -0700 Subject: [PATCH] Rename ArgParser.TooManyArgsError to TooManyArgsErrorFunc --- go/cmd/dolt/cli/arg_parser_helpers.go | 4 ++-- go/cmd/dolt/commands/indexcmds/ls.go | 2 +- go/libraries/utils/argparser/parser.go | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go/cmd/dolt/cli/arg_parser_helpers.go b/go/cmd/dolt/cli/arg_parser_helpers.go index 252bd2febb..6559744969 100644 --- a/go/cmd/dolt/cli/arg_parser_helpers.go +++ b/go/cmd/dolt/cli/arg_parser_helpers.go @@ -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 diff --git a/go/cmd/dolt/commands/indexcmds/ls.go b/go/cmd/dolt/commands/indexcmds/ls.go index 69138dd418..1560e24d43 100644 --- a/go/cmd/dolt/commands/indexcmds/ls.go +++ b/go/cmd/dolt/commands/indexcmds/ls.go @@ -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) } diff --git a/go/libraries/utils/argparser/parser.go b/go/libraries/utils/argparser/parser.go index 2a1400de52..ce0203c568 100644 --- a/go/libraries/utils/argparser/parser.go +++ b/go/libraries/utils/argparser/parser.go @@ -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 {