Merge pull request #298 from jacobo-diaz/gitcompact

Added a new "compact" Git mode, with less width than "fancy", and a bit more information than "simple"

README.md

@@ -227,10 +227,9 @@ Usage of powerline-go:
   -git-disable-stats string
          Comma-separated list to disable individual git statuses
          (valid choices: ahead, behind, staged, notStaged, untracked, conflicted, stashed)
-        
   -git-mode string
          How to display git status
-         (valid choices: fancy, simple)
+         (valid choices: fancy, compact, simple)
          (default "fancy")
   -hostname-only-if-ssh
          Show hostname only for SSH connections

args.go

@@ -103,7 +103,7 @@ var args = arguments{
 		"git-mode",
 		defaults.GitMode,
 		commentsWithDefaults("How to display git status",
-			"(valid choices: fancy, simple)")),
+			"(valid choices: fancy, compact, simple)")),
 	Mode: flag.String(
 		"mode",
 		defaults.Mode,

segment-git.go

@@ -53,22 +53,28 @@ func (r repoStats) GitSegments(p *powerline) (segments []pwl.Segment) {
 	return
 }
 
-func addRepoStatsSymbol(nChanges int, symbol string) string {
+func addRepoStatsSymbol(nChanges int, symbol string, GitMode string) string {
 	if nChanges > 0 {
-		return symbol
+		if GitMode == "simple" {
+			return symbol
+		} else if GitMode == "compact" {
+			return fmt.Sprintf(" %d%s", nChanges, symbol )
+		} else {
+			return symbol
+		}
 	}
 	return ""
 }
 
 func (r repoStats) GitSymbols(p *powerline) string {
 	var info string
-	info += addRepoStatsSymbol(r.ahead, p.symbols.RepoAhead)
-	info += addRepoStatsSymbol(r.behind, p.symbols.RepoBehind)
-	info += addRepoStatsSymbol(r.staged, p.symbols.RepoStaged)
-	info += addRepoStatsSymbol(r.notStaged, p.symbols.RepoNotStaged)
-	info += addRepoStatsSymbol(r.untracked, p.symbols.RepoUntracked)
-	info += addRepoStatsSymbol(r.conflicted, p.symbols.RepoConflicted)
-	info += addRepoStatsSymbol(r.stashed, p.symbols.RepoStashed)
+	info += addRepoStatsSymbol(r.ahead, p.symbols.RepoAhead, p.cfg.GitMode)
+	info += addRepoStatsSymbol(r.behind, p.symbols.RepoBehind, p.cfg.GitMode)
+	info += addRepoStatsSymbol(r.staged, p.symbols.RepoStaged, p.cfg.GitMode)
+	info += addRepoStatsSymbol(r.notStaged, p.symbols.RepoNotStaged, p.cfg.GitMode)
+	info += addRepoStatsSymbol(r.untracked, p.symbols.RepoUntracked, p.cfg.GitMode)
+	info += addRepoStatsSymbol(r.conflicted, p.symbols.RepoConflicted, p.cfg.GitMode)
+	info += addRepoStatsSymbol(r.stashed, p.symbols.RepoStashed, p.cfg.GitMode)
 	return info
 }
 
@@ -266,6 +272,10 @@ func segmentGit(p *powerline) []pwl.Segment {
 		if stats.any() {
 			segments[0].Content += " " + stats.GitSymbols(p)
 		}
+	} else if p.cfg.GitMode == "compact" {
+		if stats.any() {
+			segments[0].Content += stats.GitSymbols(p)
+		}
 	} else { // fancy
 		segments = append(segments, stats.GitSegments(p)...)
 	}