[Fix #221] Add a simple git-info

modules/git/README.md

@@ -253,19 +253,38 @@ setting a style is as follows.
 | Name      | Format Code | Description
 | --------- | :---------: | ---------------------------------------------------
 | action    |     %s      | Special action name
-| added     |     %a      | Added files count
 | ahead     |     %A      | Commits ahead of remote count
 | behind    |     %B      | Commits behind of remote count
 | branch    |     %b      | Branch name
 | commit    |     %c      | Commit hash
+| position  |     %p      | Commits from the nearest tag count
+| remote    |     %R      | Remote name
+| stashed   |     %S      | Stashed states count
+
+### Concise Contexts
+
+| Name      | Format Code | Description
+| --------- | :---------: | ---------------------------------------------------
+| clean     |     %C      | Clean state
+| dirty     |     %D      | Dirty files count
+| indexed   |     %i      | Indexed files count
+| unindexed |     %I      | Unindexed files count
+| untracked |     %u      | Untracked files count
+
+The following contexts must be enabled with the following zstyle:
+
+    zstyle ':prezto:module:git:info' verbose 'yes'
+
+### Verbose Contexts
+
+| Name      | Format Code | Description
+| --------- | :---------: | ---------------------------------------------------
+| added     |     %a      | Added files count
 | clean     |     %C      | Clean state
 | deleted   |     %d      | Deleted files count
 | dirty     |     %D      | Dirty files count
 | modified  |     %m      | Modified files count
-| position  |     %p      | Commits from the nearest tag count
-| remote    |     %R      | Remote name
 | renamed   |     %r      | Renamed files count
-| stashed   |     %S      | Stashed states count
 | unmerged  |     %U      | Unmerged files count
 | untracked |     %u      | Untracked files count
 

modules/git/functions/git-info

@@ -151,6 +151,9 @@ function git-info {
   local dirty_format
   local dirty_formatted
   local ignore_submodules
+  local indexed=0
+  local indexed_format
+  local indexed_formatted
   local -A info_formats
   local info_format
   local line_number=0
@@ -171,6 +174,10 @@ function git-info {
   local stashed_format
   local stashed_formatted
   local status_cmd
+  local status_mode
+  local unindexed=0
+  local unindexed_format
+  local unindexed_formatted
   local unmerged=0
   local unmerged_format
   local unmerged_formatted
@@ -291,6 +298,65 @@ function git-info {
     fi
   fi
 
+  # Get status type.
+  if ! zstyle -t ':prezto:module:git:info' verbose; then
+    # Format indexed.
+    zstyle -s ':prezto:module:git:info:indexed' format 'indexed_format'
+    if [[ -n "$indexed_format" ]]; then
+      ((
+        indexed+=$(
+          git diff-index \
+            --no-ext-diff \
+            --name-only \
+            --cached \
+            --ignore-submodules=${ignore_submodules:-none} \
+            HEAD \
+            2> /dev/null \
+          | wc -l
+        )
+      ))
+      if (( indexed > 0 )); then
+        zformat -f indexed_formatted "$indexed_format" "i:$indexed"
+      fi
+    fi
+
+    # Format unindexed.
+    zstyle -s ':prezto:module:git:info:unindexed' format 'unindexed_format'
+    if [[ -n "$unindexed_format" ]]; then
+      ((
+        unindexed+=$(
+          git diff-files \
+            --no-ext-diff \
+            --name-only \
+            --ignore-submodules=${ignore_submodules:-none} \
+            2> /dev/null \
+          | wc -l
+        )
+      ))
+      if (( unindexed > 0 )); then
+        zformat -f unindexed_formatted "$unindexed_format" "I:$unindexed"
+      fi
+    fi
+
+    # Format untracked.
+    zstyle -s ':prezto:module:git:info:untracked' format 'untracked_format'
+    if [[ -n "$untracked_format" ]]; then
+      ((
+        untracked+=$(
+          git ls-files \
+            --other \
+            --exclude-standard \
+            2> /dev/null \
+          | wc -l
+        )
+      ))
+      if (( untracked > 0 )); then
+        zformat -f untracked_formatted "$untracked_format" "u:$untracked"
+      fi
+    fi
+
+    (( dirty = indexed + unindexed + untracked ))
+  else
     # Use porcelain status for easy parsing.
     status_cmd="git status --porcelain --ignore-submodules=${ignore_submodules:-none}"
 
@@ -343,6 +409,7 @@ function git-info {
       zstyle -s ':prezto:module:git:info:untracked' format 'untracked_format'
       zformat -f untracked_formatted "$untracked_format" "u:$untracked"
     fi
+  fi
 
   # Format dirty and clean.
   if (( dirty > 0 )); then
@@ -364,6 +431,8 @@ function git-info {
       "c:$commit_formatted" \
       "d:$deleted_formatted" \
       "D:$dirty_formatted" \
+      "i:$indexed_formatted" \
+      "I:$unindexed_formatted" \
       "m:$modified_formatted" \
       "p:$position_formatted" \
       "R:$remote_formatted" \

modules/prompt/functions/prompt_sorin_setup

@@ -46,10 +46,14 @@ function prompt_sorin_setup {
   # Add hook for calling git-info before each command.
   add-zsh-hook precmd prompt_sorin_precmd
 
+  # Set editor-info parameters.
   zstyle ':prezto:module:editor:info:completing' format '%B%F{red}...%f%b'
   zstyle ':prezto:module:editor:info:keymap:primary' format ' %B%F{red}❯%F{yellow}❯%F{green}❯%f%b'
   zstyle ':prezto:module:editor:info:keymap:primary:overwrite' format ' %F{red}♺%f'
   zstyle ':prezto:module:editor:info:keymap:alternate' format ' %B%F{green}❮%F{yellow}❮%F{red}❮%f%b'
+
+  # Set git-info parameters.
+  zstyle ':prezto:module:git:info' verbose 'yes'
   zstyle ':prezto:module:git:info:action' format ':%%B%F{yellow}%s%f%%b'
   zstyle ':prezto:module:git:info:added' format ' %%B%F{green}✚%f%%b'
   zstyle ':prezto:module:git:info:ahead' format ' %%B%F{yellow}⬆%f%%b'