Merge branch 'master' into useGitStatusCache

Conflicts: GitUtils.ps1
dahlbyk · Sep 6, 2015 · 002df86 · 002df86
2 parents caed8f3 + ec7ee5d
commit 002df86
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/GitPrompt.ps1 b/GitPrompt.ps1
@@ -63,6 +63,16 @@ $global:GitPromptSettings = New-Object PSObject -Property @{
     WorkingForegroundBrightColor                = [ConsoleColor]::Red
     WorkingBackgroundColor                      = $Host.UI.RawUI.BackgroundColor
 
+    EnableStashStatus         = $false
+    BeforeStashText           = ' ('
+    BeforeStashBackgroundColor = $Host.UI.RawUI.BackgroundColor
+    BeforeStashForegroundColor = [ConsoleColor]::Red
+    AfterStashText            = ')'
+    AfterStashBackgroundColor = $Host.UI.RawUI.BackgroundColor
+    AfterStashForegroundColor = [ConsoleColor]::Red
+    StashBackgroundColor      = $Host.UI.RawUI.BackgroundColor
+    StashForegroundColor      = [ConsoleColor]::Red
+
     ShowStatusWhenZero                          = $true
 
     AutoRefreshIndex                            = $true
@@ -211,6 +221,12 @@ function Write-GitStatus($status) {
             Write-Prompt (" {0}" -f $localStatusSymbol) -BackgroundColor $localStatusBackgroundColor -ForegroundColor $localStatusForegroundColor
         }
 
+        if ($s.EnableStashStatus -and ($status.StashCount -gt 0)) {
+             Write-Prompt $s.BeforeStashText -BackgroundColor $s.BeforeStashBackgroundColor -ForegroundColor $s.BeforeStashForegroundColor
+             Write-Prompt $status.StashCount -BackgroundColor $s.StashBackgroundColor -ForegroundColor $s.StashForegroundColor
+             Write-Prompt $s.AfterStashText -BackgroundColor $s.AfterStashBackgroundColor -ForegroundColor $s.AfterStashForegroundColor
+        }
+
         Write-Prompt $s.AfterText -BackgroundColor $s.AfterBackgroundColor -ForegroundColor $s.AfterForegroundColor
 
         if ($WindowTitleSupported -and $s.EnableWindowTitle) {

diff --git a/GitUtils.ps1 b/GitUtils.ps1
@@ -115,6 +115,7 @@ function Get-GitStatus($gitDir = (Get-GitDirectory)) {
         $filesModified = @()
         $filesDeleted = @()
         $filesUnmerged = @()
+        $stashCount = 0
 
         if($settings.EnableFileStatus -and !$(InDisabledRepository)) {
             if ($settings.EnableFileStatusFromCache -eq $null) {
@@ -147,6 +148,7 @@ function Get-GitStatus($gitDir = (Get-GitDirectory)) {
             } else {
                 dbg 'Getting status' $sw
                 $status = git -c color.status=false status --short --branch 2>$null
+                $stashCount = $null | git stash list 2>$null | measure-object | select -expand Count
 
                 dbg 'Parsing status' $sw
                 $status | foreach {
@@ -213,6 +215,7 @@ function Get-GitStatus($gitDir = (Get-GitDirectory)) {
             HasWorking      = [bool]$working
             Working         = $working
             HasUntracked    = [bool]$filesAdded
+            StashCount      = $stashCount
         }
 
         dbg 'Finished' $sw