[PATCH] vcs_info, run-help: Remove Codeville (cdv), svk, GNU arch (tla).

[Daniel Shahaf <d.s@xxxxxxxxxxxxxxxxxx>]

While here, remove a superfluous comma.
---
Per workers/49604.

Cheers,

Daniel


 Doc/Zsh/contrib.yo                            | 33 +++++++--------
 Functions/Misc/run-help-svk                   |  1 -
 .../VCS_Info/Backends/VCS_INFO_detect_cdv     | 12 ------
 .../VCS_Info/Backends/VCS_INFO_detect_svk     | 40 -------------------
 .../VCS_Info/Backends/VCS_INFO_detect_tla     | 11 -----
 .../VCS_Info/Backends/VCS_INFO_get_data_cdv   | 11 -----
 .../VCS_Info/Backends/VCS_INFO_get_data_svk   | 14 -------
 .../VCS_Info/Backends/VCS_INFO_get_data_tla   | 13 ------
 README                                        |  4 ++
 9 files changed, 19 insertions(+), 120 deletions(-)
 delete mode 100644 Functions/Misc/run-help-svk
 delete mode 100644 Functions/VCS_Info/Backends/VCS_INFO_detect_cdv
 delete mode 100644 Functions/VCS_Info/Backends/VCS_INFO_detect_svk
 delete mode 100644 Functions/VCS_Info/Backends/VCS_INFO_detect_tla
 delete mode 100644 Functions/VCS_Info/Backends/VCS_INFO_get_data_cdv
 delete mode 100644 Functions/VCS_Info/Backends/VCS_INFO_get_data_svk
 delete mode 100644 Functions/VCS_Info/Backends/VCS_INFO_get_data_tla

diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index eb5bbafb2..4e27cc367 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -848,17 +848,14 @@ The following VCSs are supported, showing the abbreviated name by which
 they are referred to within the system:
 startsitem()
 sitem(Bazaar (tt(bzr)))(uref(https://bazaar.canonical.com/))
-sitem(Codeville (tt(cdv)))(uref(http://freecode.com/projects/codeville/))
 sitem(Concurrent Versioning System (tt(cvs)))(uref(https://www.nongnu.org/cvs/))
 sitem(Darcs (tt(darcs)))(uref(http://darcs.net/))
 sitem(Fossil (tt(fossil)))(uref(https://fossil-scm.org/))
 sitem(Git (tt(git)))(uref(https://git-scm.com/))
-sitem(GNU arch (tt(tla)))(uref(https://www.gnu.org/software/gnu-arch/))
 sitem(Mercurial (tt(hg)))(uref(https://www.mercurial-scm.org/))
 sitem(Monotone (tt(mtn)))(uref(https://monotone.ca/))
 sitem(Perforce (tt(p4)))(uref(https://www.perforce.com/))
 sitem(Subversion (tt(svn)))(uref(https://subversion.apache.org/))
-sitem(SVK (tt(svk)))(uref(https://svk.bestpractical.com/))
 endsitem()
 
 There is also support for the patch management system tt(quilt)
@@ -911,7 +908,6 @@ example(% vcs_info_printsys
 ## list of supported version control backends:
 ## disabled systems are prefixed by a hash sign (#)
 bzr
-cdv
 cvs
 darcs
 fossil
@@ -919,9 +915,7 @@ git
 hg
 mtn
 p4
-svk
 svn
-tla
 ## flavours (cannot be used in the enable or disable styles; they
 ## are enabled and disabled with their master [git-svn -> git])
 ## they *can* be used in contexts: ':vcs_info:git-svn:*'.
@@ -935,7 +929,7 @@ You may not want all of these because there is no point in running the
 code to detect systems you do not use.  So there is a way to disable
 some backends altogether:
 
-example(zstyle ':vcs_info:*' disable bzr cdv darcs mtn svk tla)
+example(zstyle ':vcs_info:*' disable bzr darcs mtn)
 
 You may also pick a few from that list and enable only those:
 
@@ -947,6 +941,12 @@ tt(enable) style - if you used that) marked as disabled by a hash sign.
 That means the detection of these systems is skipped em(completely). No
 wasted time there.
 
+Support for
+em(Codeville) (tt(cdv)),
+em(GNU arch) (tt(tla)),
+and
+em(SVK) (tt(svk))
+has been removed (but can be resurrected if needed).
 
 texinode(vcs_info Configuration)(vcs_info Oddities)(vcs_info Quickstart)(Version Control Information)
 subsect(Configuration)
@@ -959,8 +959,8 @@ example(:vcs_info:var(vcs-string):var(user-context):var(repo-root-name))
 startitem()
 item(var(vcs-string))(
 is one of: tt(git), tt(git-svn), tt(git-p4), tt(hg), tt(hg-git),
-tt(hg-hgsubversion), tt(hg-hgsvn), tt(darcs), tt(bzr), tt(cdv), tt(mtn),
-tt(svn), tt(cvs), tt(svk), tt(tla), tt(p4) or tt(fossil).
+tt(hg-hgsubversion), tt(hg-hgsvn), tt(darcs), tt(bzr), tt(mtn),
+tt(svn), tt(cvs), tt(p4) or tt(fossil).
 This is followed by `tt(.quilt-)var(quilt-mode)' in Quilt mode
 (see ifzman(bf(Quilt Support))ifnzman(noderef(vcs_info Quilt Support)) for details)
 and by `tt(+)var(hook-name)' while hooks are active
@@ -1245,7 +1245,7 @@ The default values for these styles in all contexts are:
 startsitem()
 sitem(tt(formats))(" (%s)-[%b]%u%c-")
 sitem(tt(actionformats))(" (%s)-[%b|%a]%u%c-")
-sitem(tt(branchformat))("%b:%r" (for bzr, svn, svk and hg))
+sitem(tt(branchformat))("%b:%r" (for bzr, svn and hg))
 sitem(tt(nvcsformats))("")
 sitem(tt(hgrevformat))("%r:%h")
 sitem(tt(max-exports))(2)
@@ -1808,11 +1808,11 @@ subsect(Examples)
 Don't use tt(vcs_info) at all (even though it's in your prompt):
 example(zstyle ':vcs_info:*' enable NONE)
 
-Disable the backends for tt(bzr) and tt(svk):
-example(zstyle ':vcs_info:*' disable bzr svk)
+Disable the backends for tt(bzr) and tt(cvs):
+example(zstyle ':vcs_info:*' disable bzr cvs)
 
-Disable everything em(but) tt(bzr) and tt(svk):
-example(zstyle ':vcs_info:*' enable bzr svk)
+Disable everything em(but) tt(bzr) and tt(cvs):
+example(zstyle ':vcs_info:*' enable bzr cvs)
 
 Provide a special formats for tt(git):
 example(zstyle ':vcs_info:git:*' formats       ' GIT, BABY! [%b]'
@@ -4402,7 +4402,6 @@ findex(run-help-ip)
 findex(run-help-openssl)
 findex(run-help-p4)
 findex(run-help-sudo)
-findex(run-help-svk)
 findex(run-help-svn)
 xitem(tt(run-help-btrfs))
 xitem(tt(run-help-git))
@@ -4410,7 +4409,6 @@ xitem(tt(run-help-ip))
 xitem(tt(run-help-openssl))
 xitem(tt(run-help-p4))
 xitem(tt(run-help-sudo))
-xitem(tt(run-help-svk))
 item(tt(run-help-svn))(
 Assistant functions for the
 tt(btrfs),
@@ -4419,9 +4417,8 @@ tt(ip),
 tt(openssl),
 tt(p4),
 tt(sudo),
-tt(svk),
 and 
-tt(svn),
+tt(svn)
 commands.
 )
 enditem()
diff --git a/Functions/Misc/run-help-svk b/Functions/Misc/run-help-svk
deleted file mode 100644
index 782538246..000000000
--- a/Functions/Misc/run-help-svk
+++ /dev/null
@@ -1 +0,0 @@
-svk help $1 | ${=PAGER:-more}
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_cdv b/Functions/VCS_Info/Backends/VCS_INFO_detect_cdv
deleted file mode 100644
index a0324533a..000000000
--- a/Functions/VCS_Info/Backends/VCS_INFO_detect_cdv
+++ /dev/null
@@ -1,12 +0,0 @@
-## vim:ft=zsh
-## codeville support by: Frank Terbeck <ft@xxxxxxxxxxxxxxxxxxx>
-## Distributed under the same BSD-ish license as zsh itself.
-
-setopt localoptions NO_shwordsplit
-
-[[ $1 == '--flavours' ]] && return 1
-
-VCS_INFO_check_com ${vcs_comm[cmd]} || return 1
-vcs_comm[detect_need_file]=format
-VCS_INFO_bydir_detect '.cdv'
-return $?
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_svk b/Functions/VCS_Info/Backends/VCS_INFO_detect_svk
deleted file mode 100644
index e21b2dd73..000000000
--- a/Functions/VCS_Info/Backends/VCS_INFO_detect_svk
+++ /dev/null
@@ -1,40 +0,0 @@
-## vim:ft=zsh
-## svk support by: Frank Terbeck <ft@xxxxxxxxxxxxxxxxxxx>
-## Distributed under the same BSD-ish license as zsh itself.
-
-setopt localoptions NO_shwordsplit
-
-[[ $1 == '--flavours' ]] && 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_get_data_svk() gets simpler, too. :-)
-
-setopt localoptions noksharrays extendedglob
-local -i fhash
-fhash=0
-
-VCS_INFO_check_com ${vcs_comm[cmd]} || return 1
-[[ -f ~/.svk/config ]] || return 1
-
-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/Functions/VCS_Info/Backends/VCS_INFO_detect_tla b/Functions/VCS_Info/Backends/VCS_INFO_detect_tla
deleted file mode 100644
index ac4dbd736..000000000
--- a/Functions/VCS_Info/Backends/VCS_INFO_detect_tla
+++ /dev/null
@@ -1,11 +0,0 @@
-## vim:ft=zsh
-## gnu arch support by: Frank Terbeck <ft@xxxxxxxxxxxxxxxxxxx>
-## Distributed under the same BSD-ish license as zsh itself.
-
-setopt localoptions NO_shwordsplit
-
-[[ $1 == '--flavours' ]] && return 1
-
-VCS_INFO_check_com ${vcs_comm[cmd]} || return 1
-vcs_comm[basedir]="$(${vcs_comm[cmd]} tree-root 2> /dev/null)" && return 0
-return 1
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_cdv b/Functions/VCS_Info/Backends/VCS_INFO_get_data_cdv
deleted file mode 100644
index 4f8118489..000000000
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_cdv
+++ /dev/null
@@ -1,11 +0,0 @@
-## vim:ft=zsh
-## codeville support by: Frank Terbeck <ft@xxxxxxxxxxxxxxxxxxx>
-## Distributed under the same BSD-ish license as zsh itself.
-
-setopt localoptions NO_shwordsplit
-local cdvbase
-
-cdvbase=${vcs_comm[basedir]}
-rrn=${cdvbase:t}
-VCS_INFO_formats '' "${cdvbase:t}" "${cdvbase}" '' '' '' ''
-return 0
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svk b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svk
deleted file mode 100644
index 149e30222..000000000
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svk
+++ /dev/null
@@ -1,14 +0,0 @@
-## vim:ft=zsh
-## svk support by: Frank Terbeck <ft@xxxxxxxxxxxxxxxxxxx>
-## Distributed under the same BSD-ish license as zsh itself.
-
-setopt localoptions NO_shwordsplit
-local svkbranch svkbase
-local -A hook_com
-
-svkbase=${vcs_comm[basedir]}
-rrn=${svkbase:t}
-VCS_INFO_set-branch-format "${vcs_comm[branch]}" "${vcs_comm[revision]}" &&
-    svkbranch="${REPLY}"
-VCS_INFO_formats '' "${svkbranch}" "${svkbase}" '' '' "${vcs_comm[revision]}" ''
-return 0
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_tla b/Functions/VCS_Info/Backends/VCS_INFO_get_data_tla
deleted file mode 100644
index 4e9cee8b9..000000000
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_tla
+++ /dev/null
@@ -1,13 +0,0 @@
-## vim:ft=zsh
-## gnu arch support by: Frank Terbeck <ft@xxxxxxxxxxxxxxxxxxx>
-## Distributed under the same BSD-ish license as zsh itself.
-
-setopt localoptions extendedglob NO_shwordsplit
-local tlabase tlabranch
-
-tlabase=${vcs_comm[basedir]:P}
-rrn=${tlabase:t}
-# tree-id gives us something like 'foo@xxxxxxxxxxx/demo--1.0--patch-4', so:
-tlabranch=${${"$( ${vcs_comm[cmd]} tree-id )"}/*\//}
-VCS_INFO_formats '' "${tlabranch}" "${tlabase}" '' '' '' ''
-return 0
diff --git a/README b/README
index 353667289..5c781d4e7 100644
--- a/README
+++ b/README
@@ -104,6 +104,10 @@ consistent with most other sh implementations.
 getopts now calculates OPTIND in a similar manner to other shells when the
 POSIX_BUILTINS option is enabled.
 
+vcs_info: The Codeville (cdv), SVK (svk), and GNU arch (tla) backends have been
+removed since the respective version control systems seem no longer used and
+their maintenance cost was non-zero.
+
 Incompatibilities between 5.7.1 and 5.8
 ---------------------------------------