Обновление ohmyzsh

zsh/plugins/git-prompt/README.md

@@ -11,6 +11,9 @@ plugins=(... git-prompt)
 
 See the [original repository](https://github.com/olivierverdier/zsh-git-prompt).
 
+## Prerequisites
+This plugin uses `python`, so your host needs to have it installed
+
 ## Examples
 
 The prompt may look like the following:
@@ -21,6 +24,7 @@ The prompt may look like the following:
 - `(master|✖2✚3)`: on branch `master`, 2 conflicts, 3 files changed
 - `(experimental↓2↑3|✔)`: on branch `experimental`; your branch has diverged by 3 commits, remote by 2 commits; the repository is otherwise clean
 - `(:70c2952|✔)`: not on any branch; parent commit has hash `70c2952`; the repository is otherwise clean
+- `(master|⚑2)`: on branch `master`, there are 2 stashed changes
 
 ## Prompt Structure
 
@@ -40,6 +44,7 @@ The symbols are as follows:
 | ●n     | there are `n` staged files     |
 | ✖n     | there are `n` unmerged files   |
 | ✚n     | there are `n` unstaged files   |
+| ⚑n     | there are `n` stashed changes  |
 | …      | there are some untracked files |
 
 ### Branch Tracking Symbols

zsh/plugins/git-prompt/git-prompt.plugin.zsh

@@ -1,6 +1,3 @@
-# ZSH Git Prompt Plugin from:
-# http://github.com/olivierverdier/zsh-git-prompt
-
 __GIT_PROMPT_DIR="${0:A:h}"
 
 ## Hook function definitions
@@ -23,9 +20,10 @@ function precmd_update_git_vars() {
     fi
 }
 
-chpwd_functions+=(chpwd_update_git_vars)
-precmd_functions+=(precmd_update_git_vars)
-preexec_functions+=(preexec_update_git_vars)
+autoload -U add-zsh-hook
+add-zsh-hook chpwd chpwd_update_git_vars
+add-zsh-hook precmd precmd_update_git_vars
+add-zsh-hook preexec preexec_update_git_vars
 
 
 ## Function definitions
@@ -42,19 +40,18 @@ function update_current_git_vars() {
     GIT_CONFLICTS=$__CURRENT_GIT_STATUS[5]
     GIT_CHANGED=$__CURRENT_GIT_STATUS[6]
     GIT_UNTRACKED=$__CURRENT_GIT_STATUS[7]
-    GIT_DELETED=$__CURRENT_GIT_STATUS[8]
+    GIT_STASHED=$__CURRENT_GIT_STATUS[8]
+    GIT_CLEAN=$__CURRENT_GIT_STATUS[9]
 }
 
 git_super_status() {
     precmd_update_git_vars
     if [ -n "$__CURRENT_GIT_STATUS" ]; then
       STATUS="$ZSH_THEME_GIT_PROMPT_PREFIX$ZSH_THEME_GIT_PROMPT_BRANCH$GIT_BRANCH%{${reset_color}%}"
-      if [ "$GIT_BEHIND" -ne "0" ]; then       
-          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_SEPARATOR"
+      if [ "$GIT_BEHIND" -ne "0" ]; then
           STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_BEHIND$GIT_BEHIND%{${reset_color}%}"
       fi
       if [ "$GIT_AHEAD" -ne "0" ]; then
-          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_SEPARATOR"
           STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_AHEAD$GIT_AHEAD%{${reset_color}%}"
       fi
       STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_SEPARATOR"
@@ -67,13 +64,13 @@ git_super_status() {
       if [ "$GIT_CHANGED" -ne "0" ]; then
           STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CHANGED$GIT_CHANGED%{${reset_color}%}"
       fi
-      if [ "$GIT_DELETED" -ne "0" ]; then
-        STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_DELETED$GIT_DELETED%{${reset_color}%}"
-      fi
       if [ "$GIT_UNTRACKED" -ne "0" ]; then
           STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED$GIT_UNTRACKED%{${reset_color}%}"
       fi
-      if [ "$GIT_CHANGED" -eq "0" ] && [ "$GIT_CONFLICTS" -eq "0" ] && [ "$GIT_STAGED" -eq "0" ] && [ "$GIT_UNTRACKED" -eq "0" ]; then
+      if [ "$GIT_STASHED" -ne "0" ]; then
+          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STASHED$GIT_STASHED%{${reset_color}%}"
+      fi
+      if [ "$GIT_CLEAN" -eq "1" ]; then
           STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
       fi
       STATUS="$STATUS%{${reset_color}%}$ZSH_THEME_GIT_PROMPT_SUFFIX"
@@ -91,9 +88,9 @@ ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg[red]%}%{✖%G%}"
 ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[blue]%}%{✚%G%}"
 ZSH_THEME_GIT_PROMPT_BEHIND="%{↓%G%}"
 ZSH_THEME_GIT_PROMPT_AHEAD="%{↑%G%}"
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{…%G%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%}%{…%G%}"
+ZSH_THEME_GIT_PROMPT_STASHED="%{$fg_bold[blue]%}%{⚑%G%}"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}%{✔%G%}"
-ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}-"
 
 # Set the prompt.
 RPROMPT='$(git_super_status)'

