mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-19 21:41:07 +01:00
Pull in latest version from olivierverdier/zsh-git-prompt
This commit is contained in:
Marc Cornellà
parent
192de6bcff
commit
6443626a6b
2 changed files with 127 additions and 93 deletions
|
|
@ -1,32 +1,34 @@
|
||||||
# ZSH Git Prompt Plugin from:
|
# ZSH Git Prompt Plugin from:
|
||||||
# http://github.com/olivierverdier/zsh-git-prompt
|
# http://github.com/olivierverdier/zsh-git-prompt
|
||||||
#
|
|
||||||
export __GIT_PROMPT_DIR=$ZSH/plugins/git-prompt
|
export __GIT_PROMPT_DIR=${0:A:h}
|
||||||
|
|
||||||
|
export GIT_PROMPT_EXECUTABLE=${GIT_PROMPT_USE_PYTHON:-"python"}
|
||||||
|
|
||||||
|
# Initialize colors.
|
||||||
|
autoload -U colors
|
||||||
|
colors
|
||||||
|
|
||||||
# Allow for functions in the prompt.
|
# Allow for functions in the prompt.
|
||||||
setopt PROMPT_SUBST
|
setopt PROMPT_SUBST
|
||||||
|
|
||||||
## Enable auto-execution of functions.
|
autoload -U add-zsh-hook
|
||||||
typeset -ga preexec_functions
|
|
||||||
typeset -ga precmd_functions
|
|
||||||
typeset -ga chpwd_functions
|
|
||||||
|
|
||||||
# Append git functions needed for prompt.
|
add-zsh-hook chpwd chpwd_update_git_vars
|
||||||
preexec_functions+='preexec_update_git_vars'
|
add-zsh-hook preexec preexec_update_git_vars
|
||||||
precmd_functions+='precmd_update_git_vars'
|
add-zsh-hook precmd precmd_update_git_vars
|
||||||
chpwd_functions+='chpwd_update_git_vars'
|
|
||||||
|
|
||||||
## Function definitions
|
## Function definitions
|
||||||
function preexec_update_git_vars() {
|
function preexec_update_git_vars() {
|
||||||
case "$2" in
|
case "$2" in
|
||||||
git*)
|
git*|hub*|gh*|stg*)
|
||||||
__EXECUTED_GIT_COMMAND=1
|
__EXECUTED_GIT_COMMAND=1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
function precmd_update_git_vars() {
|
function precmd_update_git_vars() {
|
||||||
if [ -n "$__EXECUTED_GIT_COMMAND" ]; then
|
if [ -n "$__EXECUTED_GIT_COMMAND" ] || [ ! -n "$ZSH_THEME_GIT_PROMPT_CACHE" ]; then
|
||||||
update_current_git_vars
|
update_current_git_vars
|
||||||
unset __EXECUTED_GIT_COMMAND
|
unset __EXECUTED_GIT_COMMAND
|
||||||
fi
|
fi
|
||||||
|
|
@ -39,19 +41,68 @@ function chpwd_update_git_vars() {
|
||||||
function update_current_git_vars() {
|
function update_current_git_vars() {
|
||||||
unset __CURRENT_GIT_STATUS
|
unset __CURRENT_GIT_STATUS
|
||||||
|
|
||||||
|
if [[ "$GIT_PROMPT_EXECUTABLE" == "python" ]]; then
|
||||||
local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py"
|
local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py"
|
||||||
_GIT_STATUS=`python ${gitstatus}`
|
_GIT_STATUS=`python ${gitstatus} 2>/dev/null`
|
||||||
__CURRENT_GIT_STATUS=("${(f)_GIT_STATUS}")
|
fi
|
||||||
|
if [[ "$GIT_PROMPT_EXECUTABLE" == "haskell" ]]; then
|
||||||
|
local gitstatus="$__GIT_PROMPT_DIR/dist/build/gitstatus/gitstatus"
|
||||||
|
_GIT_STATUS=`${gitstatus}`
|
||||||
|
fi
|
||||||
|
__CURRENT_GIT_STATUS=("${(@s: :)_GIT_STATUS}")
|
||||||
|
GIT_BRANCH=$__CURRENT_GIT_STATUS[1]
|
||||||
|
GIT_AHEAD=$__CURRENT_GIT_STATUS[2]
|
||||||
|
GIT_BEHIND=$__CURRENT_GIT_STATUS[3]
|
||||||
|
GIT_STAGED=$__CURRENT_GIT_STATUS[4]
|
||||||
|
GIT_CONFLICTS=$__CURRENT_GIT_STATUS[5]
|
||||||
|
GIT_CHANGED=$__CURRENT_GIT_STATUS[6]
|
||||||
|
GIT_UNTRACKED=$__CURRENT_GIT_STATUS[7]
|
||||||
}
|
}
|
||||||
|
|
||||||
function prompt_git_info() {
|
|
||||||
|
git_super_status() {
|
||||||
|
precmd_update_git_vars
|
||||||
if [ -n "$__CURRENT_GIT_STATUS" ]; then
|
if [ -n "$__CURRENT_GIT_STATUS" ]; then
|
||||||
echo "(%{${fg[red]}%}$__CURRENT_GIT_STATUS[1]%{${fg[default]}%}$__CURRENT_GIT_STATUS[2]%{${fg[magenta]}%}$__CURRENT_GIT_STATUS[3]%{${fg[default]}%})"
|
STATUS="$ZSH_THEME_GIT_PROMPT_PREFIX$ZSH_THEME_GIT_PROMPT_BRANCH$GIT_BRANCH%{${reset_color}%}"
|
||||||
|
if [ "$GIT_BEHIND" -ne "0" ]; then
|
||||||
|
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_BEHIND$GIT_BEHIND%{${reset_color}%}"
|
||||||
|
fi
|
||||||
|
if [ "$GIT_AHEAD" -ne "0" ]; then
|
||||||
|
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_AHEAD$GIT_AHEAD%{${reset_color}%}"
|
||||||
|
fi
|
||||||
|
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_SEPARATOR"
|
||||||
|
if [ "$GIT_STAGED" -ne "0" ]; then
|
||||||
|
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED$GIT_STAGED%{${reset_color}%}"
|
||||||
|
fi
|
||||||
|
if [ "$GIT_CONFLICTS" -ne "0" ]; then
|
||||||
|
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CONFLICTS$GIT_CONFLICTS%{${reset_color}%}"
|
||||||
|
fi
|
||||||
|
if [ "$GIT_CHANGED" -ne "0" ]; then
|
||||||
|
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CHANGED$GIT_CHANGED%{${reset_color}%}"
|
||||||
|
fi
|
||||||
|
if [ "$GIT_UNTRACKED" -ne "0" ]; then
|
||||||
|
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED%{${reset_color}%}"
|
||||||
|
fi
|
||||||
|
if [ "$GIT_CHANGED" -eq "0" ] && [ "$GIT_CONFLICTS" -eq "0" ] && [ "$GIT_STAGED" -eq "0" ] && [ "$GIT_UNTRACKED" -eq "0" ]; then
|
||||||
|
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
|
||||||
|
fi
|
||||||
|
STATUS="$STATUS%{${reset_color}%}$ZSH_THEME_GIT_PROMPT_SUFFIX"
|
||||||
|
echo "$STATUS"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Default values for the appearance of the prompt. Configure at will.
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="("
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX=")"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SEPARATOR="|"
|
||||||
|
ZSH_THEME_GIT_PROMPT_BRANCH="%{$fg_bold[magenta]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[red]%}%{●%G%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg[red]%}%{✖%G%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[blue]%}%{✚%G%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_BEHIND="%{↓%G%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_AHEAD="%{↑%G%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{…%G%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}%{✔%G%}"
|
||||||
|
|
||||||
# Set the prompt.
|
# Set the prompt.
|
||||||
#PROMPT='%B%m%~%b$(prompt_git_info) %# '
|
RPROMPT='$(git_super_status)'
|
||||||
# for a right prompt:
|
|
||||||
#RPROMPT='%b$(prompt_git_info)'
|
|
||||||
RPROMPT='$(prompt_git_info)'
|
|
||||||
|
|
|
||||||
|
|
@ -1,82 +1,65 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# -*- coding: UTF-8 -*-
|
from __future__ import print_function
|
||||||
|
|
||||||
|
# change this symbol to whatever you prefer
|
||||||
|
prehash = ':'
|
||||||
|
|
||||||
from subprocess import Popen, PIPE
|
from subprocess import Popen, PIPE
|
||||||
import re
|
|
||||||
|
|
||||||
# change those symbols to whatever you prefer
|
|
||||||
symbols = {
|
|
||||||
'ahead of': '↑',
|
|
||||||
'behind': '↓',
|
|
||||||
'staged': '♦',
|
|
||||||
'changed': '‣',
|
|
||||||
'untracked': '…',
|
|
||||||
'clean': '⚡',
|
|
||||||
'unmerged': '≠',
|
|
||||||
'sha1': ':'
|
|
||||||
}
|
|
||||||
|
|
||||||
output, error = Popen(
|
|
||||||
['git', 'status'], stdout=PIPE, stderr=PIPE, universal_newlines=True).communicate()
|
|
||||||
|
|
||||||
if error:
|
|
||||||
import sys
|
import sys
|
||||||
|
gitsym = Popen(['git', 'symbolic-ref', 'HEAD'], stdout=PIPE, stderr=PIPE)
|
||||||
|
branch, error = gitsym.communicate()
|
||||||
|
|
||||||
|
error_string = error.decode('utf-8')
|
||||||
|
|
||||||
|
if 'fatal: Not a git repository' in error_string:
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
lines = output.splitlines()
|
|
||||||
|
|
||||||
behead_re = re.compile(
|
branch = branch.decode("utf-8").strip()[11:]
|
||||||
r"^# Your branch is (ahead of|behind) '(.*)' by (\d+) commit")
|
|
||||||
diverge_re = re.compile(r"^# and have (\d+) and (\d+) different")
|
|
||||||
|
|
||||||
status = ''
|
res, err = Popen(['git','diff','--name-status'], stdout=PIPE, stderr=PIPE).communicate()
|
||||||
staged = re.compile(r'^# Changes to be committed:$', re.MULTILINE)
|
err_string = err.decode('utf-8')
|
||||||
changed = re.compile(r'^# Changed but not updated:$', re.MULTILINE)
|
if 'fatal' in err_string:
|
||||||
untracked = re.compile(r'^# Untracked files:$', re.MULTILINE)
|
sys.exit(0)
|
||||||
unmerged = re.compile(r'^# Unmerged paths:$', re.MULTILINE)
|
changed_files = [namestat[0] for namestat in res.decode("utf-8").splitlines()]
|
||||||
|
staged_files = [namestat[0] for namestat in Popen(['git','diff', '--staged','--name-status'], stdout=PIPE).communicate()[0].splitlines()]
|
||||||
|
nb_changed = len(changed_files) - changed_files.count('U')
|
||||||
|
nb_U = staged_files.count('U')
|
||||||
|
nb_staged = len(staged_files) - nb_U
|
||||||
|
staged = str(nb_staged)
|
||||||
|
conflicts = str(nb_U)
|
||||||
|
changed = str(nb_changed)
|
||||||
|
nb_untracked = len([0 for status in Popen(['git','status','--porcelain',],stdout=PIPE).communicate()[0].decode("utf-8").splitlines() if status.startswith('??')])
|
||||||
|
untracked = str(nb_untracked)
|
||||||
|
|
||||||
|
ahead, behind = 0,0
|
||||||
|
|
||||||
def execute(*command):
|
if not branch: # not on any branch
|
||||||
out, err = Popen(stdout=PIPE, stderr=PIPE, *command).communicate()
|
branch = prehash + Popen(['git','rev-parse','--short','HEAD'], stdout=PIPE).communicate()[0].decode("utf-8")[:-1]
|
||||||
if not err:
|
|
||||||
nb = len(out.splitlines())
|
|
||||||
else:
|
else:
|
||||||
nb = '?'
|
remote_name = Popen(['git','config','branch.%s.remote' % branch], stdout=PIPE).communicate()[0].decode("utf-8").strip()
|
||||||
return nb
|
if remote_name:
|
||||||
|
merge_name = Popen(['git','config','branch.%s.merge' % branch], stdout=PIPE).communicate()[0].decode("utf-8").strip()
|
||||||
if staged.search(output):
|
if remote_name == '.': # local
|
||||||
nb = execute(
|
remote_ref = merge_name
|
||||||
['git', 'diff', '--staged', '--name-only', '--diff-filter=ACDMRT'])
|
|
||||||
status += '%s%s' % (symbols['staged'], nb)
|
|
||||||
if unmerged.search(output):
|
|
||||||
nb = execute(['git', 'diff', '--staged', '--name-only', '--diff-filter=U'])
|
|
||||||
status += '%s%s' % (symbols['unmerged'], nb)
|
|
||||||
if changed.search(output):
|
|
||||||
nb = execute(['git', 'diff', '--name-only', '--diff-filter=ACDMRT'])
|
|
||||||
status += '%s%s' % (symbols['changed'], nb)
|
|
||||||
if untracked.search(output):
|
|
||||||
status += symbols['untracked']
|
|
||||||
if status == '':
|
|
||||||
status = symbols['clean']
|
|
||||||
|
|
||||||
remote = ''
|
|
||||||
|
|
||||||
bline = lines[0]
|
|
||||||
if bline.find('Not currently on any branch') != -1:
|
|
||||||
branch = symbols['sha1'] + Popen([
|
|
||||||
'git',
|
|
||||||
'rev-parse',
|
|
||||||
'--short',
|
|
||||||
'HEAD'], stdout=PIPE).communicate()[0][:-1]
|
|
||||||
else:
|
else:
|
||||||
branch = bline.split(' ')[-1]
|
remote_ref = 'refs/remotes/%s/%s' % (remote_name, merge_name[11:])
|
||||||
bstatusline = lines[1]
|
revgit = Popen(['git', 'rev-list', '--left-right', '%s...HEAD' % remote_ref],stdout=PIPE, stderr=PIPE)
|
||||||
match = behead_re.match(bstatusline)
|
revlist = revgit.communicate()[0]
|
||||||
if match:
|
if revgit.poll(): # fallback to local
|
||||||
remote = symbols[match.groups()[0]]
|
revlist = Popen(['git', 'rev-list', '--left-right', '%s...HEAD' % merge_name],stdout=PIPE, stderr=PIPE).communicate()[0]
|
||||||
remote += match.groups()[2]
|
behead = revlist.decode("utf-8").splitlines()
|
||||||
elif lines[2:]:
|
ahead = len([x for x in behead if x[0]=='>'])
|
||||||
div_match = diverge_re.match(lines[2])
|
behind = len(behead) - ahead
|
||||||
if div_match:
|
|
||||||
remote = "{behind}{1}{ahead of}{0}".format(
|
out = ' '.join([
|
||||||
*div_match.groups(), **symbols)
|
branch,
|
||||||
|
str(ahead),
|
||||||
|
str(behind),
|
||||||
|
staged,
|
||||||
|
conflicts,
|
||||||
|
changed,
|
||||||
|
untracked,
|
||||||
|
])
|
||||||
|
print(out, end='')
|
||||||
|
|
||||||
print('\n'.join([branch, remote, status]))
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue