summaryrefslogtreecommitdiff
path: root/plugins/git-prompt/gitstatus.py
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/git-prompt/gitstatus.py')
-rw-r--r--plugins/git-prompt/gitstatus.py20
1 files changed, 20 insertions, 0 deletions
diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index bf3173614..786274a71 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -23,6 +23,18 @@ def get_tagname_or_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
@@ -68,6 +80,12 @@ for st in status:
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),
@@ -76,5 +94,7 @@ out = ' '.join([
str(len(conflicts)),
str(len(changed)),
str(len(untracked)),
+ str(stashed),
+ str(clean)
])
print(out, end='')