Merge branch 'master' into release-v0.7.2

dahlbyk · Apr 20, 2018 · 162cba1 · 162cba1
2 parents bff1496 + db46cdb
commit 162cba1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/src/GitPrompt.ps1 b/src/GitPrompt.ps1
@@ -87,6 +87,9 @@ $global:GitPromptSettings = [pscustomobject]@{
 
     ShowStatusWhenZero                          = $true
 
+    # Valid values are "all", "no", and "normal"
+    UntrackedFilesMode                          = $null
+
     AutoRefreshIndex                            = $true
 
     # Valid values are "Full", "Compact", and "Minimal"
@@ -99,6 +102,7 @@ $global:GitPromptSettings = [pscustomobject]@{
     DescribeStyle                               = ''
 
     EnableWindowTitle                           = 'posh~git ~ '
+    AdminTitlePrefixText                        = 'Administrator: '
 
     DefaultPromptPrefix                         = ''
     DefaultPromptSuffix                         = '$(''>'' * ($nestedPromptLevel + 1)) '
@@ -116,8 +120,6 @@ $global:GitPromptSettings = [pscustomobject]@{
 
 $isAdminProcess = Test-Administrator
 
-$adminHeader = if ($isAdminProcess) { 'Administrator: ' } else { '' }
-
 $WindowTitleSupported = $true
 if (Get-Module NuGet) {
     $WindowTitleSupported = $false
@@ -294,7 +296,8 @@ function Write-GitStatus($status) {
             }
             $repoName = Split-Path -Leaf (Split-Path $status.GitDir)
             $prefix = if ($s.EnableWindowTitle -is [string]) { $s.EnableWindowTitle } else { '' }
-            $Host.UI.RawUI.WindowTitle = "$script:adminHeader$prefix$repoName [$($status.Branch)]"
+            $adminHeader = if ($script:isAdminProcess) { $s.AdminTitlePrefixText } else { '' }
+            $Host.UI.RawUI.WindowTitle = "$adminHeader$prefix$repoName [$($status.Branch)]"
         }
     } elseif ( $Global:PreviousWindowTitle ) {
         $Host.UI.RawUI.WindowTitle = $Global:PreviousWindowTitle
@@ -332,6 +335,10 @@ $PoshGitVcsPrompt = {
         if ($s) {
             Write-Prompt $s.BeforeText -BackgroundColor $s.BeforeBackgroundColor -ForegroundColor $s.BeforeForegroundColor
             Write-Prompt "Error: $_" -BackgroundColor $s.ErrorBackgroundColor -ForegroundColor $s.ErrorForegroundColor
+            if ($s.Debug) {
+                Write-Host
+                Write-Verbose "PoshGitVcsPrompt error details: $($_ | Format-List * -Force | Out-String)" -Verbose
+            }
             Write-Prompt $s.AfterText -BackgroundColor $s.AfterBackgroundColor -ForegroundColor $s.AfterForegroundColor
         }
     }

diff --git a/src/GitTabExpansion.ps1 b/src/GitTabExpansion.ps1
@@ -224,8 +224,8 @@ function script:expandParamValues($cmd, $param, $filter) {
         ForEach-Object { -join ("--", $param, "=", $_) }
 }
 
-function GitTabExpansion($lastBlock) {
-    $res = Invoke-Utf8ConsoleCommand { GitTabExpansionInternal $lastBlock $Global:GitStatus }
+function Expand-GitCommand($Command) {
+    $res = Invoke-Utf8ConsoleCommand { GitTabExpansionInternal $Command $Global:GitStatus }
     $res
 }
 
@@ -403,7 +403,7 @@ if ($PowerTab_RegisterTabExpansion) {
         $line = $Context.Line
         $lastBlock = [regex]::Split($line, '[|;]')[-1].TrimStart()
         $TabExpansionHasOutput.Value = $true
-        GitTabExpansion $lastBlock
+        Expand-GitCommand $lastBlock
     }
     return
 }
@@ -417,9 +417,9 @@ function TabExpansion($line, $lastWord) {
 
     switch -regex ($lastBlock) {
         # Execute git tab completion for all git-related commands
-        "^$(Get-AliasPattern git) (.*)" { GitTabExpansion $lastBlock }
-        "^$(Get-AliasPattern tgit) (.*)" { GitTabExpansion $lastBlock }
-        "^$(Get-AliasPattern gitk) (.*)" { GitTabExpansion $lastBlock }
+        "^$(Get-AliasPattern git) (.*)" { Expand-GitCommand $lastBlock }
+        "^$(Get-AliasPattern tgit) (.*)" { Expand-GitCommand $lastBlock }
+        "^$(Get-AliasPattern gitk) (.*)" { Expand-GitCommand $lastBlock }
 
         # Fall back on existing tab expansion
         default {

diff --git a/src/GitUtils.ps1 b/src/GitUtils.ps1
@@ -232,7 +232,8 @@ function Get-GitStatus($gitDir = (Get-GitDirectory)) {
                 if ($cacheResponse.State) { $branch += "|" + $cacheResponse.State }
             } else {
                 dbg 'Getting status' $sw
-                $status = Invoke-Utf8ConsoleCommand { git -c core.quotepath=false -c color.status=false status --short --branch 2>$null }
+                $untrackedFilesOption = if($settings.UntrackedFilesMode) { "-u$($settings.UntrackedFilesMode)" } else { "" }
+                $status = Invoke-Utf8ConsoleCommand { git -c core.quotepath=false -c color.status=false status $untrackedFilesOption --short --branch 2>$null }
                 if($settings.EnableStashStatus) {
                     dbg 'Getting stash count' $sw
                     $stashCount = $null | git stash list 2>$null | measure-object | Select-Object -expand Count

diff --git a/src/posh-git.psd1 b/src/posh-git.psd1
@@ -34,6 +34,7 @@ FunctionsToExport = @(
     'Enable-GitColors',
     'Get-GitDirectory',
     'TabExpansion',
+    'Expand-GitCommand',
     'Get-AliasPattern',
     'Get-SshAgent',
     'Start-SshAgent',

diff --git a/src/posh-git.psm1 b/src/posh-git.psm1
@@ -126,6 +126,7 @@ $exportModuleMemberParams = @{
         'Enable-GitColors',
         'Get-GitDirectory',
         'TabExpansion',
+        'Expand-GitCommand',
         'Get-AliasPattern',
         'Get-SshAgent',
         'Start-SshAgent',