diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Completion/Unix/Command/_cvs | 46 |
2 files changed, 32 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog index 2defb551d..caee0d5da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-09-06 Oliver Kiddle <opk@zsh.org> + + * 17632: Completion/Unix/Command/_cvs: add descriptions for keyword + substitutions + 2002-09-06 Clint Adams <clint@zsh.org> * 17629: Completion/Unix/Command/_ssh: patch from Juergen Erhard @@ -18,7 +23,7 @@ * unposted: Completion/Unix/Command/_lynx, Completion/Unix/Command/_links: minor bug fix (missing -g) - * Thomas Köhler: 176xx: Completion/Unix/Command/_ssh: also pass + * Thomas Köhler: 17610: Completion/Unix/Command/_ssh: also pass through -F option * 17607: Completion/Unix/Command/_ssh: pass through options such as diff --git a/Completion/Unix/Command/_cvs b/Completion/Unix/Command/_cvs index 0a5646780..f4e8bf8eb 100644 --- a/Completion/Unix/Command/_cvs +++ b/Completion/Unix/Command/_cvs @@ -125,7 +125,7 @@ _cvs_admin_t () { _cvs_annotate () { # "+lr:D:fR" _arguments -s \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '-f[use head revision]' \ '(-l)-R[recursive]' \ '(-f -D)-r+[specify revision]:tag:_cvs_revisions' \ @@ -137,7 +137,7 @@ _cvs_annotate () { _cvs_rannotate () { # "+lr:D:fR" _arguments -s \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '-f[use head revision]' \ '(-l)-R[recursive]' \ '(-f -D)-r+[specify revision]:tag:_cvs_revisions' \ @@ -153,7 +153,7 @@ _cvs_checkout () { '-A[reset sticky tags, dates and -k]' \ '-n[disable checkout program]' \ '-f[use most recent revision if -D/-r is not matched]' \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '(-l)-R[recursive]' \ '(-s)-c[module database]' \ '(-c)-s[module database with status]' \ @@ -171,7 +171,7 @@ _cvs_commit () { # "+nlRm:fF:r:" _arguments -s \ '-n[disable module program]' \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '(-l)-R[recursive]' \ '-f[force to commit]' \ '(-F)-m+[message]:message:_cvs_m' \ @@ -217,7 +217,7 @@ _cvs_diff () { # "+abcdefhilnpstuw0123456789BHNRC:D:F:I:L:U:V:W:k:r:" _arguments -s \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '(-l)-R[recursive]' \ '-k+[keyword]:keyword substitution:_cvs_k' \ '(-r)-D+[specify date]:date:_cvs_D' \ @@ -299,7 +299,7 @@ _cvs_diff_arg () { _cvs_edit () { # "+lRa:" _arguments -s \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '(-l)-R[recursive]' \ '-a+[specify action]:action:(edit unedit commit all none)' \ '*:file:_cvs_files' @@ -309,7 +309,7 @@ _cvs_edit () { _cvs_editors () { # "+lR" _arguments -s \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '(-l)-R[recursive]' \ '*:file:_cvs_files' } @@ -321,7 +321,7 @@ _cvs_export () { '-N[don'\''t shorten module paths]' \ '-n[disable checkout program]' \ '-f[use most recent revision if -D/-r is not matched]' \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '(-l)-R[recursive]' \ '-k+[keyword]:keyword substitution:_cvs_k' \ '-d+[directory]:directory:_files -/' \ @@ -415,7 +415,7 @@ _cvs_rlog () { _arguments -s \ '-b[default branch]' \ '(-t)-h[header]' \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '(-l)-R[recursive]' \ '-N[don'\''t list tags]' \ '(-h)-t[header with descriptive text]' \ @@ -444,7 +444,7 @@ _cvs_rdiff () { '-u[output a unified diff]' \ '-f[use most recent revision if -D/-r is not matched]' \ '-s[short patch]' \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '(-l)-R[recursive]' \ '-V+[specify version]:version:' \ '-k+[keyword]:keyword substitution:_cvs_k' \ @@ -469,7 +469,7 @@ _cvs_remove () { # "+flR" _arguments -s \ '-f[force to remove]' \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '(-l)-R[recursive]' \ '*:removed file:_cvs_remove_arg' } @@ -491,7 +491,7 @@ _cvs_rtag () { '(-d)-a[clear tag from removed files]' \ '-n[disable tag program]' \ '(-d)-f[force a head revision]' \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '(-l)-R[recursive]' \ '(-b)-d[delete tag]' \ '(-d)-b[create branch]' \ @@ -506,7 +506,7 @@ _cvs_status () { # "+vlR" _arguments -s \ '-v[verbose]' \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '(-l)-R[recursive]' \ '*:file:_cvs_files' } @@ -516,7 +516,7 @@ _cvs_tag () { # "+FQqlRcdr:D:bf" _arguments -s \ '(-d)-F[move tag if already exists]' \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '(-l)-R[recursive]' \ '-c[check that working files unmodified]' \ '(-b)-d[delete tag]' \ @@ -532,7 +532,7 @@ _cvs_tag () { _cvs_unedit () { # "+lR" _arguments -s \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '(-l)-R[recursive]' \ '*:file:_cvs_files' } @@ -546,7 +546,7 @@ _cvs_update () { '-p[check out to standard output]' \ '-P[prune empty directory]' \ '-f[use head revision]' \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '(-l)-R[recursive]' \ '-d[create directories]' \ '-k+[keyword]:keyword substitution:_cvs_k' \ @@ -568,14 +568,14 @@ _cvs_watch () { case "$words[2]" in on|off) # "+lR" _arguments -s \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '(-l)-R[recursive]' \ ':watch command:' \ '*:file:_cvs_files' ;; add|remove) # "+lRa:" _arguments -s \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '(-l)-R[recursive]' \ '*-a+[specify action]:action:(edit unedit commit all none)' \ ':watch command:' \ @@ -589,7 +589,7 @@ _cvs_watch () { _cvs_watchers () { # "+lR" _arguments -s \ - '(-R)-l[don'\''t recursive]' \ + "(-R)-l[don't recurse]" \ '(-l)-R[recursive]' \ '*:file:_cvs_files' } @@ -674,7 +674,13 @@ _cvs_D () { (( $+functions[_cvs_k] )) || _cvs_k () { - _tags values && compadd "$@" kv kvl k o b v + _values 'keyword substitution' \ + 'kv[generate keyword strings using the default form]' \ + "kvl[include locker's name in strings if given revision is locked]" \ + 'k[generate only keyword names in keyword strings; omit their values]' \ + 'o[generate the old keyword string as present in the file before check in]' \ + "b[binary - like \`o' but also inhibit line ending conversions]" \ + 'v[generate only keyword values for keyword strings]' } (( $+functions[_cvs_m] )) || |