zsh/plugins/git-prompt/gitstatus.py

@@ -1,47 +1,55 @@
 #!/usr/bin/env python
 from __future__ import print_function
 
+import os
 import sys
 import re
-import shlex
 from subprocess import Popen, PIPE, check_output
 
 
 def get_tagname_or_hash():
     """return tagname if exists else hash"""
-    cmd = 'git log -1 --format="%h%d"'
-    output = check_output(shlex.split(cmd)).decode('utf-8').strip()
-    hash_, tagname = None, None
     # get hash
-    m = re.search('\(.*\)$', output)
-    if m:
-        hash_ = output[:m.start()-1]
-    # get tagname
-    m = re.search('tag: .*[,\)]', output)
-    if m:
-        tagname = 'tags/' + output[m.start()+len('tag: '): m.end()-1]
+    hash_cmd = ['git', 'rev-parse', '--short', 'HEAD']
+    hash_ = check_output(hash_cmd).decode('utf-8').strip()
 
-    if tagname:
-        return tagname
+    # get tagname
+    tags_cmd = ['git', 'for-each-ref', '--points-at=HEAD', '--count=2', '--sort=-version:refname', '--format=%(refname:short)', 'refs/tags']
+    tags = check_output(tags_cmd).decode('utf-8').split()
+
+    if tags:
+        return tags[0] + ('+' if len(tags) > 1 else '')
     elif hash_:
         return hash_
     return None
 
+# Re-use method from https://github.com/magicmonty/bash-git-prompt to get stashs count
+def get_stash():
+    cmd = Popen(['git', 'rev-parse', '--git-dir'], stdout=PIPE, stderr=PIPE)
+    so, se = cmd.communicate()
+    stash_file = '%s%s' % (so.decode('utf-8').rstrip(), '/logs/refs/stash')
+
+    try:
+        with open(stash_file) as f:
+            return sum(1 for _ in f)
+    except IOError:
+        return 0
+
 
 # `git status --porcelain --branch` can collect all information
 # branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind
-po = Popen(['git', 'status', '--porcelain', '--branch'], stdout=PIPE, stderr=PIPE)
+po = Popen(['git', 'status', '--porcelain', '--branch'], env=dict(os.environ, LANG="C"), stdout=PIPE, stderr=PIPE)
 stdout, sterr = po.communicate()
 if po.returncode != 0:
     sys.exit(0)  # Not a git repository
 
 # collect git status information
-untracked, staged, changed, conflicts, deleted = [], [], [], [], []
+untracked, staged, changed, conflicts = [], [], [], []
 ahead, behind = 0, 0
 status = [(line[0], line[1], line[2:]) for line in stdout.decode('utf-8').splitlines()]
 for st in status:
     if st[0] == '#' and st[1] == '#':
-        if re.search('Initial commit on', st[2]):
+        if re.search('Initial commit on', st[2]) or re.search('No commits yet on', st[2]):
             branch = st[2].split(' ')[-1]
         elif re.search('no branch', st[2]):  # detached status
             branch = get_tagname_or_hash()
@@ -67,13 +75,17 @@ for st in status:
     else:
         if st[1] == 'M':
             changed.append(st)
-        if st[1] == 'D':
-            deleted.append(st)
         if st[0] == 'U':
             conflicts.append(st)
         elif st[0] != ' ':
             staged.append(st)
 
+stashed = get_stash()
+if not changed and not staged and not conflicts and not untracked and not stashed:
+    clean = 1
+else:
+    clean = 0
+
 out = ' '.join([
     branch,
     str(ahead),
@@ -82,6 +94,7 @@ out = ' '.join([
     str(len(conflicts)),
     str(len(changed)),
     str(len(untracked)),
-    str(len(deleted)),
+    str(stashed),
+    str(clean)
 ])
 print(out, end='')