Add git stashed segment

defaults.go

@@ -14,6 +14,7 @@ var symbolTemplates = map[string]Symbols{
 		RepoNotStaged:  "\u270E",
 		RepoUntracked:  "+",
 		RepoConflicted: "\u273C",
+		RepoStashed:    "\u2691",
 	},
 	"patched": {
 		Lock:          "\uE0A2",
@@ -28,6 +29,7 @@ var symbolTemplates = map[string]Symbols{
 		RepoNotStaged:  "\u270E",
 		RepoUntracked:  "+",
 		RepoConflicted: "\u273C",
+		RepoStashed:    "\u2691",
 	},
 	"flat": {
 		RepoDetached:   "\u2693",
@@ -37,6 +39,7 @@ var symbolTemplates = map[string]Symbols{
 		RepoNotStaged:  "\u270E",
 		RepoUntracked:  "+",
 		RepoConflicted: "\u273C",
+		RepoStashed:    "\u2691",
 	},
 }
 
@@ -131,6 +134,8 @@ var themes = map[string]Theme{
 		GitUntrackedBg:  52,
 		GitConflictedFg: 15,
 		GitConflictedBg: 9,
+		GitStashedFg:    15,
+		GitStashedBg:    20,
 
 		VirtualEnvFg: 00,
 		VirtualEnvBg: 35, // a mid-tone green
@@ -463,6 +468,8 @@ var themes = map[string]Theme{
 		GitUntrackedBg:  15,
 		GitConflictedFg: 9,
 		GitConflictedBg: 15,
+		GitStashedFg:    15,
+		GitStashedBg:    20,
 
 		VirtualEnvFg: 35, // a mid-tone green
 		VirtualEnvBg: 254,

generatePreview.sh

@@ -16,6 +16,8 @@ git init;
 touch file1;
 git add .;
 git commit -m "commit";
+echo "test">file1;
+git stash;
 
 export HOME=/tmp/home/
 

segment-git.go

@@ -16,6 +16,7 @@ type repoStats struct {
 	notStaged  int
 	staged     int
 	conflicted int
+	stashed    int
 }
 
 func (r repoStats) dirty() bool {
@@ -39,6 +40,7 @@ func (r repoStats) addToPowerline(p *powerline) {
 	addRepoStatsSegment(p, r.notStaged, p.symbolTemplates.RepoNotStaged, p.theme.GitNotStagedFg, p.theme.GitNotStagedBg)
 	addRepoStatsSegment(p, r.untracked, p.symbolTemplates.RepoUntracked, p.theme.GitUntrackedFg, p.theme.GitUntrackedBg)
 	addRepoStatsSegment(p, r.conflicted, p.symbolTemplates.RepoConflicted, p.theme.GitConflictedFg, p.theme.GitConflictedBg)
+	addRepoStatsSegment(p, r.stashed, p.symbolTemplates.RepoStashed, p.theme.GitStashedFg, p.theme.GitStashedBg)
 }
 
 var branchRegex = regexp.MustCompile(`^## (?P<local>\S+?)(\.{3}(?P<remote>\S+?)( \[(ahead (?P<ahead>\d+)(, )?)?(behind (?P<behind>\d+))?])?)?$`)
@@ -166,6 +168,14 @@ func segmentGit(p *powerline) {
 		background = p.theme.RepoCleanBg
 	}
 
+	out, err = runGitCommand("git", "stash", "list")
+	if err != nil {
+		return
+	}
+	if len(out) > 0 {
+		stats.stashed = len(strings.Split(out, "\n")) - 1
+	}
+
 	p.appendSegment("git-branch", segment{
 		content:    branch,
 		foreground: foreground,

themes.go

@@ -13,6 +13,7 @@ type Symbols struct {
 	RepoNotStaged  string
 	RepoUntracked  string
 	RepoConflicted string
+	RepoStashed    string
 }
 
 type Theme struct {
@@ -84,6 +85,8 @@ type Theme struct {
 	GitUntrackedBg  uint8
 	GitConflictedFg uint8
 	GitConflictedBg uint8
+	GitStashedFg    uint8
+	GitStashedBg    uint8
 
 	VirtualEnvFg uint8
 	VirtualEnvBg uint8

themes/default.json

@@ -44,6 +44,8 @@
   "GitUntrackedBg": 52,
   "GitConflictedFg": 15,
   "GitConflictedBg": 9,
+  "GitStashedFg": 15,
+  "GitStashedBg": 20,
   "VirtualEnvFg": 0,
   "VirtualEnvBg": 35,
   "PerlbrewFg": 0,