Rev 5273: (lifeless) Drop unmaintained zsh completion script. (Martin von Gagern) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon May 31 21:21:09 BST 2010
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 5273 [merge]
revision-id: pqm at pqm.ubuntu.com-20100531202104-cbjsq49mc53mpiqo
parent: pqm at pqm.ubuntu.com-20100531031128-ivepowe8tgsf6ury
parent: martin.vgagern at gmx.net-20100528115522-ly7caaryo0iinbdx
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2010-05-31 21:21:04 +0100
message:
(lifeless) Drop unmaintained zsh completion script. (Martin von Gagern)
removed:
contrib/zsh/_bzr _bzr-20050503074841-b2f107964e03958e
added:
contrib/zsh/README readme-20100525113341-dnkskjys4sc9l4h0-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
=== modified file 'NEWS'
--- a/NEWS 2010-05-28 06:52:00 +0000
+++ b/NEWS 2010-05-31 20:21:04 +0000
@@ -80,6 +80,10 @@
construction if there is no __doc__ set. (Note, this will be reverted in
2.2b4) (Robert Collins)
+* The source tree no longer contains a contrib/zsh/_bzr completion
+ script. The new file contrib/zsh/README suggests alternatives.
+ (Martin von Gagern, #560030)
+
New Features
************
=== added file 'contrib/zsh/README'
--- a/contrib/zsh/README 1970-01-01 00:00:00 +0000
+++ b/contrib/zsh/README 2010-05-25 11:34:35 +0000
@@ -0,0 +1,19 @@
+This directory used to contain a shell completion function for zsh.
+That script has been unmaintained since 2005, though. Zsh itself does
+ship a _bzr completion function, and has done so for quite some time
+now. So we suggest you use the version installed with your zsh
+instead of the version that used to be located in this directory.
+
+Note that the shell-complete builtin of bzr does provide completion
+information in a style suitable for zsh. There are some completion
+scripts for zsh in the wild that make use of this feature, although
+none of these scripts is officially supported by the bzr developers.
+
+Also note that recent versions of bzr (starting with the 2.3 series)
+do include a bash_completion plugin. It should be possible to improve
+this in such a way that it generates code for zsh instead of bash. So
+if you want better zsh completion, this might be the place to start.
+
+References:
+https://bugs.launchpad.net/bzr/+bug/560030
+http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=history;f=Completion/Unix/Command/_bzr
=== removed file 'contrib/zsh/_bzr'
--- a/contrib/zsh/_bzr 2005-11-18 08:10:07 +0000
+++ b/contrib/zsh/_bzr 1970-01-01 00:00:00 +0000
@@ -1,316 +0,0 @@
-#compdef bzr
-
-# Rudimentary zsh completion support for bzr.
-
-# -S means there are no options after a -- and that argument is ignored
-
-# To use this you must arrange for it to be in a directory that is on
-# your $fpath, and also for compinit to be run. I don't understand
-# how to get zsh to reload this file when it changes, other than by
-# starting a new zsh.
-
-local _bzr_subcommands expl curcontext="$curcontext" state line
-local bzrRoot helpArgs parentFile
-typeset -A opt_args
-
-helpArgs=( '(--help)-h[show help message]' '(-h)--help[show help message]' )
-bzrRoot=$(bzr root 2> /dev/null)
-parentFile=$bzrRoot/.bzr/parent
-
-if [[ $service == "bzr" ]]; then
- _arguments -C -A "-*" \
- '*::command:->subcmd' && return 0
-
- if (( CURRENT == 1 )); then
- _bzr_subcommands=(${(f)"$(_call_program bzr bzr shell-complete)"})
- _describe -t subcommand 'subcommand' _bzr_subcommands
- return
- fi
-
- service="$words[1]"
- curcontext="${curcontext%:*}=$service:"
-fi
-
-_unknownFiles() {
- local fileList;
- fileList=(${(ps:\0:)"$(bzr ls --null --unknown)"})
- compadd -af fileList
- return 0
-}
-
-_unknownRoot() {
- local fileList;
- fileList=(${(ps:\0:)"$(bzr ls --null --from-root --unknown)"})
- compadd -af fileList
- return 0
-}
-
-_versionedFiles() {
- local fileList;
- fileList=(${(ps:\0:)"$(bzr ls --null --versioned)"})
- compadd -af fileList
- return 0
-}
-
-case $service in
- (add)
- _arguments $helpArgs \
- '--no-recurse[do not recurse into subdirectories]' \
- '(-q)--quiet' \
- '(--quiet)-q' \
- '*:unknown files:_unknownFiles'
- ;;
-
- (annotate|praise|blame)
- _arguments $helpArgs '*:files:_versionedFiles'
- ;;
-
- (clone|branch|get)
- if (( CURRENT == 2 )); then
- _arguments $helpArgs \
- '(-r)--revision:rev:' \
- '(--revision)-r:rev:' \
- '--basis[specify basis branch]:basis:' \
- '*:FROM_LOCATION:_files -/'
- elif (( CURRENT == 3 )); then
- _arguments $helpArgs \
- '(-r)--revision:rev:' \
- '(--revision)-r:rev:' \
- '--basis[specify basis branch]:basis:' \
- '*:TO_LOCATION:_files -/'
- fi
- ;;
-
- (rename|mv)
- if (( CURRENT == 2 )); then
- _arguments $helpArgs '*:old name:_versionedFiles'
- else
- _arguments $helpArgs '*:new name:'
- fi
- ;;
-
- (cat)
- _arguments $helpArgs \
- '(-r)--revision:rev:' \
- '(--revision)-r:rev:' \
- '*:file:_versionedFiles'
- ;;
-
- (root)
- _arguments $helpArgs '*:file:_files'
- ;;
-
- (log)
- _arguments $helpArgs \
- '(-r)--revision[revision or range]:rev or rev range:' \
- '(--revision)-r[revision or range]:rev or rev range:' \
- '(--verbose)-v[show revision manifest]' \
- '(-v)--verbose[show revision manifest]' \
- '(--short --long)-l[use long format (default)]' \
- '(--short -l)--long[use long format (default)]' \
- '(-l --long)--short[use short format]' \
- '(--message)-m[specify regexp]:regexp:' \
- '(-m)--message[specify regexp]:regexp:' \
- '--show-ids[show file IDs]' \
- '--forward[reverse direction of revisions]' \
- '--timezoe[specify timezone for dates]:timezone:' \
- '*:file:_versionedFiles'
- ;;
-
- (resolve)
- _arguments $helpArgs '--all' '*:file:_versionedFiles'
- ;;
-
- (status|st|stat)
- _arguments $helpArgs \
- '--all[include unchanged versioned files]' \
- '--show-ids[show file IDs]' \
- '*:file:_versionedFiles'
- ;;
-
- (check)
- _arguments $helpArgs \
- '(--verbose)-v' \
- '(-v)--verbose' \
- '*:DIR:_files -/'
- ;;
-
- (mkdir|upgrade|renames)
- _arguments $helpArgs '*:DIR:_files -/'
- ;;
-
- (remove|rm)
- _arguments $helpArgs \
- '(--verbose)-v' \
- '(-v)--verbose' \
- '*:file:_versionedFiles'
- ;;
-
- (pull)
- _arguments $helpArgs \
- '--remember[Remember the specified location as a default]' \
- '--overwrite[Ignore differences, overwrite unconditionally]' \
- '*:local repository:_files -/'
- [[ -r $parentFile ]] && compadd -X "Completing parents" $(cat $parentFile)
- ;;
-
- (missing|miss|mis)
- _arguments $helpArgs \
- '(--verbose -q --quiet)-v' \
- '(-v -q --quiet)--verbose' \
- '(--verbose -v --quiet)-q' \
- '(-v -q --verbose)--quiet' \
- '*:local repository:_files -/'
- [[ -r $parentFile ]] && compadd -X "Completing parents" $(cat $parentFile)
- ;;
-
- (commit|checkin|ci)
- _arguments $helpArgs \
- '(--message)-m[commit message]:message text:' \
- '(-m)--message[commit message]:message text:' \
- '(--file)-F[commit message from file]:message file:' \
- '(-F)--file[commit message from file]:message file:' \
- '--unchanged[include unchanged files]' \
- '(--verbose)-v' \
- '(-v)--verbose' \
- '*:modified files:_versionedFiles'
- ;;
-
- (conflicts|added|deleted|modified|unknowns|directories|ignored)
- _arguments $helpArgs
- ;;
-
- (revno|init|version)
- _arguments $helpArgs
- ;;
-
- (whoami)
- _arguments $helpArgs '--email[only show e-mail address]'
- ;;
-
- (inventory)
- _arguments $helpArgs \
- '(-r)--revision[show inventory of a revision]:revision:' \
- '(--revision)-r[show inventory of a revision]:revision:' \
- '--show-ids[show file IDs]'
- ;;
-
- (diff|dif|di)
- _arguments $helpArgs \
- '(-r)--revision:revision:' \
- '(--revision)-r:revision:' \
- '--diff-options[options to pass to gdiff]:diff options:' \
- '*:files:_files'
- ;;
-
- (export)
- _arguments $helpArgs \
- '(-r)--revision:revision:' \
- '(--revision)-r:revision:' \
- '--format=[format of exported file]:format:(dir tar tgz tbz2)' \
- '--root[root directory of patch]:_files -/' \
- '*:destination:_files'
- ;;
-
- (ignore)
- _arguments $helpArgs '*:NAME_PATTERN:_unknownRoot'
- ;;
-
- (info)
- _arguments $helpArgs '*:branch:_files -/'
- ;;
-
- (testament)
- _arguments $helpArgs \
- '(-r)--revision:revision:' \
- '(--revision)-r:revision:' \
- '(--long)-l' \
- '(-l)--long' \
- '*:branch:_files -/'
- ;;
-
- (revert|merge-revert)
- _arguments $helpArgs \
- '(-r)--revision:revision:' \
- '(--revision)-r:revision:' \
- '--no-backup[skip generation of backup~ files]' \
- '*:file:_versionedFiles'
- ;;
-
- (merge)
- _arguments $helpArgs \
- '(-r)--revision:revision:' \
- '(--revision)-r:revision:' \
- '--reprocess[Reprocess to reduce spurious conflicts]' \
- '--show-base[Show base revision text in conflicts]' \
- '--force[ignore uncommitted changes]' \
- '--merge-type:merge type:(diff3 merge3 weave)' \
- '*:local repository:_files -/'
- [[ -r $parentFile ]] && compadd -X "Completing parents" $(cat $parentFile)
- ;;
-
- (ls)
- _arguments $helpArgs \
- '(--verbose)-v[display more information]' \
- '(-v)--verbose[display more information]' \
- '(-r)--revision:revision:' \
- '(--revision)-r:revision:' \
- '--from-root[Print all paths from the root of the branch]' \
- '--non-recursive[Do not recurse into subdirectories]' \
- '--null[Null separate the files]' \
- '--ignored[Print ignored files]' \
- '--unknown[Print unknown files]' \
- '--versioned[Print versioned files]'
- ;;
-
- (move)
- if (( CURRENT == 2 )); then
- _arguments $helpArgs '*:files:_versionedFiles'
- else
- _arguments '*:destination dir:_files -/'
- fi
- ;;
-
- (help)
- _bzr_subcommands=(${(f)"$(_call_program bzr bzr shell-complete)"})
- _arguments $helpArgs \
- '(--long)-l' \
- '(-l)--long' \
- '*:subcmds:->cmds'
- _describe -t subcommand 'subcommand' _bzr_subcommands
- ;;
-
- # Plugins
-
- (visualize|visualise|viz|vis)
- _arguments $helpArgs \
- '(-r)--revision[starting revision]:rev:' \
- '(--revision)-r[starting revision]:rev:'
- ;;
-
- (gannotate|gblame|gpraise)
- _arguments $helpArgs \
- '--all[show annotations on all lines]' \
- '--plain[do not hightlight annotation lines]' \
- '*:files:_versionedFiles'
- ;;
-
- (push)
- _arguments $helpArgs \
- '--overwrite[Ignore differences, overwrite unconditionally]' \
- '*:local repository:_files -/'
- [[ -r $parentFile ]] && compadd -X "Completing parents" $(cat $parentFile)
- ;;
-
- (clean-tree)
- _arguments $helpArgs \
- '--dry-run[show files to delete instead of deleting them]' \
- '--ignored[delete all ignored files]' \
- '--detritus[delete conflict files, merge backups, failed self-tests, *~, *.tmp, etc]'
- ;;
-
-
- (*)
- _message "unknown bzr command completion: $service"
- ;;
-esac
More information about the bazaar-commits
mailing list