From 002aac351945aad74c9b767d2ffb9dfe2d0ddb03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohni=C4=87?= Date: Wed, 27 Nov 2019 17:05:49 +0100 Subject: [PATCH 1/3] Remove global `-B, --current-branch` flag Now `pr list --base` has shorthand `-B` --- command/pr.go | 2 +- command/root.go | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/command/pr.go b/command/pr.go index 5b3a4a16a..cabd27949 100644 --- a/command/pr.go +++ b/command/pr.go @@ -22,7 +22,7 @@ func init() { prListCmd.Flags().IntP("limit", "L", 30, "maximum number of items to fetch") prListCmd.Flags().StringP("state", "s", "open", "filter by state") - prListCmd.Flags().StringP("base", "b", "", "filter by base branch") + prListCmd.Flags().StringP("base", "B", "", "filter by base branch") prListCmd.Flags().StringArrayP("label", "l", nil, "filter by label") } diff --git a/command/root.go b/command/root.go index 489cd7f30..96feb1605 100644 --- a/command/root.go +++ b/command/root.go @@ -19,7 +19,6 @@ var BuildDate = "YYYY-MM-DD" func init() { RootCmd.Version = fmt.Sprintf("%s (%s)", Version, BuildDate) RootCmd.PersistentFlags().StringP("repo", "R", "", "current GitHub repository") - RootCmd.PersistentFlags().StringP("current-branch", "B", "", "current git branch") // TODO: // RootCmd.PersistentFlags().BoolP("verbose", "V", false, "enable verbose output") @@ -55,9 +54,7 @@ func contextForCommand(cmd *cobra.Command) context.Context { ctx := initContext() if repo, err := cmd.Flags().GetString("repo"); err == nil && repo != "" { ctx.SetBaseRepo(repo) - } - if branch, err := cmd.Flags().GetString("current-branch"); err == nil && branch != "" { - ctx.SetBranch(branch) + ctx.SetBranch("master") } return ctx } From b8a0754a0329767491df9710314af0fb938dbd87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohni=C4=87?= Date: Wed, 27 Nov 2019 17:08:28 +0100 Subject: [PATCH 2/3] :nail_care: Sentence case for CLI flags --- command/issue.go | 10 +++++----- command/pr.go | 8 ++++---- command/root.go | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/command/issue.go b/command/issue.go index 0c022939f..f8fa7f059 100644 --- a/command/issue.go +++ b/command/issue.go @@ -32,17 +32,17 @@ func init() { "Supply a title. Will prompt for one otherwise.") issueCreateCmd.Flags().StringP("body", "b", "", "Supply a body. Will prompt for one otherwise.") - issueCreateCmd.Flags().BoolP("web", "w", false, "open the web browser to create an issue") + issueCreateCmd.Flags().BoolP("web", "w", false, "Open the web browser to create an issue") issueListCmd := &cobra.Command{ Use: "list", Short: "List and filter issues in this repository", RunE: issueList, } - issueListCmd.Flags().StringP("assignee", "a", "", "filter by assignee") - issueListCmd.Flags().StringSliceP("label", "l", nil, "filter by label") - issueListCmd.Flags().StringP("state", "s", "", "filter by state (open|closed|all)") - issueListCmd.Flags().IntP("limit", "L", 30, "maximum number of issues to fetch") + issueListCmd.Flags().StringP("assignee", "a", "", "Filter by assignee") + issueListCmd.Flags().StringSliceP("label", "l", nil, "Filter by label") + issueListCmd.Flags().StringP("state", "s", "", "Filter by state (open|closed|all)") + issueListCmd.Flags().IntP("limit", "L", 30, "Maximum number of issues to fetch") issueCmd.AddCommand((issueListCmd)) } diff --git a/command/pr.go b/command/pr.go index cabd27949..5d45de54b 100644 --- a/command/pr.go +++ b/command/pr.go @@ -20,10 +20,10 @@ func init() { prCmd.AddCommand(prStatusCmd) prCmd.AddCommand(prViewCmd) - prListCmd.Flags().IntP("limit", "L", 30, "maximum number of items to fetch") - prListCmd.Flags().StringP("state", "s", "open", "filter by state") - prListCmd.Flags().StringP("base", "B", "", "filter by base branch") - prListCmd.Flags().StringArrayP("label", "l", nil, "filter by label") + prListCmd.Flags().IntP("limit", "L", 30, "Maximum number of items to fetch") + prListCmd.Flags().StringP("state", "s", "open", "Filter by state") + prListCmd.Flags().StringP("base", "B", "", "Filter by base branch") + prListCmd.Flags().StringArrayP("label", "l", nil, "Filter by label") } var prCmd = &cobra.Command{ diff --git a/command/root.go b/command/root.go index 96feb1605..5ae77fe1d 100644 --- a/command/root.go +++ b/command/root.go @@ -18,7 +18,7 @@ var BuildDate = "YYYY-MM-DD" func init() { RootCmd.Version = fmt.Sprintf("%s (%s)", Version, BuildDate) - RootCmd.PersistentFlags().StringP("repo", "R", "", "current GitHub repository") + RootCmd.PersistentFlags().StringP("repo", "R", "", "Current GitHub repository") // TODO: // RootCmd.PersistentFlags().BoolP("verbose", "V", false, "enable verbose output") From 854a4b3fdffddad53cfe9d129cae41a5560b39b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohni=C4=87?= Date: Wed, 27 Nov 2019 17:26:27 +0100 Subject: [PATCH 3/3] :nail_care: Sentence-case for `--help` and `--version` flags --- command/root.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/command/root.go b/command/root.go index 5ae77fe1d..0e24de8b5 100644 --- a/command/root.go +++ b/command/root.go @@ -19,6 +19,8 @@ var BuildDate = "YYYY-MM-DD" func init() { RootCmd.Version = fmt.Sprintf("%s (%s)", Version, BuildDate) RootCmd.PersistentFlags().StringP("repo", "R", "", "Current GitHub repository") + RootCmd.PersistentFlags().Bool("help", false, "Show help for command") + RootCmd.Flags().Bool("version", false, "Print gh version") // TODO: // RootCmd.PersistentFlags().BoolP("verbose", "V", false, "enable verbose output")