Merge pull request #1 from yasukotelin/v1.1.0

V1.1.0

Author: yasukotelin

README.md

@@ -7,26 +7,33 @@ git-diffs is the git subcommand that is diff files selector.
 You can use the `git-diffs` as a git subcommand like `git diffs`.<br>
 This shows diff file names and show diff when you select one.
 
+<img src="images/git-diffs-demo.gif" alt="git-diffs demo">
+
 ## Install
 
+If you have go environment, you can use `go get` and install.
+
 ```
 go get -u github.com/yasukotelin/git-diffs
 ```
 
+Or you can download the binary from [release](https://github.com/yasukotelin/git-diffs/releases) page. (only windows)
+
+
 ## Usage
 
 ```
 $ git diffs
-[1] .gitignore                      
-[2] LICENSE                         
-[3] README.md                       
-[4] git.go                          
-[5] go.mod                          
-[6] go.sum                          
-[7] main.go                         
-[8] test/sample.txt                 
-                                    
-Select number (empty is cancel) => 5
+=== Staged files ===
+[1] D   git.go
+[2] M   main.go
+
+=== Unstaged files ===
+[3] M   README.md
+[4] M   git/diff.go
+[5] A   images/git-diffs-demo.gif
+
+Select number (empty is cancel) =>
 ```
 
 ## Licence

git.go

@@ -0,0 +1,59 @@
+package git
+
+import (
+	"os"
+	"os/exec"
+	"strings"
+)
+
+func Diff(path string, isStaged bool) error {
+	var cmd *exec.Cmd
+	if isStaged {
+		cmd = exec.Command("git", "diff", "--staged", path)
+	} else {
+		cmd = exec.Command("git", "diff", path)
+	}
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+
+	return cmd.Run()
+}
+
+type DiffFile struct {
+	Text     string
+	Status   string
+	Path     string
+	IsStaged bool
+}
+
+func DiffNameStatus(isStaged bool) ([]DiffFile, error) {
+	var cmd *exec.Cmd
+	if isStaged {
+		cmd = exec.Command("git", "diff", "--staged", "--name-status")
+	} else {
+		exec.Command("git", "add", "-A", "-N").Run()
+		cmd = exec.Command("git", "diff", "--name-status")
+	}
+	out, err := cmd.Output()
+	if err != nil {
+		return nil, err
+	}
+
+	rows := strings.Split(string(out), "\n")
+	// Remove the latest empty row.
+	rows = rows[0 : len(rows)-1]
+
+	// Divide the status(M, D etc) and file path
+	diffFile := make([]DiffFile, len(rows))
+	for i, row := range rows {
+		splited := strings.Fields(row)
+		diffFile[i] = DiffFile{
+			Text:     row,
+			Status:   splited[0],
+			Path:     splited[1],
+			IsStaged: isStaged,
+		}
+	}
+
+	return diffFile, nil
+}

git/diff.go

@@ -1,19 +1,20 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 	"log"
 	"os"
 	"strconv"
-	"errors"
 
 	"github.com/urfave/cli"
+	"github.com/yasukotelin/git-diffs/git"
 )
 
 func main() {
 	app := cli.NewApp()
 	app.Name = "git-diffs"
-	app.Version = "1.0.0"
+	app.Version = "1.1.0"
 	app.Description = "The git subcommand that is diff files selector."
 	app.Action = mainAction
 
@@ -24,14 +25,30 @@ func main() {
 }
 
 func mainAction(c *cli.Context) error {
-	files, err := execDiffNameOnly()
+	// get staged files.
+	stagedFiles, err := git.DiffNameStatus(true)
 	if err != nil {
 		return err
 	}
+	fmt.Println("=== Staged files ===")
+	stagedFilesLen := len(stagedFiles)
+	for i, file := range stagedFiles {
+		fmt.Printf("[%d] %v\n", i+1, file.Text)
+	}
 
-	for i, f := range files {
-		fmt.Printf("[%d] %s\n", i+1, f)
+	fmt.Println()
+
+	// get unstaged files.
+	unstagedFiles, err := git.DiffNameStatus(false)
+	if err != nil {
+		return err
 	}
+	fmt.Println("=== Unstaged files ===")
+	unstagedFilesLen := len(unstagedFiles)
+	for i, file := range unstagedFiles {
+		fmt.Printf("[%d] %v\n", i+1+stagedFilesLen, file.Text)
+	}
+
 	fmt.Println()
 	fmt.Print("Select number (empty is cancel) => ")
 
@@ -45,10 +62,20 @@ func mainAction(c *cli.Context) error {
 	if err != nil {
 		return errors.New("your input is not number.")
 	}
-	if selNum > len(files) || selNum < 1 {
+	if selNum > stagedFilesLen + unstagedFilesLen || selNum < 1 {
 		return errors.New("your input is out of range numbers")
 	}
-	execDiff(files[selNum-1])
+
+	if selNum <= stagedFilesLen {
+		// User selected staged file number
+		err = git.Diff(stagedFiles[selNum-1].Path, true)
+	} else {
+		// User selected unstaged file number
+		err = git.Diff(unstagedFiles[selNum-stagedFilesLen-1].Path, false)
+	}
+	if err != nil {
+		return err
+	}
 
 	return nil
 }