mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-14 01:40:09 +00:00
5fa7824ea5
When a commit has multiple tags associated to it, the git-prompt will throw the following error: git_super_status:[:4: integer expression expected: v0.21.x\ntags/v0.21.5, git_super_status:[:7: integer expression expected: origin/v0.21.x, git_super_status:[:11: integer expression expected: origin/v0.21.x, git_super_status:[:14: integer expression expected: v0.21.x git_super_status:[:23: integer expression expected: v0.21.x This is due to the prompt expecting the tag field to be a single word with no spaces in between but if there are multiple tags the python script returns a string with ', ' space separated list of tags. This throws off the parser. The solution is to ensure that the python script returns a space-less string ensuring the git-prompt parser to properly parse the data. Signed-off-by: Thanh Ha <zxiiro@linux.com>
84 lines
2.6 KiB
Python
84 lines
2.6 KiB
Python
#!/usr/bin/env python
|
|
from __future__ import print_function
|
|
|
|
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]
|
|
|
|
if tagname:
|
|
return tagname.replace(' ', '')
|
|
elif hash_:
|
|
return hash_
|
|
return None
|
|
|
|
|
|
# `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)
|
|
stdout, sterr = po.communicate()
|
|
if po.returncode != 0:
|
|
sys.exit(0) # Not a git repository
|
|
|
|
# collect git status information
|
|
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]) 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()
|
|
elif len(st[2].strip().split('...')) == 1:
|
|
branch = st[2].strip()
|
|
else:
|
|
# current and remote branch info
|
|
branch, rest = st[2].strip().split('...')
|
|
if len(rest.split(' ')) == 1:
|
|
# remote_branch = rest.split(' ')[0]
|
|
pass
|
|
else:
|
|
# ahead or behind
|
|
divergence = ' '.join(rest.split(' ')[1:])
|
|
divergence = divergence.lstrip('[').rstrip(']')
|
|
for div in divergence.split(', '):
|
|
if 'ahead' in div:
|
|
ahead = int(div[len('ahead '):].strip())
|
|
elif 'behind' in div:
|
|
behind = int(div[len('behind '):].strip())
|
|
elif st[0] == '?' and st[1] == '?':
|
|
untracked.append(st)
|
|
else:
|
|
if st[1] == 'M':
|
|
changed.append(st)
|
|
if st[0] == 'U':
|
|
conflicts.append(st)
|
|
elif st[0] != ' ':
|
|
staged.append(st)
|
|
|
|
out = ' '.join([
|
|
branch,
|
|
str(ahead),
|
|
str(behind),
|
|
str(len(staged)),
|
|
str(len(conflicts)),
|
|
str(len(changed)),
|
|
str(len(untracked)),
|
|
])
|
|
print(out, end='')
|