Undo split of vsc-info into individual per-function files

git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@401 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede

35 files changed, 0 insertions, 504 deletions

diff --git a/zshfunc/vcs-info/VCS_INFO_adjust b/zshfunc/vcs-info/VCS_INFO_adjust
deleted file mode 100644
index 2d2c6d0..0000000
--- a/zshfunc/vcs-info/VCS_INFO_adjust
+++ /dev/null
@@ -1,4 +0,0 @@
-VCS_INFO_adjust () { #{{{
-    [[ -n ${vcs_comm[overwrite_name]} ]] && vcs=${vcs_comm[overwrite_name]}
-    return 0
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_bzr_detect b/zshfunc/vcs-info/VCS_INFO_bzr_detect
deleted file mode 100644
index 3faa78d..0000000
--- a/zshfunc/vcs-info/VCS_INFO_bzr_detect
+++ /dev/null
@@ -1,6 +0,0 @@
-VCS_INFO_bzr_detect() { #{{{
-    VCS_INFO_check_com bzr || return 1
-    vcs_comm[detect_need_file]=branch/format
-    VCS_INFO_detect_by_dir '.bzr'
-    return $?
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_bzr_get_data b/zshfunc/vcs-info/VCS_INFO_bzr_get_data
deleted file mode 100644
index e0931dc..0000000
--- a/zshfunc/vcs-info/VCS_INFO_bzr_get_data
+++ /dev/null
@@ -1,23 +0,0 @@
-VCS_INFO_bzr_get_data () { # {{{
-    setopt localoptions noksharrays
-    local bzrbase bzrbr
-    local -a bzrinfo
-
-    if zstyle -t ":vcs_info:${vcs}:${usercontext}" "use-simple" ; then
-        bzrbase=${vcs_comm[basedir]}
-        bzrinfo[2]=${bzrbase:t}
-        if [[ -f ${bzrbase}/.bzr/branch/last-revision ]] ; then
-            bzrinfo[1]=$(< ${bzrbase}/.bzr/branch/last-revision)
-            bzrinfo[1]=${${bzrinfo[1]}%% *}
-        fi
-    else
-        bzrbase=${${(M)${(f)"$( bzr info )"}:# ##branch\ root:*}/*: ##/}
-        bzrinfo=( ${${${(M)${(f)"$( bzr version-info )"}:#(#s)(revno|branch-nick)*}/*: /}/*\//} )
-        bzrbase="$(VCS_INFO_realpath ${bzrbase})"
-    fi
-
-    zstyle -s ":vcs_info:${vcs}:${usercontext}" branchformat bzrbr || bzrbr="%b:%r"
-    zformat -f bzrbr "${bzrbr}" "b:${bzrinfo[2]}" "r:${bzrinfo[1]}"
-    VCS_INFO_formats '' "${bzrbr}" "${bzrbase}"
-    return 0
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_cdv_detect b/zshfunc/vcs-info/VCS_INFO_cdv_detect
deleted file mode 100644
index 5f05823..0000000
--- a/zshfunc/vcs-info/VCS_INFO_cdv_detect
+++ /dev/null
@@ -1,6 +0,0 @@
-VCS_INFO_cdv_detect() { #{{{
-    VCS_INFO_check_com cdv || return 1
-    vcs_comm[detect_need_file]=format
-    VCS_INFO_detect_by_dir '.cdv'
-    return $?
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_cdv_get_data b/zshfunc/vcs-info/VCS_INFO_cdv_get_data
deleted file mode 100644
index 8c812cc..0000000
--- a/zshfunc/vcs-info/VCS_INFO_cdv_get_data
+++ /dev/null
@@ -1,7 +0,0 @@
-VCS_INFO_cdv_get_data () { # {{{
-    local cdvbase
-
-    cdvbase=${vcs_comm[basedir]}
-    VCS_INFO_formats '' "${cdvbase:t}" "${cdvbase}"
-    return 0
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_check_com b/zshfunc/vcs-info/VCS_INFO_check_com
deleted file mode 100644
index 7895241..0000000
--- a/zshfunc/vcs-info/VCS_INFO_check_com
+++ /dev/null
@@ -1,4 +0,0 @@
-VCS_INFO_check_com () { #{{{
-    (( ${+commands[$1]} )) && [[ -x ${commands[$1]} ]] && return 0
-    return 1
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_cvs_detect b/zshfunc/vcs-info/VCS_INFO_cvs_detect
deleted file mode 100644
index d3d2b2a..0000000
--- a/zshfunc/vcs-info/VCS_INFO_cvs_detect
+++ /dev/null
@@ -1,5 +0,0 @@
-VCS_INFO_cvs_detect() { #{{{
-    VCS_INFO_check_com svn || return 1
-    [[ -d "./CVS" ]] && [[ -r "./CVS/Repository" ]] && return 0
-    return 1
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_cvs_get_data b/zshfunc/vcs-info/VCS_INFO_cvs_get_data
deleted file mode 100644
index b8b9ad3..0000000
--- a/zshfunc/vcs-info/VCS_INFO_cvs_get_data
+++ /dev/null
@@ -1,15 +0,0 @@
-VCS_INFO_cvs_get_data () { # {{{
-    local 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}
-    VCS_INFO_formats '' "${cvsbranch}" "${cvsbase}"
-    return 0
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_darcs_detect b/zshfunc/vcs-info/VCS_INFO_darcs_detect
deleted file mode 100644
index ff79327..0000000
--- a/zshfunc/vcs-info/VCS_INFO_darcs_detect
+++ /dev/null
@@ -1,6 +0,0 @@
-VCS_INFO_darcs_detect() { #{{{
-    VCS_INFO_check_com darcs || return 1
-    vcs_comm[detect_need_file]=format
-    VCS_INFO_detect_by_dir '_darcs'
-    return $?
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_darcs_get_data b/zshfunc/vcs-info/VCS_INFO_darcs_get_data
deleted file mode 100644
index eddbd89..0000000
--- a/zshfunc/vcs-info/VCS_INFO_darcs_get_data
+++ /dev/null
@@ -1,7 +0,0 @@
-VCS_INFO_darcs_get_data () { # {{{
-    local darcsbase
-
-    darcsbase=${vcs_comm[basedir]}
-    VCS_INFO_formats '' "${darcsbase:t}" "${darcsbase}"
-    return 0
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_detect_by_dir b/zshfunc/vcs-info/VCS_INFO_detect_by_dir
deleted file mode 100644
index e0e7da3..0000000
--- a/zshfunc/vcs-info/VCS_INFO_detect_by_dir
+++ /dev/null
@@ -1,22 +0,0 @@
-VCS_INFO_detect_by_dir() { #{{{
-    local dirname=$1
-    local basedir="." realbasedir
-
-    realbasedir="$(VCS_INFO_realpath ${basedir})"
-    while [[ ${realbasedir} != '/' ]]; do
-        if [[ -n ${vcs_comm[detect_need_file]} ]] ; then
-            [[ -d ${basedir}/${dirname} ]] && \
-            [[ -e ${basedir}/${dirname}/${vcs_comm[detect_need_file]} ]] && \
-                break
-        else
-            [[ -d ${basedir}/${dirname} ]] && break
-        fi
-
-        basedir=${basedir}/..
-        realbasedir="$(VCS_INFO_realpath ${basedir})"
-    done
-
-    [[ ${realbasedir} == "/" ]] && return 1
-    vcs_comm[basedir]=${realbasedir}
-    return 0
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_formats b/zshfunc/vcs-info/VCS_INFO_formats
deleted file mode 100644
index b22d5aa..0000000
--- a/zshfunc/vcs-info/VCS_INFO_formats
+++ /dev/null
@@ -1,27 +0,0 @@
-VCS_INFO_formats () { # {{{
-    setopt localoptions noksharrays
-    local action=$1 branch=$2 base=$3
-    local msg
-    local -i i
-
-    if [[ -n ${action} ]] ; then
-        zstyle -a ":vcs_info:${vcs}:${usercontext}" actionformats msgs
-        (( ${#msgs} < 1 )) && msgs[1]=' (%s)-[%b|%a]-'
-    else
-        zstyle -a ":vcs_info:${vcs}:${usercontext}" formats msgs
-        (( ${#msgs} < 1 )) && msgs[1]=' (%s)-[%b]-'
-    fi
-
-    (( ${#msgs} > maxexports )) && msgs[$(( maxexports + 1 )),-1]=()
-    for i in {1..${#msgs}} ; do
-        zformat -f msg ${msgs[$i]}                      \
-                        a:${action}                     \
-                        b:${branch}                     \
-                        r:${base:t}                     \
-                        s:${vcs}                        \
-                        R:${base}                       \
-                        S:"$(VCS_INFO_reposub ${base})"
-        msgs[$i]=${msg}
-    done
-    return 0
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_git_detect b/zshfunc/vcs-info/VCS_INFO_git_detect
deleted file mode 100644
index a57b276..0000000
--- a/zshfunc/vcs-info/VCS_INFO_git_detect
+++ /dev/null
@@ -1,9 +0,0 @@
-VCS_INFO_git_detect() { #{{{
-    if VCS_INFO_check_com git && git rev-parse --is-inside-work-tree &> /dev/null ; then
-        vcs_comm[gitdir]="$(git rev-parse --git-dir 2> /dev/null)" || return 1
-        if   [[ -d ${vcs_comm[gitdir]}/svn ]]             ; then vcs_comm[overwrite_name]='git-svn'
-        elif [[ -d ${vcs_comm[gitdir]}/refs/remotes/p4 ]] ; then vcs_comm[overwrite_name]='git-p4' ; fi
-        return 0
-    fi
-    return 1
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_git_get_data b/zshfunc/vcs-info/VCS_INFO_git_get_data
deleted file mode 100644
index ce73b5c..0000000
--- a/zshfunc/vcs-info/VCS_INFO_git_get_data
+++ /dev/null
@@ -1,17 +0,0 @@
-VCS_INFO_git_get_data () { # {{{
-    setopt localoptions extendedglob
-    local gitdir gitbase gitbranch gitaction
-
-    gitdir=${vcs_comm[gitdir]}
-    gitbranch="$(VCS_INFO_git_getbranch ${gitdir})"
-
-    if [[ -z ${gitdir} ]] || [[ -z ${gitbranch} ]] ; then
-        return 1
-    fi
-
-    VCS_INFO_adjust
-    gitaction="$(VCS_INFO_git_getaction ${gitdir})"
-    gitbase=${PWD%/${$( git rev-parse --show-prefix )%/##}}
-    VCS_INFO_formats "${gitaction}" "${gitbranch}" "${gitbase}"
-    return 0
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_git_getaction b/zshfunc/vcs-info/VCS_INFO_git_getaction
deleted file mode 100644
index 3593f28..0000000
--- a/zshfunc/vcs-info/VCS_INFO_git_getaction
+++ /dev/null
@@ -1,47 +0,0 @@
-VCS_INFO_git_getaction () { #{{{
-    local gitaction='' gitdir=$1
-    local tmp
-
-    for tmp in "${gitdir}/rebase-apply" \
-               "${gitdir}/rebase"       \
-               "${gitdir}/../.dotest" ; do
-        if [[ -d ${tmp} ]] ; then
-            if   [[ -f "${tmp}/rebasing" ]] ; then
-                gitaction="rebase"
-            elif [[ -f "${tmp}/applying" ]] ; then
-                gitaction="am"
-            else
-                gitaction="am/rebase"
-            fi
-            printf '%s' ${gitaction}
-            return 0
-        fi
-    done
-
-    for tmp in "${gitdir}/rebase-merge/interactive" \
-               "${gitdir}/.dotest-merge/interactive" ; do
-        if [[ -f "${tmp}" ]] ; then
-            printf '%s' "rebase-i"
-            return 0
-        fi
-    done
-
-    for tmp in "${gitdir}/rebase-merge" \
-               "${gitdir}/.dotest-merge" ; do
-        if [[ -d "${tmp}" ]] ; then
-            printf '%s' "rebase-m"
-            return 0
-        fi
-    done
-
-    if [[ -f "${gitdir}/MERGE_HEAD" ]] ; then
-        printf '%s' "merge"
-        return 0
-    fi
-
-    if [[ -f "${gitdir}/BISECT_LOG" ]] ; then
-        printf '%s' "bisect"
-        return 0
-    fi
-    return 1
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_git_getbranch b/zshfunc/vcs-info/VCS_INFO_git_getbranch
deleted file mode 100644
index 03c5fa5..0000000
--- a/zshfunc/vcs-info/VCS_INFO_git_getbranch
+++ /dev/null
@@ -1,35 +0,0 @@
-VCS_INFO_git_getbranch () { #{{{
-    local gitbranch gitdir=$1
-    local gitsymref='git symbolic-ref HEAD'
-
-    if    [[ -d "${gitdir}/rebase-apply" ]] \
-       || [[ -d "${gitdir}/rebase" ]]       \
-       || [[ -d "${gitdir}/../.dotest" ]]   \
-       || [[ -f "${gitdir}/MERGE_HEAD" ]] ; then
-        gitbranch="$(${(z)gitsymref} 2> /dev/null)"
-        [[ -z ${gitbranch} ]] && [[ -r ${gitdir}/rebase-apply/head-name ]] \
-            && gitbranch="$(< ${gitdir}/rebase-apply/head-name)"
-
-    elif   [[ -f "${gitdir}/rebase-merge/interactive" ]] \
-        || [[ -d "${gitdir}/rebase-merge" ]] ; then
-        gitbranch="$(< ${gitdir}/rebase-merge/head-name)"
-
-    elif   [[ -f "${gitdir}/.dotest-merge/interactive" ]] \
-        || [[ -d "${gitdir}/.dotest-merge" ]] ; then
-        gitbranch="$(< ${gitdir}/.dotest-merge/head-name)"
-
-    else
-        gitbranch="$(${(z)gitsymref} 2> /dev/null)"
-
-        if [[ $? -ne 0 ]] ; then
-            gitbranch="$(git describe --exact-match HEAD 2>/dev/null)"
-
-            if [[ $? -ne 0 ]] ; then
-                gitbranch="${${"$(< $gitdir/HEAD)"}[1,7]}..."
-            fi
-        fi
-    fi
-
-    printf '%s' "${gitbranch##refs/heads/}"
-    return 0
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_hg_detect b/zshfunc/vcs-info/VCS_INFO_hg_detect
deleted file mode 100644
index ea13422..0000000
--- a/zshfunc/vcs-info/VCS_INFO_hg_detect
+++ /dev/null
@@ -1,6 +0,0 @@
-VCS_INFO_hg_detect() { #{{{
-    VCS_INFO_check_com hg || return 1
-    vcs_comm[detect_need_file]=store
-    VCS_INFO_detect_by_dir '.hg'
-    return $?
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_hg_get_data b/zshfunc/vcs-info/VCS_INFO_hg_get_data
deleted file mode 100644
index 314d343..0000000
--- a/zshfunc/vcs-info/VCS_INFO_hg_get_data
+++ /dev/null
@@ -1,15 +0,0 @@
-VCS_INFO_hg_get_data () { # {{{
-    local hgbranch hgbase file
-
-    hgbase=${vcs_comm[basedir]}
-
-    file="${hgbase}/.hg/branch"
-    if [[ -r ${file} ]] ; then
-        hgbranch=$(< ${file})
-    else
-        hgbranch='default'
-    fi
-
-    VCS_INFO_formats '' "${hgbranch}" "${hgbase}"
-    return 0
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_maxexports b/zshfunc/vcs-info/VCS_INFO_maxexports
deleted file mode 100644
index c0b3c1f..0000000
--- a/zshfunc/vcs-info/VCS_INFO_maxexports
+++ /dev/null
@@ -1,8 +0,0 @@
-VCS_INFO_maxexports () { #{{{
-    zstyle -s ":vcs_info:${vcs}:${usercontext}" "max-exports" maxexports || maxexports=2
-    if [[ ${maxexports} != <-> ]] || (( maxexports < 1 )); then
-        printf 'vcs_info(): expecting numeric arg >= 1 for max-exports (got %s).\n' ${maxexports}
-        printf 'Defaulting to 2.\n'
-        maxexports=2
-    fi
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_mtn_detect b/zshfunc/vcs-info/VCS_INFO_mtn_detect
deleted file mode 100644
index 91f019d..0000000
--- a/zshfunc/vcs-info/VCS_INFO_mtn_detect
+++ /dev/null
@@ -1,6 +0,0 @@
-VCS_INFO_mtn_detect() { #{{{
-    VCS_INFO_check_com mtn || return 1
-    vcs_comm[detect_need_file]=revision
-    VCS_INFO_detect_by_dir '_MTN'
-    return $?
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_mtn_get_data b/zshfunc/vcs-info/VCS_INFO_mtn_get_data
deleted file mode 100644
index 1edbb63..0000000
--- a/zshfunc/vcs-info/VCS_INFO_mtn_get_data
+++ /dev/null
@@ -1,8 +0,0 @@
-VCS_INFO_mtn_get_data () { # {{{
-    local mtnbranch mtnbase
-
-    mtnbase=${vcs_comm[basedir]}
-    mtnbranch=${${(M)${(f)"$( mtn status )"}:#(#s)Current branch:*}/*: /}
-    VCS_INFO_formats '' "${mtnbranch}" "${mtnbase}"
-    return 0
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_nvcsformats b/zshfunc/vcs-info/VCS_INFO_nvcsformats
deleted file mode 100644
index eed0e32..0000000
--- a/zshfunc/vcs-info/VCS_INFO_nvcsformats
+++ /dev/null
@@ -1,11 +0,0 @@
-VCS_INFO_nvcsformats () { #{{{
-    setopt localoptions noksharrays
-    local c v
-
-    if [[ $1 == 'preinit' ]] ; then
-        c=default
-        v=preinit
-    fi
-    zstyle -a ":vcs_info:${v:-$vcs}:${c:-$usercontext}" nvcsformats msgs
-    (( ${#msgs} > maxexports )) && msgs[${maxexports},-1]=()
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_realpath b/zshfunc/vcs-info/VCS_INFO_realpath
deleted file mode 100644
index ba4a12a..0000000
--- a/zshfunc/vcs-info/VCS_INFO_realpath
+++ /dev/null
@@ -1,11 +0,0 @@
-VCS_INFO_realpath () { #{{{
-    # a portable 'readlink -f'
-    # forcing a subshell, to ensure chpwd() is not removed
-    # from the calling shell (if VCS_INFO_realpath() is called
-    # manually).
-    (
-        (( ${+functions[chpwd]} )) && unfunction chpwd
-        setopt chaselinks
-        cd $1 2>/dev/null && pwd
-    )
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_reposub b/zshfunc/vcs-info/VCS_INFO_reposub
deleted file mode 100644
index 0eb81d4..0000000
--- a/zshfunc/vcs-info/VCS_INFO_reposub
+++ /dev/null
@@ -1,11 +0,0 @@
-VCS_INFO_reposub () { #{{{
-    setopt localoptions extendedglob
-    local base=${1%%/##}
-
-    [[ ${PWD} == ${base}/* ]] || {
-        printf '.'
-        return 1
-    }
-    printf '%s' ${PWD#$base/}
-    return 0
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_set b/zshfunc/vcs-info/VCS_INFO_set
deleted file mode 100644
index 4cd2999..0000000
--- a/zshfunc/vcs-info/VCS_INFO_set
+++ /dev/null
@@ -1,24 +0,0 @@
-VCS_INFO_set () { #{{{
-    setopt localoptions noksharrays
-    local -i i j
-
-    if [[ $1 == '--clear' ]] ; then
-        for i in {0..9} ; do
-            unset VCS_INFO_message_${i}_
-        done
-    fi
-    if [[ $1 == '--nvcs' ]] ; then
-        [[ $2 == 'preinit' ]] && (( maxexports == 0 )) && (( maxexports = 1 ))
-        for i in {0..$((maxexports - 1))} ; do
-            typeset -gx VCS_INFO_message_${i}_=
-        done
-        VCS_INFO_nvcsformats $2
-    fi
-
-    (( ${#msgs} - 1 < 0 )) && return 0
-    for i in {0..$(( ${#msgs} - 1 ))} ; do
-        (( j = i + 1 ))
-        typeset -gx VCS_INFO_message_${i}_=${msgs[$j]}
-    done
-    return 0
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_svk_detect b/zshfunc/vcs-info/VCS_INFO_svk_detect
deleted file mode 100644
index 1bd4c7f..0000000
--- a/zshfunc/vcs-info/VCS_INFO_svk_detect
+++ /dev/null
@@ -1,34 +0,0 @@
-VCS_INFO_svk_detect() { #{{{
-    setopt localoptions noksharrays extendedglob
-    local -a info
-    local -i fhash
-    fhash=0
-
-    VCS_INFO_check_com svk || return 1
-    [[ -f ~/.svk/config ]] || return 1
-
-    # This detection function is a bit different from the others.
-    # We need to read svk's config file to detect a svk repository
-    # in the first place. Therefore, we'll just proceed and read
-    # the other information, too. This is more then any of the
-    # other detections do but this takes only one file open for
-    # svk at most. VCS_INFO_svk_get_data() get simpler, too. :-)
-    while IFS= read -r line ; do
-        if [[ -n ${vcs_comm[basedir]} ]] ; then
-            line=${line## ##}
-            [[ ${line} == depotpath:* ]] && vcs_comm[branch]=${line##*/}
-            [[ ${line} == revision:* ]] && vcs_comm[revision]=${line##*[[:space:]]##}
-            [[ -n ${vcs_comm[branch]} ]] && [[ -n ${vcs_comm[revision]} ]] && break
-            continue
-        fi
-        (( fhash > 0 )) && [[ ${line} == '  '[^[:space:]]*:* ]] && break
-        [[ ${line} == '  hash:'* ]] && fhash=1 && continue
-        (( fhash == 0 )) && continue
-        [[ ${PWD}/ == ${${line## ##}%:*}/* ]] && vcs_comm[basedir]=${${line## ##}%:*}
-    done < ~/.svk/config
-
-    [[ -n ${vcs_comm[basedir]} ]]  && \
-    [[ -n ${vcs_comm[branch]} ]]   && \
-    [[ -n ${vcs_comm[revision]} ]] && return 0
-    return 1
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_svk_get_data b/zshfunc/vcs-info/VCS_INFO_svk_get_data
deleted file mode 100644
index 70d61b5..0000000
--- a/zshfunc/vcs-info/VCS_INFO_svk_get_data
+++ /dev/null
@@ -1,9 +0,0 @@
-VCS_INFO_svk_get_data () { # {{{
-    local svkbranch svkbase
-
-    svkbase=${vcs_comm[basedir]}
-    zstyle -s ":vcs_info:${vcs}:${usercontext}" branchformat svkbranch || svkbranch="%b:%r"
-    zformat -f svkbranch "${svkbranch}" "b:${vcs_comm[branch]}" "r:${vcs_comm[revision]}"
-    VCS_INFO_formats '' "${svkbranch}" "${svkbase}"
-    return 0
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_svn_detect b/zshfunc/vcs-info/VCS_INFO_svn_detect
deleted file mode 100644
index 83595db..0000000
--- a/zshfunc/vcs-info/VCS_INFO_svn_detect
+++ /dev/null
@@ -1,5 +0,0 @@
-VCS_INFO_svn_detect() { #{{{
-    VCS_INFO_check_com svn || return 1
-    [[ -d ".svn" ]] && return 0
-    return 1
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_svn_get_data b/zshfunc/vcs-info/VCS_INFO_svn_get_data
deleted file mode 100644
index fccf016..0000000
--- a/zshfunc/vcs-info/VCS_INFO_svn_get_data
+++ /dev/null
@@ -1,17 +0,0 @@
-VCS_INFO_svn_get_data () { # {{{
-    setopt localoptions noksharrays
-    local svnbase svnbranch
-    local -a svninfo
-
-    svnbase="."
-    while [[ -d "${svnbase}/../.svn" ]]; do
-        svnbase="${svnbase}/.."
-    done
-    svnbase="$(VCS_INFO_realpath ${svnbase})"
-    svninfo=( ${${${(M)${(f)"$( svn info )"}:#(#s)(URL|Revision)*}/*: /}/*\//} )
-
-    zstyle -s ":vcs_info:${vcs}:${usercontext}" branchformat svnbranch || svnbranch="%b:%r"
-    zformat -f svnbranch "${svnbranch}" "b:${svninfo[1]}" "r:${svninfo[2]}"
-    VCS_INFO_formats '' "${svnbranch}" "${svnbase}"
-    return 0
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_tla_detect b/zshfunc/vcs-info/VCS_INFO_tla_detect
deleted file mode 100644
index f91c96d..0000000
--- a/zshfunc/vcs-info/VCS_INFO_tla_detect
+++ /dev/null
@@ -1,5 +0,0 @@
-VCS_INFO_tla_detect() { #{{{
-    VCS_INFO_check_com tla || return 1
-    vcs_comm[basedir]="$(tla tree-root 2> /dev/null)" && return 0
-    return 1
-}
diff --git a/zshfunc/vcs-info/VCS_INFO_tla_get_data b/zshfunc/vcs-info/VCS_INFO_tla_get_data
deleted file mode 100644
index 130ac77..0000000
--- a/zshfunc/vcs-info/VCS_INFO_tla_get_data
+++ /dev/null
@@ -1,9 +0,0 @@
-VCS_INFO_tla_get_data () { # {{{
-    local tlabase tlabranch
-
-    tlabase="$(VCS_INFO_realpath ${vcs_comm[basedir]})"
-    # tree-id gives us something like 'foo@example.com/demo--1.0--patch-4', so:
-    tlabranch=${${"$( tla tree-id )"}/*\//}
-    VCS_INFO_formats '' "${tlabranch}" "${tlabase}"
-    return 0
-}
diff --git a/zshfunc/vcs-info/vcs_info b/zshfunc/vcs-info/vcs_info
deleted file mode 100644
index 1a90aa6..0000000
--- a/zshfunc/vcs-info/vcs_info
+++ /dev/null
@@ -1,68 +0,0 @@
-vcs_info () { # {{{
-    local pat
-    local -i found
-    local -a VCSs disabled dps
-    local -x vcs usercontext
-    local -ix maxexports
-    local -ax msgs
-    local -Ax vcs_comm
-
-    vcs="init"
-    VCSs=(git hg bzr darcs svk mtn svn cvs cdv tla)
-    case $1 in
-        (print_systems_)
-            zstyle -a ":vcs_info:${vcs}:${usercontext}" "disable" disabled
-            print -l '# list of supported version control backends:' \
-                     '# disabled systems are prefixed by a hash sign (#)'
-            for vcs in ${VCSs} ; do
-                [[ -n ${(M)disabled:#${vcs}} ]] && printf '#'
-                printf '%s\n' ${vcs}
-            done
-            print -l '# flavours (cannot be used in the disable style; they' \
-                     '# are disabled with their master [git-svn -> git]):'   \
-                     git-{p4,svn}
-            return 0
-            ;;
-        ('')
-            [[ -z ${usercontext} ]] && usercontext=default
-            ;;
-        (*) [[ -z ${usercontext} ]] && usercontext=$1
-            ;;
-    esac
-
-    zstyle -T ":vcs_info:${vcs}:${usercontext}" "enable" || {
-        [[ -n ${VCS_INFO_message_0_} ]] && VCS_INFO_set --clear
-        return 0
-    }
-    zstyle -a ":vcs_info:${vcs}:${usercontext}" "disable" disabled
-
-    zstyle -a ":vcs_info:${vcs}:${usercontext}" "disable-patterns" dps
-    for pat in ${dps} ; do
-        if [[ ${PWD} == ${~pat} ]] ; then
-            [[ -n ${vcs_info_msg_0_} ]] && VCS_INFO_set --clear
-            return 0
-        fi
-    done
-
-    VCS_INFO_maxexports
-
-    (( found = 0 ))
-    for vcs in ${VCSs} ; do
-        [[ -n ${(M)disabled:#${vcs}} ]] && continue
-        vcs_comm=()
-        VCS_INFO_${vcs}_detect && (( found = 1 )) && break
-    done
-
-    (( found == 0 )) && {
-        VCS_INFO_set --nvcs
-        return 0
-    }
-
-    VCS_INFO_${vcs}_get_data || {
-        VCS_INFO_set --nvcs
-        return 1
-    }
-
-    VCS_INFO_set
-    return 0
-}
diff --git a/zshfunc/vcs-info/vcs_info_lastmsg b/zshfunc/vcs-info/vcs_info_lastmsg
deleted file mode 100644
index 6e00ddc..0000000
--- a/zshfunc/vcs-info/vcs_info_lastmsg
+++ /dev/null
@@ -1,14 +0,0 @@
-vcs_info_lastmsg () { # {{{
-    local -i i
-
-    VCS_INFO_maxexports
-    for i in {0..$((maxexports - 1))} ; do
-        printf '$VCS_INFO_message_%d_: "' $i
-        if zstyle -T ':vcs_info:formats:command' use-prompt-escapes ; then
-            print -nP ${(P)${:-VCS_INFO_message_${i}_}}
-        else
-            print -n ${(P)${:-VCS_INFO_message_${i}_}}
-        fi
-        printf '"\n'
-    done
-}
diff --git a/zshfunc/vcs-info/vcs_info_printsys b/zshfunc/vcs-info/vcs_info_printsys
deleted file mode 100644
index c585393..0000000
--- a/zshfunc/vcs-info/vcs_info_printsys
+++ /dev/null
@@ -1,3 +0,0 @@
-vcs_info_printsys () { # {{{
-    vcs_info print_systems_
-}
diff --git a/zshfunc/vcs-info/grml-vcs-info b/zshfunc/vcs_info
index a12f5bf..a12f5bf 100644
--- a/zshfunc/vcs-info/grml-vcs-info
+++ b/zshfunc/vcs_info