bo
/
dotfiles
mirror of https://github.com/bjeanes/dotfiles.git
1
0
Fork 0
Code Releases Activity

Upgraded vcprompt to fix the empty-git-repo issue causing stderr output in the prompt

pull/2/head
Bodaniel Jeanes 2010-06-27 23:53:00 +10:00
parent 29225e7f9b
commit abdd22288f
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
misc/vcprompt.py
View File

@ -521,34 +521,30 @@ def git(path, string, unknown):
# hash/revision # hash/revision
if re.search('%(r|h)', string) and branch != unknown: if re.search('%(r|h)', string) and branch != unknown:
hash_file = os.path.join(file, 'refs/heads/%s' % branch) hash_file = os.path.join(file, 'refs/heads/%s' % branch)
with open(hash_file, 'r') as f: if os.path.exists(hash_file):
for line in f: with open(hash_file, 'r') as f:
hash = line.strip()[0:7] for line in f:
break hash = line.strip()[0:7]
break
# status # status
if '%i' in string: if '%i' in string:
command = 'git status' command = 'git status --short -z'
process = Popen(command.split(), stdout=PIPE, stderr=PIPE) process = Popen(command.split(), stdout=PIPE, stderr=PIPE)
output = process.communicate()[0] output = process.communicate()[0]
returncode = process.returncode returncode = process.returncode
if not returncode: if not returncode:
headers = {'modified': 'M', status = 'clean'
'removed': 'D', status_codes = []
'renamed': 'R',
'Untracked': '?'}
status = ''
for line in output.split('\n'): for line in output.split('\n'):
# strip the hashes from the lines line = line.strip()
line = line[1:].strip() if not line:
# ignore informational and blank lines continue
if line and not line.startswith('('): status_codes.append(line.split()[0])
for key in headers.keys():
if line.startswith(key): if status_codes:
status += headers[key] status = sorted_alpha(status_codes)
break
status = sorted_alpha(status)
# formatting # formatting
string = string.replace('%b', branch) string = string.replace('%b', branch)
@ -673,4 +669,4 @@ def svn(path, string, unknown):
if __name__ == '__main__': if __name__ == '__main__':
print main() print main()

2
zsh/theme
View File

@ -16,4 +16,4 @@ ZSH_THEME_VCS_PROMPT_SUFFIX="›%{$reset_color%}"
ZSH_THEME_VCS_PROMPT_FORMAT="${ZSH_THEME_VCS_PROMPT_PREFIX}%b:%h${ZSH_THEME_VCS_PROMPT_SUFFIX}" ZSH_THEME_VCS_PROMPT_FORMAT="${ZSH_THEME_VCS_PROMPT_PREFIX}%b:%h${ZSH_THEME_VCS_PROMPT_SUFFIX}"
PS1='%{$fg[blue]%}$(prompt_pwd)%{$reset_color%} %{$fg[$(prompt_color)]%}♪%{$reset_color%} ' PS1='%{$fg[blue]%}$(prompt_pwd)%{$reset_color%} %{$fg[$(prompt_color)]%}♪%{$reset_color%} '
RPS1='$(${VCPROMPT} -f ${ZSH_THEME_VCS_PROMPT_FORMAT} 2>/dev/null)' RPS1='$(${VCPROMPT} -f ${ZSH_THEME_VCS_PROMPT_FORMAT})'