refactor: persist --repo flag across mr and issue subcommand

commands/issue.go

@@ -52,7 +52,7 @@ func displayIssue(hm *gitlab.Issue) {
 
 // mrCmd is merge request command
 var issueCmd = &cobra.Command{
-	Use:   "issue <command> [flags]",
+	Use:   "issue [command] [flags]",
 	Short: `Create, view and manage remote issues`,
 	Long:  ``,
 	Run: func(cmd *cobra.Command, args []string) {
@@ -64,5 +64,6 @@ var issueCmd = &cobra.Command{
 }
 
 func init() {
+	issueCmd.PersistentFlags().StringP("repo", "R","", "Select another repository using the OWNER/REPO format or the project ID. Supports group namespaces")
 	RootCmd.AddCommand(issueCmd)
 }

commands/issue_close.go

@@ -11,10 +11,11 @@ import (
 )
 
 var issueCloseCmd = &cobra.Command{
-	Use:     "close",
+	Use:     "close <id>",
 	Short:   `Close an issue`,
 	Long:    ``,
 	Aliases: []string{"unsub"},
+	Args:      cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) > 1 {
 			cmdErr(cmd, args)
@@ -23,6 +24,9 @@ var issueCloseCmd = &cobra.Command{
 		if len(args) > 0 {
 			issueID := strings.TrimSpace(args[0])
 			gitlabClient, repo := git.InitGitlabClient()
+			if r, _ := cmd.Flags().GetString("repo"); r != "" {
+				repo = r
+			}
 			l := &gitlab.UpdateIssueOptions{}
 			l.StateEvent = gitlab.String("close")
 			arrIds := strings.Split(strings.Trim(issueID, "[] "), ",")

commands/issue_create.go

@@ -15,6 +15,7 @@ var issueCreateCmd = &cobra.Command{
 	Short:   `Create an issue`,
 	Long:    ``,
 	Aliases: []string{"new"},
+	Args:    cobra.ExactArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) > 0 {
 			cmdErr(cmd, args)
@@ -69,6 +70,9 @@ var issueCreateCmd = &cobra.Command{
 			l.AssigneeIDs = t2
 		}
 		gitlabClient, repo := git.InitGitlabClient()
+		if r, _ := cmd.Flags().GetString("repo"); r != "" {
+			repo = r
+		}
 		issue, _, err := gitlabClient.Issues.CreateIssue(repo, l)
 		if err != nil {
 			log.Fatal(err)

commands/issue_delete.go

@@ -9,10 +9,11 @@ import (
 )
 
 var issueDeleteCmd = &cobra.Command{
-	Use:     "delete",
+	Use:     "delete <id>",
 	Short:   `Delete an issue`,
 	Long:    ``,
 	Aliases: []string{"del"},
+	Args:    cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) > 1 {
 			cmdErr(cmd, args)
@@ -21,7 +22,9 @@ var issueDeleteCmd = &cobra.Command{
 		if len(args) > 0 {
 			issueID := strings.TrimSpace(args[0])
 			gitlabClient, repo := git.InitGitlabClient()
-
+			if r, _ := cmd.Flags().GetString("repo"); r != "" {
+				repo = r
+			}
 			arrIds := strings.Split(strings.Trim(issueID, "[] "), ",")
 			for _, i2 := range arrIds {
 				fmt.Println("Deleting Issue #" + i2)

commands/issue_list.go

@@ -12,7 +12,7 @@ var issueListCmd = &cobra.Command{
 	Short:   `List project issues`,
 	Long:    ``,
 	Aliases: []string{"ls"},
-	Args:    cobra.MaximumNArgs(3),
+	Args:    cobra.ExactArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
 		var state string
 		if lb, _ := cmd.Flags().GetBool("all"); lb {
@@ -40,7 +40,9 @@ var issueListCmd = &cobra.Command{
 		}
 
 		gitlabClient, repo := git.InitGitlabClient()
-
+		if r, _ := cmd.Flags().GetString("repo"); r != "" {
+			repo = r
+		}
 		issues, _, err := gitlabClient.Issues.ListProjectIssues(repo, l)
 		if err != nil {
 			log.Fatal(err)

commands/issue_reopen.go

@@ -11,10 +11,11 @@ import (
 )
 
 var issueReopenCmd = &cobra.Command{
-	Use:     "reopen",
+	Use:     "reopen <id>",
 	Short:   `Reopen a closed issue`,
 	Long:    ``,
 	Aliases: []string{"open"},
+	Args:    cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) > 1 {
 			cmdErr(cmd, args)
@@ -23,6 +24,9 @@ var issueReopenCmd = &cobra.Command{
 		if len(args) > 0 {
 			issueID := strings.TrimSpace(args[0])
 			gitlabClient, repo := git.InitGitlabClient()
+			if r, _ := cmd.Flags().GetString("repo"); r != "" {
+				repo = r
+			}
 			l := &gitlab.UpdateIssueOptions{}
 			l.StateEvent = gitlab.String("reopen")
 			arrIds := strings.Split(strings.Trim(issueID, "[] "), ",")

commands/issue_subscribe.go

@@ -9,10 +9,11 @@ import (
 )
 
 var issueSubscribeCmd = &cobra.Command{
-	Use:     "subscribe",
+	Use:     "subscribe <id>",
 	Short:   `Subscribe to an issue`,
 	Long:    ``,
 	Aliases: []string{"sub"},
+	Args:    cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) > 1 {
 			cmdErr(cmd, args)
@@ -21,6 +22,9 @@ var issueSubscribeCmd = &cobra.Command{
 		if len(args) > 0 {
 			mergeID := strings.TrimSpace(args[0])
 			gitlabClient, repo := git.InitGitlabClient()
+			if r, _ := cmd.Flags().GetString("repo"); r != "" {
+				repo = r
+			}
 			arrIds := strings.Split(strings.Trim(mergeID, "[] "), ",")
 			for _, i2 := range arrIds {
 				fmt.Println("Subscribing to Issue #" + i2)

commands/issue_unsubscribe.go

@@ -9,10 +9,11 @@ import (
 )
 
 var issueUnsubscribeCmd = &cobra.Command{
-	Use:     "unsubscribe",
+	Use:     "unsubscribe <id>",
 	Short:   `Unsubscribe to an issue`,
 	Long:    ``,
 	Aliases: []string{"unsub"},
+	Args:    cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) > 1 {
 			cmdErr(cmd, args)
@@ -21,6 +22,9 @@ var issueUnsubscribeCmd = &cobra.Command{
 		if len(args) > 0 {
 			mergeID := strings.TrimSpace(args[0])
 			gitlabClient, repo := git.InitGitlabClient()
+			if r, _ := cmd.Flags().GetString("repo"); r != "" {
+				repo = r
+			}
 			arrIds := strings.Split(strings.Trim(mergeID, "[] "), ",")
 			for _, i2 := range arrIds {
 				fmt.Println("Unsubscribing to Issue #" + i2)

commands/issue_view.go

@@ -17,11 +17,11 @@ import (
 )
 
 var issueViewCmd = &cobra.Command{
-	Use:     "view <id> [flags]",
+	Use:     "view <id>",
 	Short:   `Display the title, body, and other information about an issue.`,
 	Long:    ``,
 	Aliases: []string{"show"},
-	Args:    cobra.MaximumNArgs(3),
+	Args:      cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) == 0 || len(args) >1 {
 			cmdErr(cmd, args)

commands/label.go

@@ -16,5 +16,6 @@ var labelCmd = &cobra.Command{
 }
 
 func init() {
+	labelCmd.PersistentFlags().StringP("repo", "R","", "Select another repository using the OWNER/REPO format. Supports group namespaces")
 	RootCmd.AddCommand(labelCmd)
 }

commands/label_create.go

@@ -8,17 +8,20 @@ import (
 )
 
 var labelCreateCmd = &cobra.Command{
-	Use:     "create <id> [flags]",
+	Use:     "create [flags]",
 	Short:   `Create labels for repository/project`,
 	Long:    ``,
 	Aliases: []string{"new"},
-	Args:    cobra.MaximumNArgs(1),
+	Args:    cobra.ExactArgs(0),
 	Run:     createLabel,
 }
 
 func createLabel(cmd *cobra.Command, args []string) {
 
 	gitlabClient, repo := git.InitGitlabClient()
+	if r, _ := cmd.Flags().GetString("repo"); r != "" {
+		repo = r
+	}
 	l := &gitlab.CreateLabelOptions{}
 
 	if s, _ := cmd.Flags().GetString("name"); s != "" {

commands/label_list.go

@@ -9,16 +9,19 @@ import (
 )
 
 var labelListCmd = &cobra.Command{
-	Use:     "list <id> [flags]",
+	Use:     "list [flags]",
 	Short:   `List labels in repository`,
 	Long:    ``,
 	Aliases: []string{"ls"},
-	Args:    cobra.MaximumNArgs(1),
+	Args:    cobra.ExactArgs(0),
 	Run:     listLabels,
 }
 
 func listLabels(cmd *cobra.Command, args []string) {
 	gitlabClient, repo := git.InitGitlabClient()
+	if r, _ := cmd.Flags().GetString("repo"); r != "" {
+		repo = r
+	}
 	// List all labels
 	labels, _, err := gitlabClient.Labels.ListLabels(repo, nil)
 	if err != nil {

commands/mr.go

@@ -55,5 +55,6 @@ var mrCmd = &cobra.Command{
 }
 
 func init() {
+	mrCmd.PersistentFlags().StringP("repo", "R","", "Select another repository using the OWNER/REPO format or the project ID. Supports group namespaces")
 	RootCmd.AddCommand(mrCmd)
 }

commands/mr_approve.go

@@ -16,7 +16,7 @@ var mrApproveCmd = &cobra.Command{
 	Short:   `Approve merge requests`,
 	Long:    ``,
 	Aliases: []string{"ls"},
-	Args:    cobra.MaximumNArgs(1),
+	Args:    cobra.ExactArgs(1),
 	Run:     approveMergeRequest,
 }
 
@@ -33,6 +33,9 @@ func approveMergeRequest(cmd *cobra.Command, args []string) {
 
 		fmt.Println(aurora.Yellow("Approving Merge Request #" + mergeID + "..."))
 		gitlabClient, repo := git.InitGitlabClient()
+		if r, _ := cmd.Flags().GetString("repo"); r != "" {
+			repo = r
+		}
 		_, resp, _ := gitlabClient.MergeRequestApprovals.ApproveMergeRequest(repo, manip.StringToInt(mergeID), l)
 		if resp != nil {
 			if resp.StatusCode == 201 {

commands/mr_close.go

@@ -14,15 +14,17 @@ var mrCloseCmd = &cobra.Command{
 	Use:     "close <id>",
 	Short:   `Close merge requests`,
 	Long:    ``,
-	Aliases: []string{"ls"},
-	Args:    cobra.MaximumNArgs(1),
+	Args:    cobra.ExactArgs(1),
 	Run:     closeMergeRequestState,
 }
 
 func closeMergeRequestState(cmd *cobra.Command, args []string) {
 	if len(args) > 0 {
 		mergeID := strings.Trim(args[0], " ")
 		gitlabClient, repo := git.InitGitlabClient()
+		if r, _ := cmd.Flags().GetString("repo"); r != "" {
+			repo = r
+		}
 		l := &gitlab.UpdateMergeRequestOptions{}
 		l.StateEvent = gitlab.String("close")
 		arrIds := strings.Split(strings.Trim(mergeID, "[] "), ",")

commands/mr_create.go

@@ -15,6 +15,7 @@ var mrCreateCmd = &cobra.Command{
 	Short:   `Create new merge request`,
 	Long:    ``,
 	Aliases: []string{"new"},
+	Args:    cobra.ExactArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) > 0 {
 			cmdErr(cmd, args)
@@ -84,6 +85,9 @@ var mrCreateCmd = &cobra.Command{
 		}
 
 		gitlabClient, repo := git.InitGitlabClient()
+		if r, _ := cmd.Flags().GetString("repo"); r != "" {
+			repo = r
+		}
 		if c, _ := cmd.Flags().GetBool("create-source-branch"); c {
 			lb := &gitlab.CreateBranchOptions{
 				Branch: gitlab.String(sourceBranch),

commands/mr_delete.go

@@ -15,7 +15,7 @@ var mrDeleteCmd = &cobra.Command{
 	Short:   `Delete merge requests`,
 	Long:    ``,
 	Aliases: []string{"del"},
-	Args:    cobra.MaximumNArgs(1),
+	Args:    cobra.ExactArgs(1),
 	Example: "$ glab delete 123",
 	RunE:    deleteMergeRequest,
 }
@@ -25,7 +25,9 @@ func deleteMergeRequest(cmd *cobra.Command, args []string) error {
 	if len(args) > 0 {
 		mergeID := strings.Trim(args[0], " ")
 		gitlabClient, repo := git.InitGitlabClient()
-
+		if r, _ := cmd.Flags().GetString("repo"); r != "" {
+			repo = r
+		}
 		arrIds := strings.Split(strings.Trim(mergeID, "[] "), ",")
 		for _, i2 := range arrIds {
 			fmt.Println("Deleting Merge Request #" + i2)

commands/mr_issues.go

@@ -14,7 +14,7 @@ var mrIssuesCmd = &cobra.Command{
 	Short:   `Get issues related to a particular merge request.`,
 	Long:    ``,
 	Aliases: []string{"issue"},
-	Args:    cobra.MaximumNArgs(1),
+	Args:    cobra.ExactArgs(1),
 	Example: "$ glab mr issues 46",
 	Run:     issuesRelatedMergeRequest,
 }
@@ -24,6 +24,9 @@ func issuesRelatedMergeRequest(cmd *cobra.Command, args []string) {
 		mergeID := strings.Trim(args[0], " ")
 		l := &gitlab.GetIssuesClosedOnMergeOptions{}
 		gitlabClient, repo := git.InitGitlabClient()
+		if r, _ := cmd.Flags().GetString("repo"); r != "" {
+			repo = r
+		}
 		mr, _, err := gitlabClient.MergeRequests.GetIssuesClosedOnMerge(repo, manip.StringToInt(mergeID), l)
 		if err != nil {
 			er(err)

commands/mr_list.go

@@ -11,7 +11,7 @@ var mrListCmd = &cobra.Command{
 	Short:   `List merge requests`,
 	Long:    ``,
 	Aliases: []string{"ls"},
-	Args:    cobra.MaximumNArgs(3),
+	Args:    cobra.ExactArgs(0),
 	RunE:    listMergeRequest,
 }
 
@@ -41,6 +41,9 @@ func listMergeRequest(cmd *cobra.Command, args []string) error {
 	}
 
 	gitlabClient, repo := git.InitGitlabClient()
+	if r, _ := cmd.Flags().GetString("repo"); r != "" {
+		repo = r
+	}
 	mergeRequests, _, err := gitlabClient.MergeRequests.ListProjectMergeRequests(repo, l)
 	if err != nil {
 		return err

commands/mr_merge.go

@@ -17,6 +17,7 @@ var mrMergeCmd = &cobra.Command{
 	Short:   `Merge/Accept merge requests`,
 	Long:    ``,
 	Aliases: []string{"accept"},
+	Args:    cobra.ExactArgs(1),
 	Run:     acceptMergeRequest,
 }
 
@@ -42,6 +43,9 @@ func acceptMergeRequest(cmd *cobra.Command, args []string) {
 		l.SHA = gitlab.String(m)
 	}
 	gitlabClient, repo := git.InitGitlabClient()
+	if r, _ := cmd.Flags().GetString("repo"); r != "" {
+		repo = r
+	}
 	mr, resp, _ := gitlabClient.MergeRequests.AcceptMergeRequest(repo, manip.StringToInt(mergeID), l)
 
 	fmt.Println(aurora.Yellow("Accepting Merge Request #" + mergeID + "..."))

commands/mr_reopen.go

@@ -15,14 +15,17 @@ var mrReopenCmd = &cobra.Command{
 	Short:   `Reopen merge requests`,
 	Long:    ``,
 	Aliases: []string{"open"},
-	Args:    cobra.MaximumNArgs(1),
+	Args:    cobra.ExactArgs(1),
 	Run:     reopenMergeRequestState,
 }
 
 func reopenMergeRequestState(cmd *cobra.Command, args []string) {
 	if len(args) > 0 {
 		mergeID := strings.Trim(args[0], " ")
 		gitlabClient, repo := git.InitGitlabClient()
+		if r, _ := cmd.Flags().GetString("repo"); r != "" {
+			repo = r
+		}
 		l := &gitlab.UpdateMergeRequestOptions{}
 		l.StateEvent = gitlab.String("reopen")
 		arrIds := strings.Split(strings.Trim(mergeID, "[] "), ",")