return 1
}
+is425(){
+ [[ $ZSH_VERSION == 4.2.<5->* || $ZSH_VERSION == 4.<3->* || $ZSH_VERSION == <5->* ]] && return 0
+ return 1
+}
+
is43(){
[[ $ZSH_VERSION == 4.<3->* || $ZSH_VERSION == <5->* ]] && return 0
return 1
# First, the context in which we are working:
# :vcs_info:<vcs-string>
# ...where <vcs-string> is one of:
-# - git, git-svn, hg, darcs, bzr, mtn, svn or svk
+# - git, git-svn, hg, darcs, bzr, mtn, svn, cvs or svk
#
# You can of course use ':vcs_info:*' to match all VCSs at once.
#
# promptformat - Used in most circumstances.
# promptactionformat - Used if a there is a special action going on;
# (like an interactive rebase or a merge conflict)
-# enable - check in the 'init' context. If set to false,
+# branchformat - Some backends replace %b in the prompt*format
+# styles above, not only by a branch name but also
+# by a revision number. This style let's you
+# modify how that string should look like.
+# enable - Check in the 'init' context. If set to false,
# vcs_info() will do nothing.
-# disable - provide a list of systems, you don't want
+# disable - Provide a list of systems, you don't want
# the prompt to check for repositories (checked
# in the 'init' context, too).
+# use-simple - If there are two different ways of gathering
+# information, you can select the simpler one
+# by setting this style to true; the default
+# is to use the not-that-simple code, which is
+# potentially a lot slower but might be more
+# accurate in all possible cases.
+#
+# The use-simple style is currently only available for the bzr backend.
#
# The default values for these in all contexts are:
# promptformat " (%s)-[%b|%a]-"
# promptactionformat " (%s)-[%b]-"
+# branchformat "%b:%r" (for bzr, svn and svk)
# enable true
+# disable (empty list)
+# use-simple false
#
-# In these formats, the following replacements are done:
+# In the prompt*formats, the following replacements are done:
# %s - The vcs in use (git, hg, svn etc.)
# %b - Information about the current branch.
# %a - An identifier, that describes the action.
# %r - repository name
# If %R is '/foo/bar/repoXY', %r is 'repoXY'.
#
+# In branchformat these replacements are done:
+# %b - the branch name
+# %r - the current revision number
+#
# Not all vcs backends may support all replacements
#
# Examples:
# % zstyle ':vcs_info:git' promptformat ' GIT, BABY! [%b]'
# % zstyle ':vcs_info:git' promptactionformat ' GIT ACTION! [%b|%a]'
#
-# If you want colors, make sure you enclose the color codes in %{...%}, because
-# the string provided by vcs_info() is used for prompts.
+# Use the quicker bzr backend (if you do, please report if it does
+# the-right-thing[tm] - thanks):
+# % zstyle ':vcs_info:bzr' use-simple true
+#
+# Display the revision number in yellow for bzr and svn:
+# % zstyle ':vcs_info:(svn|bzr)' branchformat '%b%{'${fg[yellow]}'%}:%r'
+#
+# If you want colors, make sure you enclose the color codes in %{...%},
+# because the string provided by vcs_info() is used for prompts.
#
# Example: PROMPT='%(?..[%?]-)%3~%$(vcs_info)#'
#
local msg svkbranch svkbase
svkbase=${vcs_comm[basedir]}
- svkbranch=${svkbase##*
- }
- svkbase=${svkbase%%
- *}
+
+ zstyle -s ":vcs_info:${vcs}" branchformat svkbranch || svkbranch="%b:%r"
+ zformat -f svkbranch "${svkbranch}" "b:${vcs_comm[branch]}" "r:${vcs_comm[revision]}"
msg=$(VCS_INFO_format)
zformat -f msg "${msg}" "a:" "b:${svkbranch}" "s:${vcs}" "r:${svkbase:t}" "R:${svkbase}"
}
# }}}
VCS_INFO_svn_get_data () { # {{{
- local msg svnbranch svnbase
+ setopt localoptions noksharrays
+ local msg svnbase svnbranch
+ local -a svninfo
svnbase="."
while [[ -d "${svnbase}/../.svn" ]]; do
svnbase="${svnbase}/.."
done
svnbase=$(VCS_INFO_realpath ${svnbase})
- svnbranch=$(svn info "$base_dir" | awk '/^URL/ { sub(".*/","",$0); r=$0 } /^Revision/ { sub("[^0-9]*","",$0); print r":"$0 }')
+ svninfo=($(svn info "${svnbase}" | awk '/^URL/ { sub(".*/","",$0); r=$0 } /^Revision/ { sub("[^0-9]*","",$0); print r"\n"$0 }'))
+
+ zstyle -s ":vcs_info:${vcs}" branchformat svnbranch || svnbranch="%b:%r"
+ zformat -f svnbranch "${svnbranch}" "b:${svninfo[1]}" "r:${svninfo[2]}"
msg=$(VCS_INFO_format)
zformat -f msg "${msg}" "a:" "b:${svnbranch}" "s:${vcs}" "r:${svnbase:t}" "R:${svnbase}"
}
# }}}
VCS_INFO_bzr_get_data () { # {{{
- local msg bzrbranch bzrbase bzrrevno i j
+ local msg bzrbranch bzrbase bzrrevno bzrbr i j
+
+ if zstyle -t ":vcs_info:${vcs}" "use-simple" ; then
+ bzrbase=${vcs_comm[basedir]}
+ bzrbranch=${bzrbase:t}
+ if [[ -f ${bzrbase}/.bzr/branch/last-revision ]] ; then
+ bzrrevno=$(< ${bzrbase}/.bzr/branch/last-revision)
+ bzrrevno=${bzrrevno%% *}
+ fi
+ else
+ bzrbase=$(bzr info 2>/dev/null | sed -rne 's, *branch root: ,,p')
+ bzrbase=$(VCS_INFO_realpath ${bzrbase})
+
+ bzr version-info 2> /dev/null | while read i j; do
+ case "${i}" in
+ revno:)
+ bzrrevno=${j} ;;
+ branch-nick:)
+ bzrbranch=${j} ;;
+ esac
+ done
+ fi
- bzrbase=$(bzr info | sed -rne 's, *branch root: ,,p')
- case ${bzrbase} in
- .) bzrbase=${PWD} ;;
- esac
+ zstyle -s ":vcs_info:${vcs}" branchformat bzrbr || bzrbr="%b:%r"
+ zformat -f bzrbr "${bzrbr}" "b:${bzrbranch}" "r:${bzrrevno}"
- bzr version-info | while read i j; do
- case "${i}" in
- revno:)
- bzrrevno=${j} ;;
- branch-nick:)
- bzrbranch=${j} ;;
- esac
+ msg=$(VCS_INFO_format)
+ zformat -f msg "${msg}" "a:" "b:${bzrbr}" "s:${vcs}" "r:${bzrbase:t}" "R:${bzrbase}"
+ printf '%s' ${msg}
+}
+# }}}
+VCS_INFO_cvs_get_data () { # {{{
+ local msg cvsbranch cvsbase basename
+
+ cvsbase="."
+ while [[ -d "${cvsbase}/../CVS" ]]; do
+ cvsbase="${cvsbase}/.."
done
+ cvsbase=$(VCS_INFO_realpath ${cvsbase})
+ cvsbranch=$(< ./CVS/Repository)
+ basename=${cvsbase:t}
+ cvsbranch=${cvsbranch##${basename}/}
+ [[ -z ${cvsbranch} ]] && cvsbranch=${basename}
msg=$(VCS_INFO_format)
- zformat -f msg "${msg}" "a:" "b:${bzrbranch}:${bzrrevno}" "s:${vcs}" "r:${bzrbase:t}" "R:${bzrbase}"
+ zformat -f msg "${msg}" "a:" "b:${cvsbranch}" "s:${vcs}" "r:${basename}" "R:${cvsbase}"
printf '%s' ${msg}
}
# }}}
VCS_INFO_bzr_detect() {
check_com -c bzr || return 1
+ vcs_comm[detect_need_file]=branch/format
VCS_INFO_detect_by_dir '.bzr'
return $?
}
+VCS_INFO_cvs_detect() {
+ check_com -c svn || return 1
+ [[ -d "CVS" ]] && return 0
+ return 1
+}
+
VCS_INFO_darcs_detect() {
check_com -c darcs || return 1
vcs_comm[detect_need_file]=format
}
VCS_INFO_svk_detect() {
- local basedir
+ setopt localoptions noksharrays
+ local -a info
check_com -c svk || return 1
[[ -f ~/.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
-
- vcs_comm[basedir]=${basedir}
+ info=(
+ $(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 "\n" $2;
+ exit 1
+ }' ~/.svk/config
+ )
+ ) && return 1
+
+ vcs_comm[basedir]=${info[1]}
+ vcs_comm[branch]=${info[2]}
+ vcs_comm[revision]=${info[3]}
return 0
}
zstyle -T ":vcs_info:${vcs}" "enable" || return 0
zstyle -a ":vcs_info:${vcs}" "disable" disabled
- VCSs=(git hg bzr darcs mtn svn svk)
+ VCSs=(git hg bzr darcs mtn svn cvs svk)
(( found = 0 ))
for vcs in ${VCSs} ; do
# 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}%} "
+ zstyle ':vcs_info:(sv[nk]|bzr)' branchformat "%b${YELLOW}:%r"
fi
# }}}
# {{{ Use hard limits, except for a smaller stack and no core dumps
unlimit
-is4 && limit stack 8192
+is425 && limit stack 8192
isgrmlcd && limit core 0 # important for a live-cd-system
limit -s
# }}}
projects / grml-etc-core.git / blobdiff