Новая тема

zsh/plugins/git-prompt/gitstatus.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 from __future__ import print_function
 
-import os
 import sys
 import re
 import shlex
@@ -23,7 +22,7 @@ def get_tagname_or_hash():
         tagname = 'tags/' + output[m.start()+len('tag: '): m.end()-1]
 
     if tagname:
-        return tagname.replace(' ', '')
+        return tagname
     elif hash_:
         return hash_
     return None
@@ -31,18 +30,18 @@ def get_tagname_or_hash():
 
 # `git status --porcelain --branch` can collect all information
 # branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind
-po = Popen(['git', 'status', '--porcelain', '--branch'], env=dict(os.environ, LANG="C"), stdout=PIPE, stderr=PIPE)
+po = Popen(['git', 'status', '--porcelain', '--branch'], 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 = [], [], [], []
+untracked, staged, changed, conflicts, deleted = [], [], [], [], []
 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]) or re.search('No commits yet on', st[2]):
+        if re.search('Initial commit on', st[2]):
             branch = st[2].split(' ')[-1]
         elif re.search('no branch', st[2]):  # detached status
             branch = get_tagname_or_hash()
@@ -68,6 +67,8 @@ 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] != ' ':
@@ -81,5 +82,6 @@ out = ' '.join([
     str(len(conflicts)),
     str(len(changed)),
     str(len(untracked)),
+    str(len(deleted)),
 ])
 print(out, end='')