From d96284da646cc1d3e3d7d3b2f7a1ab0e8e7a4d88 Mon Sep 17 00:00:00 2001
From: vince <vincetiu8@gmail.com>
Date: Thu, 9 Jul 2020 14:59:47 +0800
Subject: Change the comment ID to use both bug and comment ID references. Add
 comment edit command This commit adds the comment edit command, which
 provides a CLI tool that allows a user to edit a comment.

---
 commands/comment_edit.go | 71 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 commands/comment_edit.go

(limited to 'commands/comment_edit.go')

diff --git a/commands/comment_edit.go b/commands/comment_edit.go
new file mode 100644
index 00000000..61132967
--- /dev/null
+++ b/commands/comment_edit.go
@@ -0,0 +1,71 @@
+package commands
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/MichaelMure/git-bug/input"
+)
+
+type commentEditOptions struct {
+	messageFile string
+	message     string
+}
+
+func newCommentEditCommand() *cobra.Command {
+	env := newEnv()
+	options := commentEditOptions{}
+
+	cmd := &cobra.Command{
+		Use:      "edit <commentid>",
+		Short:    "Edit an existing comment on a bug.",
+		Args:     cobra.ExactArgs(1),
+		PreRunE:  loadBackendEnsureUser(env),
+		PostRunE: closeBackend(env),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return runCommentEdit(env, options, args)
+		},
+	}
+
+	flags := cmd.Flags()
+	flags.SortFlags = false
+
+	flags.StringVarP(&options.messageFile, "file", "F", "",
+		"Take the message from the given file. Use - to read the message from the standard input")
+
+	flags.StringVarP(&options.message, "message", "m", "",
+		"Provide the new message from the command line")
+
+	return cmd
+}
+
+func runCommentEdit(env *Env, opts commentEditOptions, args []string) error {
+	b, commentId, err := env.backend.ResolveComment(args[0])
+	if err != nil {
+		return err
+	}
+
+	if opts.messageFile != "" && opts.message == "" {
+		opts.message, err = input.BugCommentFileInput(opts.messageFile)
+		if err != nil {
+			return err
+		}
+	}
+
+	if opts.messageFile == "" && opts.message == "" {
+		opts.message, err = input.BugCommentEditorInput(env.backend, "")
+		if err == input.ErrEmptyMessage {
+			env.err.Println("Empty message, aborting.")
+			return nil
+		}
+		if err != nil {
+			return err
+		}
+	}
+
+	_, err = b.EditComment(commentId, opts.message)
+	if err != nil {
+		return err
+	}
+
+	return b.Commit()
+}
-- 
cgit 


From bb8a214df37cab33032ce709a924e6282127d446 Mon Sep 17 00:00:00 2001
From: Michael Muré <batolettre@gmail.com>
Date: Thu, 10 Dec 2020 12:42:20 +0100
Subject: command: fix "comment edit" usage

---
 commands/comment_edit.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'commands/comment_edit.go')

diff --git a/commands/comment_edit.go b/commands/comment_edit.go
index 61132967..6a86f37e 100644
--- a/commands/comment_edit.go
+++ b/commands/comment_edit.go
@@ -16,7 +16,7 @@ func newCommentEditCommand() *cobra.Command {
 	options := commentEditOptions{}
 
 	cmd := &cobra.Command{
-		Use:      "edit <commentid>",
+		Use:      "edit [COMMENT_ID]",
 		Short:    "Edit an existing comment on a bug.",
 		Args:     cobra.ExactArgs(1),
 		PreRunE:  loadBackendEnsureUser(env),
-- 
cgit