diff options
| author | Luke Adams <lukeclydeadams@gmail.com> | 2018-10-04 10:29:19 -0600 |
|---|---|---|
| committer | Luke Adams <lukeclydeadams@gmail.com> | 2018-10-04 10:29:19 -0600 |
| commit | bc8e6754a72157a944d304904a9a9dcf45e109ce (patch) | |
| tree | e67a0c1e889fd2d26b54b83e05a11a24f88b4429 | |
| parent | f464363213ce7315d1f3ea10138450a4ca7432d3 (diff) | |
| download | git-bug-bc8e6754a72157a944d304904a9a9dcf45e109ce.tar.gz | |
Make addCommentWithEditor accept a preMessage
| -rw-r--r-- | commands/comment_add.go | 2 | ||||
| -rw-r--r-- | input/input.go | 7 | ||||
| -rw-r--r-- | termui/termui.go | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/commands/comment_add.go b/commands/comment_add.go index 0a83eb65..8736f9c2 100644 --- a/commands/comment_add.go +++ b/commands/comment_add.go @@ -29,7 +29,7 @@ func runCommentAdd(cmd *cobra.Command, args []string) error { } if commentAddMessage == "" { - commentAddMessage, err = input.BugCommentEditorInput(backend) + commentAddMessage, err = input.BugCommentEditorInput(backend, "") if err == input.ErrEmptyMessage { fmt.Println("Empty message, aborting.") return nil diff --git a/input/input.go b/input/input.go index 6a7c8c7c..07148acc 100644 --- a/input/input.go +++ b/input/input.go @@ -78,7 +78,7 @@ func BugCreateEditorInput(repo repository.RepoCommon, preTitle string, preMessag return title, message, nil } -const bugCommentTemplate = ` +const bugCommentTemplate = `%s # Please enter the comment message. Lines starting with '#' will be ignored, # and an empty message aborts the operation. @@ -86,8 +86,9 @@ const bugCommentTemplate = ` // BugCommentEditorInput will open the default editor in the terminal with a // template for the user to fill. The file is then processed to extract a comment. -func BugCommentEditorInput(repo repository.RepoCommon) (string, error) { - raw, err := launchEditorWithTemplate(repo, messageFilename, bugCommentTemplate) +func BugCommentEditorInput(repo repository.RepoCommon, preMessage string) (string, error) { + template := fmt.Sprintf(bugCommentTemplate, preMessage) + raw, err := launchEditorWithTemplate(repo, messageFilename, template) if err != nil { return "", err diff --git a/termui/termui.go b/termui/termui.go index f2163d96..45952705 100644 --- a/termui/termui.go +++ b/termui/termui.go @@ -210,7 +210,7 @@ func addCommentWithEditor(bug *cache.BugCache) error { ui.g.Close() ui.g = nil - message, err := input.BugCommentEditorInput(ui.cache) + message, err := input.BugCommentEditorInput(ui.cache, "") if err != nil && err != input.ErrEmptyMessage { return err |