diff options
Diffstat (limited to 'commands')
-rw-r--r-- | commands/bug/bug_comment.go | 2 | ||||
-rw-r--r-- | commands/bug/bug_comment_add.go | 2 | ||||
-rw-r--r-- | commands/bug/bug_comment_test.go | 1 | ||||
-rw-r--r-- | commands/bug/bug_label.go | 2 | ||||
-rw-r--r-- | commands/bug/bug_label_new.go | 4 | ||||
-rw-r--r-- | commands/bug/bug_label_rm.go | 4 | ||||
-rw-r--r-- | commands/bug/bug_select.go | 2 | ||||
-rw-r--r-- | commands/bug/bug_show.go | 4 | ||||
-rw-r--r-- | commands/bug/bug_status.go | 2 | ||||
-rw-r--r-- | commands/bug/bug_status_close.go | 2 | ||||
-rw-r--r-- | commands/bug/bug_status_open.go | 2 | ||||
-rw-r--r-- | commands/bug/bug_title.go | 2 | ||||
-rw-r--r-- | commands/bug/bug_title_edit.go | 2 | ||||
-rw-r--r-- | commands/bug/completion.go | 4 |
14 files changed, 17 insertions, 18 deletions
diff --git a/commands/bug/bug_comment.go b/commands/bug/bug_comment.go index 5cb8ff17..b037f688 100644 --- a/commands/bug/bug_comment.go +++ b/commands/bug/bug_comment.go @@ -26,7 +26,7 @@ func newBugCommentCommand(env *execenv.Env) *cobra.Command { } func runBugComment(env *execenv.Env, args []string) error { - b, args, err := ResolveSelected(env.Backend, args) + b, _, err := ResolveSelected(env.Backend, args) if err != nil { return err } diff --git a/commands/bug/bug_comment_add.go b/commands/bug/bug_comment_add.go index 152a1893..132de233 100644 --- a/commands/bug/bug_comment_add.go +++ b/commands/bug/bug_comment_add.go @@ -41,7 +41,7 @@ func newBugCommentNewCommand(env *execenv.Env) *cobra.Command { } func runBugCommentNew(env *execenv.Env, opts bugCommentNewOptions, args []string) error { - b, args, err := ResolveSelected(env.Backend, args) + b, _, err := ResolveSelected(env.Backend, args) if err != nil { return err } diff --git a/commands/bug/bug_comment_test.go b/commands/bug/bug_comment_test.go index ecc1c5f6..add48b21 100644 --- a/commands/bug/bug_comment_test.go +++ b/commands/bug/bug_comment_test.go @@ -140,7 +140,6 @@ func requireCommentsEqual(t *testing.T, golden string, env *execenv.Env) { comments = normalizeParsedComments(t, comments) if *cmdtest.Update { - t.Log("Got here") for i, comment := range comments { fileName := fmt.Sprintf(goldenFilePattern, golden, i) require.NoError(t, os.WriteFile(fileName, []byte(comment.message), 0644)) diff --git a/commands/bug/bug_label.go b/commands/bug/bug_label.go index 554496e3..ec076922 100644 --- a/commands/bug/bug_label.go +++ b/commands/bug/bug_label.go @@ -24,7 +24,7 @@ func newBugLabelCommand(env *execenv.Env) *cobra.Command { } func runBugLabel(env *execenv.Env, args []string) error { - b, args, err := ResolveSelected(env.Backend, args) + b, _, err := ResolveSelected(env.Backend, args) if err != nil { return err } diff --git a/commands/bug/bug_label_new.go b/commands/bug/bug_label_new.go index 1e1f2d4f..9fff851c 100644 --- a/commands/bug/bug_label_new.go +++ b/commands/bug/bug_label_new.go @@ -22,12 +22,12 @@ func newBugLabelNewCommand(env *execenv.Env) *cobra.Command { } func runBugLabelNew(env *execenv.Env, args []string) error { - b, args, err := ResolveSelected(env.Backend, args) + b, cleanArgs, err := ResolveSelected(env.Backend, args) if err != nil { return err } - added := args + added := cleanArgs changes, _, err := b.ChangeLabels(text.CleanupOneLineArray(added), nil) diff --git a/commands/bug/bug_label_rm.go b/commands/bug/bug_label_rm.go index 6dda007c..d389830f 100644 --- a/commands/bug/bug_label_rm.go +++ b/commands/bug/bug_label_rm.go @@ -22,12 +22,12 @@ func newBugLabelRmCommand(env *execenv.Env) *cobra.Command { } func runBugLabelRm(env *execenv.Env, args []string) error { - b, args, err := ResolveSelected(env.Backend, args) + b, cleanArgs, err := ResolveSelected(env.Backend, args) if err != nil { return err } - removed := args + removed := cleanArgs changes, _, err := b.ChangeLabels(nil, text.CleanupOneLineArray(removed)) diff --git a/commands/bug/bug_select.go b/commands/bug/bug_select.go index 652c61ea..c93cd7b1 100644 --- a/commands/bug/bug_select.go +++ b/commands/bug/bug_select.go @@ -44,7 +44,7 @@ The complementary command is "git bug deselect" performing the opposite operatio func runBugSelect(env *execenv.Env, args []string) error { if len(args) == 0 { - return errors.New("You must provide a bug id") + return errors.New("a bug id must be provided") } prefix := args[0] diff --git a/commands/bug/bug_show.go b/commands/bug/bug_show.go index 9a03c9a3..ef20df2a 100644 --- a/commands/bug/bug_show.go +++ b/commands/bug/bug_show.go @@ -47,7 +47,7 @@ func newBugShowCommand(env *execenv.Env) *cobra.Command { } func runBugShow(env *execenv.Env, opts bugShowOptions, args []string) error { - b, args, err := ResolveSelected(env.Backend, args) + b, _, err := ResolveSelected(env.Backend, args) if err != nil { return err } @@ -91,7 +91,7 @@ func runBugShow(env *execenv.Env, opts bugShowOptions, args []string) error { case "title": env.Out.Printf("%s\n", snap.Title) default: - return fmt.Errorf("\nUnsupported field: %s\n", opts.fields) + return fmt.Errorf("unsupported field: %s", opts.fields) } return nil diff --git a/commands/bug/bug_status.go b/commands/bug/bug_status.go index 59bef3fd..c8542240 100644 --- a/commands/bug/bug_status.go +++ b/commands/bug/bug_status.go @@ -24,7 +24,7 @@ func newBugStatusCommand(env *execenv.Env) *cobra.Command { } func runBugStatus(env *execenv.Env, args []string) error { - b, args, err := ResolveSelected(env.Backend, args) + b, _, err := ResolveSelected(env.Backend, args) if err != nil { return err } diff --git a/commands/bug/bug_status_close.go b/commands/bug/bug_status_close.go index 1d06007b..7a8ae4de 100644 --- a/commands/bug/bug_status_close.go +++ b/commands/bug/bug_status_close.go @@ -21,7 +21,7 @@ func newBugStatusCloseCommand(env *execenv.Env) *cobra.Command { } func runBugStatusClose(env *execenv.Env, args []string) error { - b, args, err := ResolveSelected(env.Backend, args) + b, _, err := ResolveSelected(env.Backend, args) if err != nil { return err } diff --git a/commands/bug/bug_status_open.go b/commands/bug/bug_status_open.go index e99d2db0..0c0c02f0 100644 --- a/commands/bug/bug_status_open.go +++ b/commands/bug/bug_status_open.go @@ -21,7 +21,7 @@ func newBugStatusOpenCommand(env *execenv.Env) *cobra.Command { } func runBugStatusOpen(env *execenv.Env, args []string) error { - b, args, err := ResolveSelected(env.Backend, args) + b, _, err := ResolveSelected(env.Backend, args) if err != nil { return err } diff --git a/commands/bug/bug_title.go b/commands/bug/bug_title.go index 47603410..af959fb7 100644 --- a/commands/bug/bug_title.go +++ b/commands/bug/bug_title.go @@ -23,7 +23,7 @@ func newBugTitleCommand(env *execenv.Env) *cobra.Command { } func runBugTitle(env *execenv.Env, args []string) error { - b, args, err := ResolveSelected(env.Backend, args) + b, _, err := ResolveSelected(env.Backend, args) if err != nil { return err } diff --git a/commands/bug/bug_title_edit.go b/commands/bug/bug_title_edit.go index fc60824f..2d6bafca 100644 --- a/commands/bug/bug_title_edit.go +++ b/commands/bug/bug_title_edit.go @@ -38,7 +38,7 @@ func newBugTitleEditCommand(env *execenv.Env) *cobra.Command { } func runBugTitleEdit(env *execenv.Env, opts bugTitleEditOptions, args []string) error { - b, args, err := ResolveSelected(env.Backend, args) + b, _, err := ResolveSelected(env.Backend, args) if err != nil { return err } diff --git a/commands/bug/completion.go b/commands/bug/completion.go index 4754f97d..62bf658a 100644 --- a/commands/bug/completion.go +++ b/commands/bug/completion.go @@ -50,7 +50,7 @@ func BugAndLabelsCompletion(env *execenv.Env, addOrRemove bool) completion.Valid _ = env.Backend.Close() }() - b, args, err := ResolveSelected(env.Backend, args) + b, cleanArgs, err := ResolveSelected(env.Backend, args) if _select.IsErrNoValidId(err) { // we need a bug first to complete labels return bugWithBackend(env.Backend, toComplete) @@ -62,7 +62,7 @@ func BugAndLabelsCompletion(env *execenv.Env, addOrRemove bool) completion.Valid snap := b.Snapshot() seenLabels := map[bug.Label]bool{} - for _, label := range args { + for _, label := range cleanArgs { seenLabels[bug.Label(label)] = addOrRemove } |