adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up gitstatus.py

Browse Source
This commit is contained in:
Marc Cornellà 2015-08-11 11:29:05 +02:00
parent 45473c3a81
commit 3c698743fa
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/git-prompt/gitstatus.py
View File

@ -1,18 +1,14 @@
#!/usr/bin/env python #!/usr/bin/env python
from __future__ import print_function from __future__ import print_function
# change this symbol to whatever you prefer
prehash = ':'
import sys import sys
import re import re
import subprocess from subprocess import Popen, PIPE, check_output
from subprocess import Popen, PIPE
# `git status --porcelain -b` can collect all information # `git status --porcelain --branch` can collect all information
# branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind # branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind
po = Popen(['git', 'status', '--porcelain', '-b'], stdout=PIPE, stderr=PIPE) po = Popen(['git', 'status', '--porcelain', '--branch'], stdout=PIPE, stderr=PIPE)
stdout, sterr = po.communicate() stdout, sterr = po.communicate()
if po.returncode != 0: if po.returncode != 0:
sys.exit(0) # Not a git repository sys.exit(0) # Not a git repository
@ -25,11 +21,10 @@ for st in status:
if st[0] == '#' and st[1] == '#': if st[0] == '#' and st[1] == '#':
if re.search('Initial commit on', st[2]): if re.search('Initial commit on', st[2]):
branch = st[2].split(' ')[-1] branch = st[2].split(' ')[-1]
elif re.search('no branch', st[2]):
branch = check_output(['git', 'rev-parse', '--short', 'HEAD']).decode('utf-8').strip()
elif len(st[2].strip().split('...')) == 1: elif len(st[2].strip().split('...')) == 1:
branch = st[2].strip() branch = st[2].strip()
if branch == 'HEAD (no branch)':
cmd = ['git', 'log', '-1', '--format="%h"']
branch = subprocess.check_output(cmd).strip().strip('"')
else: else:
# current and remote branch info # current and remote branch info
branch, rest = st[2].strip().split('...') branch, rest = st[2].strip().split('...')