Merge pull request #26 from Arkweid/add-branch-files-shortcut

add branch files shortcut

Author: Abroskin Alexander

cmd/run.go

@@ -54,6 +54,7 @@ const (
 	subFiles             string      = "{files}"
 	subAllFiles          string      = "{all_files}"
 	subStagedFiles       string      = "{staged_files}"
+	pushFiles            string      = "{push_files}"
 	runnerWrapPattern    string      = "{cmd}"
 	tagsConfigKey        string      = "tags"
 	pipedConfigKey       string      = "piped"
@@ -168,19 +169,28 @@ func executeCommand(hooksGroup, commandName string, wg *sync.WaitGroup) {
 		return
 	}
 
-	files, _ := context.AllFiles()
+	files := []string{}
 	runner := getRunner(hooksGroup, commandsConfigKey, commandName)
 
 	if strings.Contains(runner, subStagedFiles) {
 		files, _ = context.StagedFiles()
 	} else if strings.Contains(runner, subFiles) || getCommandFiles(hooksGroup, commandName) != "" {
 		files, _ = context.ExecGitCommand(getCommandFiles(hooksGroup, commandName))
+	} else if strings.Contains(runner, pushFiles) {
+		files, _ = context.PushFiles()
+	} else {
+		files, _ = context.AllFiles()
 	}
 
+	VerbosePrint("\nFiles before filters: \n", files)
+
 	files = FilterGlob(files, getCommandGlobRegexp(hooksGroup, commandName))
 	files = FilterInclude(files, getCommandIncludeRegexp(hooksGroup, commandName)) // NOTE: confusing option, suppose delete it
 	files = FilterExclude(files, getCommandExcludeRegexp(hooksGroup, commandName))
 
+	VerbosePrint("Files after filters: \n", files)
+
+	runner = strings.Replace(runner, pushFiles, strings.Join(files, " "), -1)
 	runner = strings.Replace(runner, subStagedFiles, strings.Join(files, " "), -1)
 	runner = strings.Replace(runner, subAllFiles, strings.Join(files, " "), -1)
 	runner = strings.Replace(runner, subFiles, strings.Join(files, " "), -1)

cmd/run_windows.go

@@ -5,6 +5,7 @@ package cmd
 import (
 	"errors"
 	"fmt"
+
 	// "io" // win specific
 	"log"
 	"os"
@@ -20,6 +21,7 @@ import (
 
 	arrop "github.com/adam-hanna/arrayOperations"
 	"github.com/gobwas/glob"
+
 	// "github.com/kr/pty" //win specific
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
@@ -53,6 +55,7 @@ const (
 	subFiles             string      = "{files}"
 	subAllFiles          string      = "{all_files}"
 	subStagedFiles       string      = "{staged_files}"
+	pushFiles            string      = "{push_files}"
 	runnerWrapPattern    string      = "{cmd}"
 	tagsConfigKey        string      = "tags"
 	pipedConfigKey       string      = "piped"
@@ -162,19 +165,28 @@ func executeCommand(hooksGroup, commandName string, wg *sync.WaitGroup) {
 		return
 	}
 
-	files, _ := context.AllFiles()
+	files := []string{}
 	runner := getRunner(hooksGroup, commandsConfigKey, commandName)
 
 	if strings.Contains(runner, subStagedFiles) {
 		files, _ = context.StagedFiles()
 	} else if strings.Contains(runner, subFiles) || getCommandFiles(hooksGroup, commandName) != "" {
 		files, _ = context.ExecGitCommand(getCommandFiles(hooksGroup, commandName))
+	} else if strings.Contains(runner, pushFiles) {
+		files, _ = context.PushFiles()
+	} else {
+		files, _ = context.AllFiles()
 	}
 
+	VerbosePrint("Files before filters: \n", files)
+
 	files = FilterGlob(files, getCommandGlobRegexp(hooksGroup, commandName))
 	files = FilterInclude(files, getCommandIncludeRegexp(hooksGroup, commandName)) // NOTE: confusing option, suppose delete it
 	files = FilterExclude(files, getCommandExcludeRegexp(hooksGroup, commandName))
 
+	VerbosePrint("Files after filters: \n", files)
+
+	runner = strings.Replace(runner, pushFiles, strings.Join(files, " "), -1)
 	runner = strings.Replace(runner, subStagedFiles, strings.Join(files, " "), -1)
 	runner = strings.Replace(runner, subAllFiles, strings.Join(files, " "), -1)
 	runner = strings.Replace(runner, subFiles, strings.Join(files, " "), -1)

context/context.go

@@ -15,6 +15,10 @@ func AllFiles() ([]string, error) {
 	return ExecGitCommand("git ls-files --cached")
 }
 
+func PushFiles() ([]string, error) {
+	return ExecGitCommand("git diff-tree --no-commit-id --name-only -r HEAD --")
+}
+
 func ExecGitCommand(command string) ([]string, error) {
 	commandArg := strings.Split(command, " ")
 	cmd := exec.Command(commandArg[0], commandArg[1:]...)