From 544b9cc0c4cc694cdb688b9cad8f9c8542d111fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Mur=C3=A9?= <batolettre@gmail.com>
Date: Tue, 18 Sep 2018 13:28:01 +0200
Subject: [PATCH] commands: convert compatible commands to the implicit select
 mechanism

---
 commands/comment.go            | 18 +++---------------
 commands/comment_add.go        | 18 +++---------------
 commands/label add.go          | 15 ++++-----------
 commands/label rm.go           | 15 ++++-----------
 commands/label.go              | 16 +++-------------
 commands/select.go             |  2 +-
 commands/show.go               | 15 +++------------
 commands/status.go             | 18 +++---------------
 commands/status_close.go       | 17 +++--------------
 commands/status_open.go        | 17 +++--------------
 commands/title.go              | 18 +++---------------
 commands/title_edit.go         | 18 +++---------------
 doc/man/git-bug-comment-add.1  |  2 +-
 doc/man/git-bug-comment.1      |  2 +-
 doc/man/git-bug-label-add.1    |  2 +-
 doc/man/git-bug-label-rm.1     |  2 +-
 doc/man/git-bug-label.1        |  2 +-
 doc/man/git-bug-select.1       |  2 +-
 doc/man/git-bug-show.1         |  2 +-
 doc/man/git-bug-status-close.1 |  2 +-
 doc/man/git-bug-status-open.1  |  2 +-
 doc/man/git-bug-status.1       |  2 +-
 doc/man/git-bug-title-edit.1   |  2 +-
 doc/man/git-bug-title.1        |  2 +-
 doc/md/git-bug_comment.md      |  2 +-
 doc/md/git-bug_comment_add.md  |  2 +-
 doc/md/git-bug_label.md        |  2 +-
 doc/md/git-bug_label_add.md    |  2 +-
 doc/md/git-bug_label_rm.md     |  2 +-
 doc/md/git-bug_select.md       |  2 +-
 doc/md/git-bug_show.md         |  2 +-
 doc/md/git-bug_status.md       |  2 +-
 doc/md/git-bug_status_close.md |  2 +-
 doc/md/git-bug_status_open.md  |  2 +-
 doc/md/git-bug_title.md        |  2 +-
 doc/md/git-bug_title_edit.md   |  2 +-
 36 files changed, 60 insertions(+), 175 deletions(-)

