|
|
@ -5,7 +5,45 @@ setopt autocd autopushd \
|
|
|
|
|
|
|
|
|
|
|
|
# Enable colors and change prompt
|
|
|
|
# Enable colors and change prompt
|
|
|
|
autoload -U colors && colors
|
|
|
|
autoload -U colors && colors
|
|
|
|
PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b "
|
|
|
|
autoload -Uz vcs_info
|
|
|
|
|
|
|
|
precmd_vcs_info() { vcs_info }
|
|
|
|
|
|
|
|
precmd_functions+=( precmd_vcs_info )
|
|
|
|
|
|
|
|
zstyle ':vcs_info:*' enable git
|
|
|
|
|
|
|
|
zstyle ':vcs_info:git*:*' get-revision true
|
|
|
|
|
|
|
|
zstyle ':vcs_info:git*:*' check-for-changes true
|
|
|
|
|
|
|
|
zstyle ':vcs_info:git*' formats "(%s) %12.12i %c%u %b%m"
|
|
|
|
|
|
|
|
zstyle ':vcs_info:git*' actionformats "(%s|%a) %12.12i %c%u %b%m"
|
|
|
|
|
|
|
|
setopt prompt_subst
|
|
|
|
|
|
|
|
# Show remote ref name and number of commits ahead-of or behind
|
|
|
|
|
|
|
|
function +vi-git-st() {
|
|
|
|
|
|
|
|
local ahead behind remote
|
|
|
|
|
|
|
|
local -a gitstatus
|
|
|
|
|
|
|
|
# Are we on a remote-tracking branch?
|
|
|
|
|
|
|
|
remote=${$(git rev-parse --verify ${hook_com[branch]}@{upstream} \
|
|
|
|
|
|
|
|
--symbolic-full-name 2>/dev/null)/refs\/remotes\/}
|
|
|
|
|
|
|
|
if [[ -n ${remote} ]] ; then
|
|
|
|
|
|
|
|
# for git prior to 1.7
|
|
|
|
|
|
|
|
# ahead=$(git rev-list origin/${hook_com[branch]}..HEAD | wc -l)
|
|
|
|
|
|
|
|
ahead=$(git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
|
|
|
|
|
|
|
|
(( $ahead )) && gitstatus+=( "${c3}+${ahead}${c2}" )
|
|
|
|
|
|
|
|
# for git prior to 1.7
|
|
|
|
|
|
|
|
# behind=$(git rev-list HEAD..origin/${hook_com[branch]} | wc -l)
|
|
|
|
|
|
|
|
behind=$(git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
|
|
|
|
|
|
|
|
(( $behind )) && gitstatus+=( "${c4}-${behind}${c2}" )
|
|
|
|
|
|
|
|
hook_com[branch]="${hook_com[branch]} [${remote} ${(j:/:)gitstatus}]"
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
# Show count of stashed changes
|
|
|
|
|
|
|
|
function +vi-git-stash() {
|
|
|
|
|
|
|
|
local -a stashes
|
|
|
|
|
|
|
|
if [[ -s ${hook_com[base]}/.git/refs/stash ]] ; then
|
|
|
|
|
|
|
|
stashes=$(git stash list 2>/dev/null | wc -l)
|
|
|
|
|
|
|
|
hook_com[misc]+=" (${stashes} stashed)"
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
zstyle ':vcs_info:git*+set-message:*' hooks git-st git-stash
|
|
|
|
|
|
|
|
PROMPT="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b "
|
|
|
|
|
|
|
|
RPROMPT='%B%{$fg[magenta]%}$vcs_info_msg_0_%{$reset_color%}'
|
|
|
|
|
|
|
|
|
|
|
|
# History in cache directory
|
|
|
|
# History in cache directory
|
|
|
|
HISTSIZE=10000
|
|
|
|
HISTSIZE=10000
|
|
|
|