45a954cb0f8b67e35529efbcdf60f0621d95f4a1

Message

git_prompt_status now uses hash lookups instead of multiple greps

Diff

This diff is truncated to protect this page.

  1diff --git a/lib/git.zsh b/lib/git.zsh
  2index b3b25f80262db0545733c2a518c7fc76c6de1728..578f319e45d73d4cf503de0481de208753dbebd5 100644
  3--- a/lib/git.zsh
  4+++ b/lib/git.zsh
  5@@ -147,46 +147,104 @@ function git_prompt_long_sha() {
  6   SHA=$(__git_prompt_git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
  7 }
  8 
  9-# Get the status of the working tree
 10 function git_prompt_status() {
 11-  emulate -L zsh
 12-
 13   [[ "$(__git_prompt_git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]] && return
 14 
 15-  local INDEX STATUS
 16-  INDEX=$(__git_prompt_git status --porcelain -b 2> /dev/null) || return 0
 17-  STATUS=""
 18-  if [[ "${INDEX}" =~ $'(^|\n)\\?\\? ' ]]; then
 19-    STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
 20-  fi
 21-  if [[ "${INDEX}" =~ $'(^|\n)(A |M |MM) ' ]]; then
 22-    STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
 23-  fi
 24-  if [[ "${INDEX}" =~ $'(^|\n)([ AM]M| T) ' ]]; then
 25-    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
 26-  fi
 27-  if [[ "${INDEX}" =~ $'(^|\n)R  ' ]]; then
 28-    STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
 29-  fi
 30-  if [[ "${INDEX}" =~ $'(^|\n)([A ]D|D ) ' ]]; then
 31-    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
 32+  local status_prompt=""
 33+
 34+  # A lookup table of each git status encountered
 35+  local -A statuses_seen
 36+
 37+  # Maps a git status prefix to an internal constant
 38+  # This cannot use the prompt constants, as they may be empty
 39+  local -A prefix_constant_map=(
 40+    '?? '       'UNTRACKED'
 41+    'A  '       'ADDED'
 42+    'M  '       'ADDED'
 43+    'MM '       'ADDED'
 44+    ' M '       'MODIFIED'
 45+    'AM '       'MODIFIED'
 46+    ' T '       'MODIFIED'
 47+    'R  '       'RENAMED'
 48+    ' D '       'DELETED'
 49+    'D  '       'DELETED'
 50+    'UU '       'UNMERGED'
 51+    'ahead'     'AHEAD'
 52+    'behind'    'BEHIND'
 53+    'diverged'  'DIVERGED'
 54+    'stashed'   'STASHED'
 55+  )
 56+
 57+  # Maps the internal constant to the prompt theme
 58+  local -A constant_prompt_map=(
 59+    'UNTRACKED' "$ZSH_THEME_GIT_PROMPT_UNTRACKED"
 60+    'ADDED'     "$ZSH_THEME_GIT_PROMPT_ADDED"
 61+    'MODIFIED'  "$ZSH_THEME_GIT_PROMPT_MODIFIED"
 62+    'RENAMED'   "$ZSH_THEME_GIT_PROMPT_RENAMED"
 63+    'DELETED'   "$ZSH_THEME_GIT_PROMPT_DELETED"
 64+    'UNMERGED'  "$ZSH_THEME_GIT_PROMPT_UNMERGED"
 65+    'AHEAD'     "$ZSH_THEME_GIT_PROMPT_AHEAD"
 66+    'BEHIND'    "$ZSH_THEME_GIT_PROMPT_BEHIND"
 67+    'DIVERGED'  "$ZSH_THEME_GIT_PROMPT_DIVERGED"
 68+    'STASHED'   "$ZSH_THEME_GIT_PROMPT_STASHED"
 69+  )
 70+
 71+  # The order that the prompt displays should be added to the prompt
 72+  local status_constants=(UNTRACKED ADDED MODIFIED RENAMED DELETED STASHED
 73+                          UNMERGED AHEAD BEHIND DIVERGED)
 74+
 75+  local status_text=$(__git_prompt_git status --porcelain -b 2> /dev/null)
 76+
 77+  # Don't continue on a catastrophic failure
 78+  if [[ $? -eq 128 ]]; then
 79+    return 1
 80   fi
 81+
 82   if $(__git_prompt_git rev-parse --verify refs/stash >/dev/null 2>&1); then
 83-    STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
 84-  fi
 85-  if [[ "${INDEX}" =~ $'(^|\n)UU ' ]]; then
 86-    STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
 87+    statuses_seen['STASHED']=1
 88   fi
 89-  if [[ "${INDEX}" =~ $'(^|\n)## [^ ]\+ .*ahead' ]]; then
 90-    STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS"
 91-  fi
 92-  if [[ "${INDEX}" =~ $'(^|\n)## [^ ]\+ .*behind' ]]; then
 93-    STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS"
 94-  fi
 95-  if [[ "${INDEX}" =~ $'(^|\n)## [^ ]\+ .*diverged' ]]; then
 96-    STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
 97+
 98+  local status_lines=("${(@f)${status_text}}");
 99+
100+  # If the tracking line exists, get and parse it
101+  if [[ $status_lines[1] =~ "^## [^ ]+ \[(.*)\]" ]]; then
102+    local branch_statuses=("${(@s/,/)match}")
103+    for branch_status in $branch_statuses; do
104+      if [[ ! $branch_status =~ "(behind|diverged|ahead) ([0-9]+)?" ]]; then