aboutsummaryrefslogtreecommitdiffstats
path: root/commands/input/input.go
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2018-07-31 15:18:09 +0200
committerMichael Muré <batolettre@gmail.com>2018-07-31 16:44:23 +0200
commiteb39c5c29bc0e9b5e15a940a1b71bdac688b6535 (patch)
tree5ef9b827f4a3097e4eb1367097d0059f895befbe /commands/input/input.go
parent8a4e373e7b1c093abeb967d9a6a43c5ed533edb8 (diff)
downloadgit-bug-eb39c5c29bc0e9b5e15a940a1b71bdac688b6535.tar.gz
cli: rework new and comment command to better use the editor
a nice templace is now provided with explanations new: title and message can now be provided from the editor. Title will be the first non-empty line
Diffstat (limited to 'commands/input/input.go')
-rw-r--r--commands/input/input.go104
1 files changed, 0 insertions, 104 deletions
diff --git a/commands/input/input.go b/commands/input/input.go
deleted file mode 100644
index 531a4386..00000000
--- a/commands/input/input.go
+++ /dev/null
@@ -1,104 +0,0 @@
-// Taken from the git-appraise project
-
-package input
-
-import (
- "bufio"
- "bytes"
- "fmt"
- "github.com/MichaelMure/git-bug/repository"
- "io/ioutil"
- "os"
- "os/exec"
-)
-
-// LaunchEditor launches the default editor configured for the given repo. This
-// method blocks until the editor command has returned.
-//
-// The specified filename should be a temporary file and provided as a relative path
-// from the repo (e.g. "FILENAME" will be converted to ".git/FILENAME"). This file
-// will be deleted after the editor is closed and its contents have been read.
-//
-// This method returns the text that was read from the temporary file, or
-// an error if any step in the process failed.
-func LaunchEditor(repo repository.Repo, fileName string) (string, error) {
- editor, err := repo.GetCoreEditor()
- if err != nil {
- return "", fmt.Errorf("Unable to detect default git editor: %v\n", err)
- }
-
- path := fmt.Sprintf("%s/.git/%s", repo.GetPath(), fileName)
-
- cmd, err := startInlineCommand(editor, path)
- if err != nil {
- // Running the editor directly did not work. This might mean that
- // the editor string is not a path to an executable, but rather
- // a shell command (e.g. "emacsclient --tty"). As such, we'll try
- // to run the command through bash, and if that fails, try with sh
- args := []string{"-c", fmt.Sprintf("%s %q", editor, path)}
- cmd, err = startInlineCommand("bash", args...)
- if err != nil {
- cmd, err = startInlineCommand("sh", args...)
- }
- }
- if err != nil {
- return "", fmt.Errorf("Unable to start editor: %v\n", err)
- }
-
- if err := cmd.Wait(); err != nil {
- return "", fmt.Errorf("Editing finished with error: %v\n", err)
- }
-
- output, err := ioutil.ReadFile(path)
- if err != nil {
- os.Remove(path)
- return "", fmt.Errorf("Error reading edited file: %v\n", err)
- }
- os.Remove(path)
- return string(output), err
-}
-
-// FromFile loads and returns the contents of a given file. If - is passed
-// through, much like git, it will read from stdin. This can be piped data,
-// unless there is a tty in which case the user will be prompted to enter a
-// message.
-func FromFile(fileName string) (string, error) {
- if fileName == "-" {
- stat, err := os.Stdin.Stat()
- if err != nil {
- return "", fmt.Errorf("Error reading from stdin: %v\n", err)
- }
- if (stat.Mode() & os.ModeCharDevice) == 0 {
- // There is no tty. This will allow us to read piped data instead.
- output, err := ioutil.ReadAll(os.Stdin)
- if err != nil {
- return "", fmt.Errorf("Error reading from stdin: %v\n", err)
- }
- return string(output), err
- }
-
- fmt.Printf("(reading comment from standard input)\n")
- var output bytes.Buffer
- s := bufio.NewScanner(os.Stdin)
- for s.Scan() {
- output.Write(s.Bytes())
- output.WriteRune('\n')
- }
- return output.String(), nil
- }
-
- output, err := ioutil.ReadFile(fileName)
- if err != nil {
- return "", fmt.Errorf("Error reading file: %v\n", err)
- }
- return string(output), err
-}
-
-func startInlineCommand(command string, args ...string) (*exec.Cmd, error) {
- cmd := exec.Command(command, args...)
- cmd.Stdin = os.Stdin
- cmd.Stdout = os.Stdout
- cmd.Stderr = os.Stderr
- err := cmd.Start()
- return cmd, err
-}