diff --git a/commands/comment.go b/commands/comment.go
index 4626797938c836987d993c63718fff204c902c27..9169d7d759765ce12b4ffa9fafc3a8f10de214ba 100644
--- a/commands/comment.go
+++ b/commands/comment.go
@@ -1,36 +1,24 @@
 package commands
 
 import (
-	"errors"
 	"fmt"
 
 	"github.com/MichaelMure/git-bug/bug"
 	"github.com/MichaelMure/git-bug/cache"
+	"github.com/MichaelMure/git-bug/commands/select"
 	"github.com/MichaelMure/git-bug/util/colors"
 	"github.com/MichaelMure/git-bug/util/text"
 	"github.com/spf13/cobra"
 )
 
 func runComment(cmd *cobra.Command, args []string) error {
-	var err error
-
-	if len(args) > 1 {
-		return errors.New("Only one bug id is supported")
-	}
-
-	if len(args) == 0 {
-		return errors.New("You must provide a bug id")
-	}
-
 	backend, err := cache.NewRepoCache(repo)
 	if err != nil {
 		return err
 	}
 	defer backend.Close()
 
-	prefix := args[0]
-
-	b, err := backend.ResolveBugPrefix(prefix)
+	b, args, err := _select.ResolveBug(backend, args)
 	if err != nil {
 		return err
 	}
@@ -55,7 +43,7 @@ func commentsTextOutput(comments []bug.Comment) {
 }
 
 var commentCmd = &cobra.Command{
-	Use:   "comment <id>",
+	Use:   "comment [<id>]",
 	Short: "Show a bug's comments",
 	RunE:  runComment,
 }
diff --git a/commands/comment_add.go b/commands/comment_add.go
index 46d0c8b83a2f160f23e8bd418b20cb1982353e94..c80e9ec5d42c24702844a8bd70a797dc27452045 100644
--- a/commands/comment_add.go
+++ b/commands/comment_add.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/MichaelMure/git-bug/cache"
+	"github.com/MichaelMure/git-bug/commands/select"
 	"github.com/MichaelMure/git-bug/input"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -15,24 +15,12 @@ var (
 )
 
 func runCommentAdd(cmd *cobra.Command, args []string) error {
-	var err error
-
-	if len(args) > 1 {
-		return errors.New("Only one bug id is supported")
-	}
-
-	if len(args) == 0 {
-		return errors.New("You must provide a bug id")
-	}
-
 	backend, err := cache.NewRepoCache(repo)
 	if err != nil {
 		return err
 	}
 	defer backend.Close()
 
-	prefix := args[0]
-
 	if commentAddMessageFile != "" && commentAddMessage == "" {
 		commentAddMessage, err = input.FromFile(commentAddMessageFile)
 		if err != nil {
@@ -51,7 +39,7 @@ func runCommentAdd(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	b, err := backend.ResolveBugPrefix(prefix)
+	b, args, err := _select.ResolveBug(backend, args)
 	if err != nil {
 		return err
 	}
@@ -65,7 +53,7 @@ func runCommentAdd(cmd *cobra.Command, args []string) error {
 }
 
 var commentAddCmd = &cobra.Command{
-	Use:   "add <id>",
+	Use:   "add [<id>]",
 	Short: "Add a new comment to a bug",
 	RunE:  runCommentAdd,
 }
diff --git a/commands/label add.go b/commands/label add.go
index fccbfaa3726ec3a53e3c2499ff89ba421d44c637..68811deca2f03af372f80a6d5e8ddc61e77a453c 100644
--- a/commands/label add.go	
+++ b/commands/label add.go	
@@ -1,33 +1,26 @@
 package commands
 
 import (
-	"errors"
 	"fmt"
 
 	"github.com/MichaelMure/git-bug/cache"
+	"github.com/MichaelMure/git-bug/commands/select"
 	"github.com/spf13/cobra"
 )
 
 func runLabelAdd(cmd *cobra.Command, args []string) error {
-	if len(args) == 0 {
-		return errors.New("You must provide a bug id")
-	}
-
 	backend, err := cache.NewRepoCache(repo)
 	if err != nil {
 		return err
 	}
 	defer backend.Close()
 
-	prefix := args[0]
-	add := args[1:]
-
-	b, err := backend.ResolveBugPrefix(prefix)
+	b, args, err := _select.ResolveBug(backend, args)
 	if err != nil {
 		return err
 	}
 
-	changes, err := b.ChangeLabels(add, nil)
+	changes, err := b.ChangeLabels(args, nil)
 
 	for _, change := range changes {
 		fmt.Println(change)
@@ -41,7 +34,7 @@ func runLabelAdd(cmd *cobra.Command, args []string) error {
 }
 
 var labelAddCmd = &cobra.Command{
-	Use:   "add <id> [<label>...]",
+	Use:   "add [<id>] <label>[...]",
 	Short: "Add a label to a bug",
 	RunE:  runLabelAdd,
 }
diff --git a/commands/label rm.go b/commands/label rm.go
index 9908094c2b6467cb72bac119c6ff051ed8242ea3..8ad89593120f9b7d120af5185e3b25a5b04f7a80 100644
--- a/commands/label rm.go	
+++ b/commands/label rm.go	
@@ -1,33 +1,26 @@
 package commands
 
 import (
-	"errors"
 	"fmt"
 
 	"github.com/MichaelMure/git-bug/cache"
+	"github.com/MichaelMure/git-bug/commands/select"
 	"github.com/spf13/cobra"
 )
 
 func runLabelRm(cmd *cobra.Command, args []string) error {
-	if len(args) == 0 {
-		return errors.New("You must provide a bug id")
-	}
-
 	backend, err := cache.NewRepoCache(repo)
 	if err != nil {
 		return err
 	}
 	defer backend.Close()
 
-	prefix := args[0]
-	remove := args[1:]
-
-	b, err := backend.ResolveBugPrefix(prefix)
+	b, args, err := _select.ResolveBug(backend, args)
 	if err != nil {
 		return err
 	}
 
-	changes, err := b.ChangeLabels(nil, remove)
+	changes, err := b.ChangeLabels(nil, args)
 
 	for _, change := range changes {
 		fmt.Println(change)
@@ -41,7 +34,7 @@ func runLabelRm(cmd *cobra.Command, args []string) error {
 }
 
 var labelRmCmd = &cobra.Command{
-	Use:   "rm <id> [<label>...]",
+	Use:   "rm [<id>] <label>[...]",
 	Short: "Remove a label from a bug",
 	RunE:  runLabelRm,
 }
diff --git a/commands/label.go b/commands/label.go
index c693f82c846d4d575a3269a449577ab602033f54..d41b6dfb3aa8c02ced0070f75a25e7af4f44c55d 100644
--- a/commands/label.go
+++ b/commands/label.go
@@ -1,31 +1,21 @@
 package commands
 
 import (
-	"errors"
 	"fmt"
 
 	"github.com/MichaelMure/git-bug/cache"
+	"github.com/MichaelMure/git-bug/commands/select"
 	"github.com/spf13/cobra"
 )
 
 func runLabel(cmd *cobra.Command, args []string) error {
-	if len(args) > 1 {
-		return errors.New("Only one bug id is supported")
-	}
-
-	if len(args) == 0 {
-		return errors.New("You must provide a bug id")
-	}
-
 	backend, err := cache.NewRepoCache(repo)
 	if err != nil {
 		return err
 	}
 	defer backend.Close()
 
-	prefix := args[0]
-
-	b, err := backend.ResolveBugPrefix(prefix)
+	b, args, err := _select.ResolveBug(backend, args)
 	if err != nil {
 		return err
 	}
@@ -40,7 +30,7 @@ func runLabel(cmd *cobra.Command, args []string) error {
 }
 
 var labelCmd = &cobra.Command{
-	Use:   "label <id>",
+	Use:   "label [<id>]",
 	Short: "Display a bug labels",
 	RunE:  runLabel,
 }
diff --git a/commands/select.go b/commands/select.go
index c810b85abb4c4ce4a4c4288c2db9f111dd65b976..2cbb0b2ec03fe76dcf99e17cfc98650671ce9a72 100644
--- a/commands/select.go
+++ b/commands/select.go
@@ -35,7 +35,7 @@ func runSelect(cmd *cobra.Command, args []string) error {
 }
 
 var selectCmd = &cobra.Command{
-	Use:   "select [<id>]",
+	Use:   "select <id>",
 	Short: "Select a bug for implicit use in future commands",
 	Example: `git bug select 2f15
 git bug comment
diff --git a/commands/show.go b/commands/show.go
index d4d1bb54efa883a705940627856d4815579b9009..b1b7b432c31e03b87b3ced0335ffd9f1157597b7 100644
--- a/commands/show.go
+++ b/commands/show.go
@@ -6,28 +6,19 @@ import (
 	"strings"
 
 	"github.com/MichaelMure/git-bug/cache"
+	"github.com/MichaelMure/git-bug/commands/select"
 	"github.com/MichaelMure/git-bug/util/colors"
 	"github.com/spf13/cobra"
 )
 
 func runShowBug(cmd *cobra.Command, args []string) error {
-	if len(args) > 1 {
-		return errors.New("Only showing one bug at a time is supported")
-	}
-
-	if len(args) == 0 {
-		return errors.New("You must provide a bug id")
-	}
-
 	backend, err := cache.NewRepoCache(repo)
 	if err != nil {
 		return err
 	}
 	defer backend.Close()
 
-	prefix := args[0]
-
-	b, err := backend.ResolveBugPrefix(prefix)
+	b, args, err := _select.ResolveBug(backend, args)
 	if err != nil {
 		return err
 	}
@@ -82,7 +73,7 @@ func runShowBug(cmd *cobra.Command, args []string) error {
 }
 
 var showCmd = &cobra.Command{
-	Use:   "show <id>",
+	Use:   "show [<id>]",
 	Short: "Display the details of a bug",
 	RunE:  runShowBug,
 }
diff --git a/commands/status.go b/commands/status.go
index 29646b6e1dbc77efefdc58bb71031b742bdd5b7b..02ddc481d697437f8d2108eea54a938106015899 100644
--- a/commands/status.go
+++ b/commands/status.go
@@ -4,30 +4,18 @@ import (
 	"fmt"
 
 	"github.com/MichaelMure/git-bug/cache"
-	"github.com/pkg/errors"
+	"github.com/MichaelMure/git-bug/commands/select"
 	"github.com/spf13/cobra"
 )
 
 func runStatus(cmd *cobra.Command, args []string) error {
-	var err error
-
-	if len(args) > 1 {
-		return errors.New("Only one bug id is supported")
-	}
-
-	if len(args) == 0 {
-		return errors.New("You must provide a bug id")
-	}
-
 	backend, err := cache.NewRepoCache(repo)
 	if err != nil {
 		return err
 	}
 	defer backend.Close()
 
-	prefix := args[0]
-
-	b, err := backend.ResolveBugPrefix(prefix)
+	b, args, err := _select.ResolveBug(backend, args)
 	if err != nil {
 		return err
 	}
@@ -40,7 +28,7 @@ func runStatus(cmd *cobra.Command, args []string) error {
 }
 
 var statusCmd = &cobra.Command{
-	Use:   "status <id>",
+	Use:   "status [<id>]",
 	Short: "Show the bug status",
 	RunE:  runStatus,
 }
diff --git a/commands/status_close.go b/commands/status_close.go
index 55e47c22d4f7602292c137ab55556d654955975a..de8b990c6d8d0cf5f2926ce1365be9b8f122c83e 100644
--- a/commands/status_close.go
+++ b/commands/status_close.go
@@ -1,30 +1,19 @@
 package commands
 
 import (
-	"errors"
-
 	"github.com/MichaelMure/git-bug/cache"
+	"github.com/MichaelMure/git-bug/commands/select"
 	"github.com/spf13/cobra"
 )
 
 func runStatusClose(cmd *cobra.Command, args []string) error {
-	if len(args) > 1 {
-		return errors.New("Only closing one bug at a time is supported")
-	}
-
-	if len(args) == 0 {
-		return errors.New("You must provide a bug id")
-	}
-
 	backend, err := cache.NewRepoCache(repo)
 	if err != nil {
 		return err
 	}
 	defer backend.Close()
 
-	prefix := args[0]
-
-	b, err := backend.ResolveBugPrefix(prefix)
+	b, args, err := _select.ResolveBug(backend, args)
 	if err != nil {
 		return err
 	}
@@ -38,7 +27,7 @@ func runStatusClose(cmd *cobra.Command, args []string) error {
 }
 
 var closeCmd = &cobra.Command{
-	Use:   "close <id>",
+	Use:   "close [<id>]",
 	Short: "Mark the bug as closed",
 	RunE:  runStatusClose,
 }
diff --git a/commands/status_open.go b/commands/status_open.go
index 15108ddfbd0a80d095315c6ae9cf30e0885c0c67..6b94b9cbb1fb77959a3561665a7b8cd29dd2b6cd 100644
--- a/commands/status_open.go
+++ b/commands/status_open.go
@@ -1,30 +1,19 @@
 package commands
 
 import (
-	"errors"
-
 	"github.com/MichaelMure/git-bug/cache"
+	"github.com/MichaelMure/git-bug/commands/select"
 	"github.com/spf13/cobra"
 )
 
 func runStatusOpen(cmd *cobra.Command, args []string) error {
-	if len(args) > 1 {
-		return errors.New("Only opening one bug at a time is supported")
-	}
-
-	if len(args) == 0 {
-		return errors.New("You must provide a bug id")
-	}
-
 	backend, err := cache.NewRepoCache(repo)
 	if err != nil {
 		return err
 	}
 	defer backend.Close()
 
-	prefix := args[0]
-
-	b, err := backend.ResolveBugPrefix(prefix)
+	b, args, err := _select.ResolveBug(backend, args)
 	if err != nil {
 		return err
 	}
@@ -38,7 +27,7 @@ func runStatusOpen(cmd *cobra.Command, args []string) error {
 }
 
 var openCmd = &cobra.Command{
-	Use:   "open <id>",
+	Use:   "open [<id>]",
 	Short: "Mark the bug as open",
 	RunE:  runStatusOpen,
 }
diff --git a/commands/title.go b/commands/title.go
index 16cfc3424bde9806750426f3bd1c115cc05bf19c..dd5fbfb157a1af207637a134bd9b66a2b2836119 100644
--- a/commands/title.go
+++ b/commands/title.go
@@ -4,30 +4,18 @@ import (
 	"fmt"
 
 	"github.com/MichaelMure/git-bug/cache"
-	"github.com/pkg/errors"
+	"github.com/MichaelMure/git-bug/commands/select"
 	"github.com/spf13/cobra"
 )
 
 func runTitle(cmd *cobra.Command, args []string) error {
-	var err error
-
-	if len(args) > 1 {
-		return errors.New("Only one bug id is supported")
-	}
-
-	if len(args) == 0 {
-		return errors.New("You must provide a bug id")
-	}
-
 	backend, err := cache.NewRepoCache(repo)
 	if err != nil {
 		return err
 	}
 	defer backend.Close()
 
-	prefix := args[0]
-
-	b, err := backend.ResolveBugPrefix(prefix)
+	b, args, err := _select.ResolveBug(backend, args)
 	if err != nil {
 		return err
 	}
@@ -40,7 +28,7 @@ func runTitle(cmd *cobra.Command, args []string) error {
 }
 
 var titleCmd = &cobra.Command{
-	Use:   "title <id>",
+	Use:   "title [<id>]",
 	Short: "Display a bug's title",
 	RunE:  runTitle,
 }
diff --git a/commands/title_edit.go b/commands/title_edit.go
index 111c6325fcbc90380dcdc0b6e2698b75486c5d5f..a62daf6c27d3648e1d92e1a70ec09554a3a69b04 100644
--- a/commands/title_edit.go
+++ b/commands/title_edit.go
@@ -1,10 +1,10 @@
 package commands
 
 import (
-	"errors"
 	"fmt"
 
 	"github.com/MichaelMure/git-bug/cache"
+	"github.com/MichaelMure/git-bug/commands/select"
 	"github.com/MichaelMure/git-bug/input"
 	"github.com/spf13/cobra"
 )
@@ -14,25 +14,13 @@ var (
 )
 
 func runTitleEdit(cmd *cobra.Command, args []string) error {
-	var err error
-
-	if len(args) > 1 {
-		return errors.New("Only one bug id is supported")
-	}
-
-	if len(args) == 0 {
-		return errors.New("You must provide a bug id")
-	}
-
 	backend, err := cache.NewRepoCache(repo)
 	if err != nil {
 		return err
 	}
 	defer backend.Close()
 
-	prefix := args[0]
-
-	b, err := backend.ResolveBugPrefix(prefix)
+	b, args, err := _select.ResolveBug(backend, args)
 	if err != nil {
 		return err
 	}
@@ -59,7 +47,7 @@ func runTitleEdit(cmd *cobra.Command, args []string) error {
 }
 
 var titleEditCmd = &cobra.Command{
-	Use:   "edit <id>",
+	Use:   "edit [<id>]",
 	Short: "Edit a bug title",
 	RunE:  runTitleEdit,
 }
diff --git a/doc/man/git-bug-comment-add.1 b/doc/man/git-bug-comment-add.1
index 1a2fc2dc5bc4055c28e340fcb55254a0fd398a9f..304109cf7ab806f6bf4861ef4d3a039e8cc44129 100644
--- a/doc/man/git-bug-comment-add.1
+++ b/doc/man/git-bug-comment-add.1
@@ -10,7 +10,7 @@ git\-bug\-comment\-add \- Add a new comment to a bug
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug comment add <id> [flags]\fP
+\fBgit\-bug comment add [<id>] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-comment.1 b/doc/man/git-bug-comment.1
index 8ad43e5cb8b4b12a71b9a14b8c1425e511c06272..bbac0f33a0a7aad73bdc4669a1033ae8a28e5b36 100644
--- a/doc/man/git-bug-comment.1
+++ b/doc/man/git-bug-comment.1
@@ -10,7 +10,7 @@ git\-bug\-comment \- Show a bug's comments
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug comment <id> [flags]\fP
+\fBgit\-bug comment [<id>] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-label-add.1 b/doc/man/git-bug-label-add.1
index c3413126da4b3e0d51decff9505aaf502c9a150a..f34a694309472451532050986717d273964ec891 100644
--- a/doc/man/git-bug-label-add.1
+++ b/doc/man/git-bug-label-add.1
@@ -10,7 +10,7 @@ git\-bug\-label\-add \- Add a label to a bug
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug label add <id> [<label>\&...] [flags]\fP
+\fBgit\-bug label add [<id>] <label>[...] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-label-rm.1 b/doc/man/git-bug-label-rm.1
index c7f308edd562d505250d0d7cc5ff287211caf2ae..72578bf8dedb4df9f36f978675e78d2d2791ee7b 100644
--- a/doc/man/git-bug-label-rm.1
+++ b/doc/man/git-bug-label-rm.1
@@ -10,7 +10,7 @@ git\-bug\-label\-rm \- Remove a label from a bug
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug label rm <id> [<label>\&...] [flags]\fP
+\fBgit\-bug label rm [<id>] <label>[...] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-label.1 b/doc/man/git-bug-label.1
index 6621b7a7ff9ce2b7f5414bfe2a4ad607a162da1d..eecdc43b527402478191f36d59183f9bacf86713 100644
--- a/doc/man/git-bug-label.1
+++ b/doc/man/git-bug-label.1
@@ -10,7 +10,7 @@ git\-bug\-label \- Display a bug labels
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug label <id> [flags]\fP
+\fBgit\-bug label [<id>] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-select.1 b/doc/man/git-bug-select.1
index f73582fae2577846f719d405467503b5d4d8f036..520970509ab0c206c7687fb50556aadfdce78ec6 100644
--- a/doc/man/git-bug-select.1
+++ b/doc/man/git-bug-select.1
@@ -10,7 +10,7 @@ git\-bug\-select \- Select a bug for implicit use in future commands
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug select [<id>] [flags]\fP
+\fBgit\-bug select <id> [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-show.1 b/doc/man/git-bug-show.1
index ebeee5a31eb9792e3f407abe507aa204db50e2dc..a20266d46499260d01c70b565d58ee7e2ba76db5 100644
--- a/doc/man/git-bug-show.1
+++ b/doc/man/git-bug-show.1
@@ -10,7 +10,7 @@ git\-bug\-show \- Display the details of a bug
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug show <id> [flags]\fP
+\fBgit\-bug show [<id>] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-status-close.1 b/doc/man/git-bug-status-close.1
index 0d45d1123df018e394897c87e87e2ab8db8d42c3..27ab644280ca67803e651f4b99a931bb2cc8d5cb 100644
--- a/doc/man/git-bug-status-close.1
+++ b/doc/man/git-bug-status-close.1
@@ -10,7 +10,7 @@ git\-bug\-status\-close \- Mark the bug as closed
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug status close <id> [flags]\fP
+\fBgit\-bug status close [<id>] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-status-open.1 b/doc/man/git-bug-status-open.1
index 70a2343760d5e3c1568941b4ba95ec0486313cf8..d2f4a5cbaf40cb2905f112fac487c66762e587cc 100644
--- a/doc/man/git-bug-status-open.1
+++ b/doc/man/git-bug-status-open.1
@@ -10,7 +10,7 @@ git\-bug\-status\-open \- Mark the bug as open
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug status open <id> [flags]\fP
+\fBgit\-bug status open [<id>] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-status.1 b/doc/man/git-bug-status.1
index 69628f26f8bbad2647fcfd365a09bbb8ecd941b7..7571e77b4211c0b81067e4bb3c5e45571c04c4c3 100644
--- a/doc/man/git-bug-status.1
+++ b/doc/man/git-bug-status.1
@@ -10,7 +10,7 @@ git\-bug\-status \- Show the bug status
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug status <id> [flags]\fP
+\fBgit\-bug status [<id>] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-title-edit.1 b/doc/man/git-bug-title-edit.1
index 62895f7e4cb0386952f786a3652dd90f0d7c6394..4deae19aaa4f4cf1c38376df496557d69bfbb6ac 100644
--- a/doc/man/git-bug-title-edit.1
+++ b/doc/man/git-bug-title-edit.1
@@ -10,7 +10,7 @@ git\-bug\-title\-edit \- Edit a bug title
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug title edit <id> [flags]\fP
+\fBgit\-bug title edit [<id>] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-title.1 b/doc/man/git-bug-title.1
index a44935712dabf75b3b97ab6ccabc9d7adc4c0de2..3574dfb86bd29783087255cad9952e07dde79827 100644
--- a/doc/man/git-bug-title.1
+++ b/doc/man/git-bug-title.1
@@ -10,7 +10,7 @@ git\-bug\-title \- Display a bug's title
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug title <id> [flags]\fP
+\fBgit\-bug title [<id>] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/md/git-bug_comment.md b/doc/md/git-bug_comment.md
index 9870e5feb3651de93f991a6b2817ca774e1c5f55..3e12fbfd40bfd02007599e39f8481bd7353ef6a4 100644
--- a/doc/md/git-bug_comment.md
+++ b/doc/md/git-bug_comment.md
@@ -7,7 +7,7 @@ Show a bug's comments
 Show a bug's comments
 
 ```
-git-bug comment <id> [flags]
+git-bug comment [<id>] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_comment_add.md b/doc/md/git-bug_comment_add.md
index 412e40d706ec20b5424578579829b15ee7b89b81..678f910e18aadc2f20cb847b6a6125c519522c3c 100644
--- a/doc/md/git-bug_comment_add.md
+++ b/doc/md/git-bug_comment_add.md
@@ -7,7 +7,7 @@ Add a new comment to a bug
 Add a new comment to a bug
 
 ```
-git-bug comment add <id> [flags]
+git-bug comment add [<id>] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_label.md b/doc/md/git-bug_label.md
index 75f4b8435419f5a5f2d09493118fc6b66eab04bd..3f68e067819339ab1e746b3b5ea7b7bffc181e34 100644
--- a/doc/md/git-bug_label.md
+++ b/doc/md/git-bug_label.md
@@ -7,7 +7,7 @@ Display a bug labels
 Display a bug labels
 
 ```
-git-bug label <id> [flags]
+git-bug label [<id>] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_label_add.md b/doc/md/git-bug_label_add.md
index a89a522c1c177e64fe7460202a0a211d792af5b0..afe3e803ea68dfbb0b23fd40f300a57de826d544 100644
--- a/doc/md/git-bug_label_add.md
+++ b/doc/md/git-bug_label_add.md
@@ -7,7 +7,7 @@ Add a label to a bug
 Add a label to a bug
 
 ```
-git-bug label add <id> [<label>...] [flags]
+git-bug label add [<id>] <label>[...] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_label_rm.md b/doc/md/git-bug_label_rm.md
index 3c740a9f47aca2ab82bf97a877ce60e16ecd2023..7721a2ba8f5f852b7db2e5314107f8b3a01587c0 100644
--- a/doc/md/git-bug_label_rm.md
+++ b/doc/md/git-bug_label_rm.md
@@ -7,7 +7,7 @@ Remove a label from a bug
 Remove a label from a bug
 
 ```
-git-bug label rm <id> [<label>...] [flags]
+git-bug label rm [<id>] <label>[...] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_select.md b/doc/md/git-bug_select.md
index 014ba512fd1671f9ce2d2fc546f6ab499e9b675e..963cfb24c49d683c78a75e4b40038674f048ac65 100644
--- a/doc/md/git-bug_select.md
+++ b/doc/md/git-bug_select.md
@@ -7,7 +7,7 @@ Select a bug for implicit use in future commands
 Select a bug for implicit use in future commands
 
 ```
-git-bug select [<id>] [flags]
+git-bug select <id> [flags]
 ```
 
 ### Examples
diff --git a/doc/md/git-bug_show.md b/doc/md/git-bug_show.md
index 6edde61a061b11a23dba46c4168bec160cedb0e4..4ff7c83328e26282ad6e5cbd8c043a297b12b367 100644
--- a/doc/md/git-bug_show.md
+++ b/doc/md/git-bug_show.md
@@ -7,7 +7,7 @@ Display the details of a bug
 Display the details of a bug
 
 ```
-git-bug show <id> [flags]
+git-bug show [<id>] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_status.md b/doc/md/git-bug_status.md
index 3814cc850e57a1711ac8dfefe46d7b9958050d4c..284c925713d29d584f37d27a37f382138a26b289 100644
--- a/doc/md/git-bug_status.md
+++ b/doc/md/git-bug_status.md
@@ -7,7 +7,7 @@ Show the bug status
 Show the bug status
 
 ```
-git-bug status <id> [flags]
+git-bug status [<id>] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_status_close.md b/doc/md/git-bug_status_close.md
index 4660972a2432fa8aab93eb34f20dfde801bd9e05..a8e0f47b7007c41ffc4774d84e48dd15defb3395 100644
--- a/doc/md/git-bug_status_close.md
+++ b/doc/md/git-bug_status_close.md
@@ -7,7 +7,7 @@ Mark the bug as closed
 Mark the bug as closed
 
 ```
-git-bug status close <id> [flags]
+git-bug status close [<id>] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_status_open.md b/doc/md/git-bug_status_open.md
index 920bf66d92f0ebca085163a809e8a317b07f1b16..ac44e2930e216e950569c397c3005288be7009d6 100644
--- a/doc/md/git-bug_status_open.md
+++ b/doc/md/git-bug_status_open.md
@@ -7,7 +7,7 @@ Mark the bug as open
 Mark the bug as open
 
 ```
-git-bug status open <id> [flags]
+git-bug status open [<id>] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_title.md b/doc/md/git-bug_title.md
index 22b40d65922cd94cec2ea50a6c545dafd09affa5..62419866f32f5025b9d7062efc4671e963a45978 100644
--- a/doc/md/git-bug_title.md
+++ b/doc/md/git-bug_title.md
@@ -7,7 +7,7 @@ Display a bug's title
 Display a bug's title
 
 ```
-git-bug title <id> [flags]
+git-bug title [<id>] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_title_edit.md b/doc/md/git-bug_title_edit.md
index ee7fda024fcfdca64e3b9a753619ee207dd7d03e..781b0b9b52f563e69dc066224b4be6e1859f0d59 100644
--- a/doc/md/git-bug_title_edit.md
+++ b/doc/md/git-bug_title_edit.md
@@ -7,7 +7,7 @@ Edit a bug title
 Edit a bug title
 
 ```
-git-bug title edit <id> [flags]
+git-bug title edit [<id>] [flags]
 ```
 
 ### Options