fi
# }}}
-# display version control information on right side of prompt if $VCS is set {{{
-# based on Mike Hommey's http://web.glandium.org/blog/?p=170
-__vcs_dir() {
- local vcs base_dir sub_dir ref
-
- sub_dir() {
- local sub_dir
- sub_dir=$(readlink -f "${PWD}")
- sub_dir=${sub_dir#$1}
- echo ${sub_dir#/}
- }
-
- git_dir() {
- base_dir=$(git-rev-parse --show-cdup 2>/dev/null) || return 1
- base_dir=$(readlink -f "$base_dir/..")
- sub_dir=$(git-rev-parse --show-prefix)
- sub_dir=${sub_dir%/}
- ref=$(git-symbolic-ref -q HEAD || git-name-rev --name-only HEAD 2>/dev/null)
- ref=${ref#refs/heads/}
- vcs="git"
- }
-
- svn_dir() {
- [[ -d ".svn" ]] || return 1
- base_dir="."
- while [[ -d "$base_dir/../.svn" ]]; do base_dir="$base_dir/.."; done
- base_dir=$(readlink -f "$base_dir")
- sub_dir=$(sub_dir "${base_dir}")
- ref=$(svn info "$base_dir" | awk '/^URL/ { sub(".*/","",$0); r=$0 } /^Revision/ { sub("[^0-9]*","",$0); print r":"$0 }')
- vcs="svn"
- }
-
- svk_dir() {
- [[ -f ~/.svk/config ]] || return 1
- base_dir=$(awk '/: *$/ { sub(/^ */,"",$0); sub(/: *$/,"",$0); if (match("'${PWD}'", $0"(/|$)")) { print $0; d=1; } } /depotpath/ && d == 1 { sub(".*/","",$0); r=$0 } /revision/ && d == 1 { print r ":" $2; exit 1 }' ~/.svk/config) && return 1
- ref=${base_dir##*
- }
- base_dir=${base_dir%%
- *}
- sub_dir=$(sub_dir "${base_dir}")
- vcs="svk"
- }
-
- hg_dir() {
- base_dir="."
- while [[ ! -d "$base_dir/.hg" ]]; do
- base_dir="$base_dir/.."
- [[ $(readlink -f "${base_dir}") = "/" ]] && return 1
- done
- base_dir=$(readlink -f "$base_dir")
- sub_dir=$(sub_dir "${base_dir}")
- ref=$(< "${base_dir}/.hg/branch")
- vcs="hg"
- }
+# set colors for use in prompts {{{
+if zrcautoload colors && colors 2>/dev/null ; then
+ BLUE="%{${fg[blue]}%}"
+ RED="%{${fg_bold[red]}%}"
+ GREEN="%{${fg[green]}%}"
+ CYAN="%{${fg[cyan]}%}"
+ MAGENTA="%{${fg[magenta]}%}"
+ YELLOW="%{${fg[yellow]}%}"
+ WHITE="%{${fg[white]}%}"
+ NO_COLOUR="%{${reset_color}%}"
+else
+ BLUE=$'%{\e[1;34m%}'
+ RED=$'%{\e[1;31m%}'
+ GREEN=$'%{\e[1;32m%}'
+ CYAN=$'%{\e[1;36m%}'
+ WHITE=$'%{\e[1;37m%}'
+ MAGENTA='%{\e[1;35m%}'
+ YELLOW='%{\e[1;33m%}'
+ NO_COLOUR=$'%{\e[0m%}'
+fi
- hg_dir ||
- git_dir ||
- svn_dir ||
- svk_dir # ||
- # base_dir="$PWD"
- # echo "${vcs:+($vcs)}${base_dir/$HOME/~}${vcs:+[$ref]${sub_dir}}"
- echo "${vcs:+($vcs)}${base_dir}${vcs:+[$ref]${sub_dir}}"
-}
+# }}}
-# gather version control information for inclusion in a prompt
+# gather version control information for inclusion in a prompt {{{
# vcs_info() documentation: {{{
#
#
# This *requires* 'setopt prompt_subst'.
# }}}
-VCS_INFO_default_action_format=' (%s)-[%b|%a]-'
-VCS_INFO_default_format=' (%s)-[%b]-'
+VCS_INFO_format () { # {{{
+ local msg
+
+ if [[ -n ${1} ]] ; then
+ zstyle -s ":vcs_info:${vcs}" promptactionformat msg
+ [[ -z ${msg} ]] && msg=' (%s)-[%b|%a]-'
+ else
+ zstyle -s ":vcs_info:${vcs}" promptformat msg
+ [[ -z ${msg} ]] && msg=' (%s)-[%b]-'
+ fi
+ printf '%s' ${msg}
+}
+# }}}
VCS_INFO_realpath () { #{{{
# replacing 'readlink -f', which is really not portable.
(( ${+functions[chpwd]} )) && unfunction chpwd
else
gitaction="am/rebase"
fi
- print '%s' ${gitaction}
+ printf '%s' ${gitaction}
return 0
fi
done
|| [[ -d "${gitdir}/../.dotest" ]] \
|| [[ -f "${gitdir}/MERGE_HEAD" ]] ; then
gitbranch="$(${(z)gitsymref} 2> /dev/null)"
+ [[ -z ${gitbranch} ]] && gitbranch="$(< ${gitdir}/rebase-apply/head-name)"
elif [[ -f "${gitdir}/rebase-merge/interactive" ]] \
|| [[ -d "${gitdir}/rebase-merge" ]] ; then
VCS_INFO_hg_get_data () { # {{{
local msg hgbranch hgbase
- hgbase=${1}
+ hgbase=${vcs_comm[basedir]}
hgbranch=$(< ${hgbase}/.hg/branch)
msg=$(VCS_INFO_format)
zformat -f msg "${msg}" "a:" "b:${hgbranch}" "s:${vcs}" "r:${hgbase:t}" "R:${hgbase}"
VCS_INFO_svk_get_data () { # {{{
local msg svkbranch svkbase
- svkbase=${1}
+ svkbase=${vcs_comm[basedir]}
svkbranch=${svkbase##*
}
svkbase=${svkbase%%
# }}}
# VCS_INFO_*_detect () {{{
+VCS_INFO_detect_by_dir() {
+ local dirname=${1}
+ local basedir="."
+
+ while [[ ! -d ${basedir}/${dirname} ]]; do
+ basedir=${basedir}/..
+ [[ $(VCS_INFO_realpath ${basedir}) = "/" ]] && return 1
+ done
+
+ vcs_comm[basedir]=${basedir}
+ return 0
+}
+
VCS_INFO_bzr_detect() {
check_com -c bzr || return 1
- [[ -d ".bzr" ]] && return 0
- return 1
+ VCS_INFO_detect_by_dir '.bzr'
+ return $?
}
VCS_INFO_git_detect() {
}
VCS_INFO_hg_detect() {
- local basedir="."
-
check_com -c hg || return 1
- while [[ ! -d ${basedir}/.hg ]]; do
- basedir=${basedir}/..
- [[ $(VCS_INFO_realpath ${basedir}) = "/" ]] && return 1
- done
-
- printf '%s' $(VCS_INFO_realpath ${basedir})
- return 0
+ VCS_INFO_detect_by_dir '.hg'
+ return $?
}
VCS_INFO_svk_detect() {
- local output
+ local basedir
check_com -c svk || return 1
[[ -f ~/.svk/config ]] || return 1
- output=$(awk '/: *$/ { sub(/^ */,"",$0); sub(/: *$/,"",$0); if (match("'${PWD}'", $0"(/|$)")) { print $0; d=1; } } /depotpath/ && d == 1 { sub(".*/","",$0); r=$0 } /revision/ && d == 1 { print r ":" $2; exit 1 }' ~/.svk/config) && return 1
+ basedir=$(awk '/: *$/ { sub(/^ */,"",$0); sub(/: *$/,"",$0); if (match("'${PWD}'", $0"(/|$)")) { print $0; d=1; } } /depotpath/ && d == 1 { sub(".*/","",$0); r=$0 } /revision/ && d == 1 { print r ":" $2; exit 1 }' ~/.svk/config) && return 1
- printf '%s' ${output}
+ vcs_comm[basedir]=${basedir}
return 0
}
}
# }}}
-VCS_INFO_format () { # {{{
- local msg
-
- if [[ -n ${1} ]] ; then
- zstyle -s ":vcs_info:${vcs}" promptactionformat msg
- [[ -z ${msg} ]] && msg=${VCS_INFO_default_action_format}
- else
- zstyle -s ":vcs_info:${vcs}" promptformat msg
- [[ -z ${msg} ]] && msg=${VCS_INFO_default_format}
- fi
- printf '%s' ${msg}
-}
-# }}}
vcs_info () { # {{{
- local string output
+ local string
local -i found
local -a VCSs
local -x vcs
+ local -Ax vcs_comm
vcs="init"
zstyle -T ":vcs_info:${vcs}" "enable" || return 0
(( found = 0 ))
for vcs in ${VCSs} ; do
- output=$(VCS_INFO_${vcs}_detect) && (( found = 1 )) && break
+ vcs_comm=()
+ VCS_INFO_${vcs}_detect && (( found = 1 )) && break
done
(( found == 0 )) && return 0
- string=$(VCS_INFO_${vcs}_get_data ${output}) || return 1
+ string=$(VCS_INFO_${vcs}_get_data) || return 1
printf '%s' ${string}
return 0
}
# }}}
# change vcs_info formats for the grml prompt
-zstyle ':vcs_info:*' promptactionformat \
-"%{${fg[magenta]}%}(%{${reset_color}%}%s%{${fg[magenta]}%})%{${fg[yellow]}%}-%{${fg[magenta]}%}[%{${fg[green]}%}%b%{${fg[yellow]}%}|%{${fg[red]}%}%a%{${fg[magenta]}%}]%{${reset_color}%} "
-zstyle ':vcs_info:*' promptformat \
-"%{${fg[magenta]}%}(%{${reset_color}%}%s%{${fg[magenta]}%})%{${fg[yellow]}%}-%{${fg[magenta]}%}[%{${fg[green]}%}%b%{${fg[magenta]}%}]%{${reset_color}%} "
+if [[ "$TERM" == dumb ]] ; then
+ zstyle ':vcs_info:*' promptactionformat "(%s%)-[%b|%a] "
+ zstyle ':vcs_info:*' promptformat "(%s%)-[%b] "
+else
+ # these are the same, just with a lot of colours:
+ zstyle ':vcs_info:*' promptactionformat "${MAGENTA}(${NO_COLOUR}%s${MAGENTA})${YELLOW}-${MAGENTA}[${GREEN}%b${YELLOW}|${RED}%a${MAGENTA}]${NO_COLOUR} "
+ zstyle ':vcs_info:*' promptformat "${MAGENTA}(${NO_COLOUR}%s${MAGENTA})${YELLOW}-${MAGENTA}[${GREEN}%b${MAGENTA}]${NO_COLOUR}%} "
+fi
# }}}
print 'Notice: no promptinit available :('
fi
+setopt prompt_subst
# precmd() => a function which is executed just before each prompt
# use 'NOPRECMD=1' to disable the precmd + preexec commands
if [[ -n $BATTERY ]] ; then
RPROMPT="%(?..:()% ${PERCENT}${SCREENTITLE}"
# RPROMPT="${PERCENT}${SCREENTITLE}"
- elif [[ -n $VCS ]] ; then
- RPROMPT="%(?..:()% $(__vcs_dir)${SCREENTITLE}"
else
RPROMPT="%(?..:()% ${SCREENTITLE}"
# RPROMPT="${SCREENTITLE}"
esac
}
-# set colors
-if zrcautoload colors && colors 2>/dev/null ; then
- BLUE="%{${fg[blue]}%}"
- RED="%{${fg_bold[red]}%}"
- GREEN="%{${fg[green]}%}"
- CYAN="%{${fg[cyan]}%}"
- WHITE="%{${fg[white]}%}"
- NO_COLOUR="%{${reset_color}%}"
-else
- BLUE=$'%{\e[1;34m%}'
- RED=$'%{\e[1;31m%}'
- GREEN=$'%{\e[1;32m%}'
- CYAN=$'%{\e[1;36m%}'
- WHITE=$'%{\e[1;37m%}'
- NO_COLOUR=$'%{\e[0m%}'
-fi
-
EXITCODE="%(?..%?%1v )"
PS2='`%_> ' # secondary prompt, printed when the shell needs more information to complete a command.
PS3='?# ' # selection prompt used within a select loop.
# don't use colors on dumb terminals (like emacs):
if [[ "$TERM" == dumb ]] ; then
- PROMPT="${EXITCODE}${debian_chroot:+($debian_chroot)}%n@%m %40<...<%B%~%b%<< %# "
+ PROMPT="${EXITCODE}${debian_chroot:+($debian_chroot)}%n@%m %40<...<%B%~%b%<< "'$(vcs_info)'"%# "
else
# only if $GRMLPROMPT is set (e.g. via 'GRMLPROMPT=1 zsh') use the extended prompt
# set variable identifying the chroot you work in (used in the prompt below)
PROMPT="${RED}${EXITCODE}${CYAN}[%j running job(s)] ${GREEN}{history#%!} ${RED}%(3L.+.) ${BLUE}%* %D
${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< %# "
else
+ # This assembles the primary prompt string
if (( EUID != 0 )); then
- PROMPT="${RED}${EXITCODE}${WHITE}${debian_chroot:+($debian_chroot)}${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< %# " # primary prompt string
+ PROMPT="${RED}${EXITCODE}${WHITE}${debian_chroot:+($debian_chroot)}${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< "'$(vcs_info)'"%# "
else
- PROMPT="${BLUE}${EXITCODE}${WHITE}${debian_chroot:+($debian_chroot)}${RED}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< %# " # primary prompt string
+ PROMPT="${BLUE}${EXITCODE}${WHITE}${debian_chroot:+($debian_chroot)}${RED}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< "'$(vcs_info)'"%# "
fi
fi
fi
projects / grml-etc-core.git / blobdiff