From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7370 invoked by alias); 3 Sep 2016 08:48:10 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 39165 Received: (qmail 13307 invoked from network); 3 Sep 2016 08:48:10 -0000 X-Qmail-Scanner-Diagnostics: from nm18-vm7.bullet.mail.ir2.yahoo.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(212.82.96.231):SA:0(0.0/5.0):. Processed in 1.216463 secs); 03 Sep 2016 08:48:10 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM,SPF_PASS, T_DKIM_INVALID,T_FILL_THIS_FORM_SHORT autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: okiddle@yahoo.co.uk X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _spf.mail.yahoo.com designates 212.82.96.231 as permitted sender) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.uk; s=s2048; t=1472892078; bh=LZKSwEPcZpEgvqQZZjC5m87qG7MKtwRDe6PWtgXR9sY=; h=From:To:Subject:Date:From:Subject; b=GWCzJzxC9iuq7HMiPiGyq8eOQA345uz9iUqeE923Xy8H63doPFf9T0IOJHUXPDuQySqCnOeBYWodXHoCg9YPSPhbbwpJttJW5GKKS/Ort30gl68qYCRGtMmgUhnTHkGA0j+DkLkXtXoDltPovOgxzfaeFcdHENMt3LEbi/+ObLQ7c+gX8g3MLuc7VkJgz3o3JoPtQk2EW8JkaiOYFL6QmhFzjb6mbrRF9Uc3io4ekusn215MGtMMzcKNQOcI25rTmhJ6Xm8vm6tyZk22BkC2RLogU0cBsHoEFptB/t27nUpslllMzv/yPli8XOzf/tn+2RsYZ0VMX4FEvTnoWAWHfw== X-Yahoo-Newman-Id: 445009.95456.bm@smtp148.mail.ir2.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: j0c5xA0VM1kzShDXMwBSSttpaXrrSL5toALF_NXwpcY.dFP 5VNkjEHJeW6rdwsXJRFlES3XCDRj3VJFxJ4Xq3KNeRdPf7fytRn_UZQm1ssM RVTamjN_fuPHNXj4CHWj04aFiyhKk27.APDP1ntRKPirTSk5Cuw6iDWpPB0l .I.1k6orNE76o6iXM2pWL.2Wo9xaVfd0p3gmqC6yDjoDYawxtOSy9ldS2s8f ttHKWjMLtMbV.UekRXCmN8Z_ZMK.hFW.GUoIkqS.QvV.2UYS0nNcByUiE5Sj VqpJWNEX42qy4YmCvwlSqGBYuYff_PrnvLmMO72UXSP0IfDdcqbXVF52wr3h C5zq.EAzKmyqtiSgXKXEfGUnpG2vw7_W_E0i1xExZc10GGwEPNryJF0frSHo s.lc.avtTkAWGNEzoHDpUsQw5_utfkBgnPMPcLiYKUM5icsgeaNTeSuMphJW BbVynk7y0I0Af2cwfYEXySIEbIBkFIqI7rJLgw1Yw7JsFRL0hqTcrGHcLAKi mtXoMQvrWB.5hUfKcPRuwhKj2UadJWz5Pv1q1G5ZrrsI- X-Yahoo-SMTP: opAkk_CswBAce_kJ3nIPlH80cJI- From: Oliver Kiddle To: Zsh workers Subject: PATCH: completion updates for new options MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <34310.1472892077.1@hydra.kiddle.eu> Content-Transfer-Encoding: quoted-printable Date: Sat, 03 Sep 2016 10:41:17 +0200 Message-ID: <34311.1472892077@hydra.kiddle.eu> This is another batch of updates for options added in newer versions of various software. Specifically: _git: updated for 2.10.0 which was only just released this morning. _ss: 160808, new --kill and --no-header options _ant: 1.9.2 which isn't the latest, only a -silent option. _dmidecode: 3.0, options for dumping data to a file _espeak: 1.48.03, quite a few changes _look: long options on linux where it is util-linux 2.28.1 _md5sum: coreutils 8.25, new --ignore-missing option _patch: GNU 2.7.5 plus some fixes to the patterns for FreeBSD and Solaris _prove: 3.36, only a -V alias for --version _tin: 2.4.0: was out-of-date by many years but only adds IPv4/6 options Oliver diff --git a/Completion/Linux/Command/_ss b/Completion/Linux/Command/_ss index 520fd4b..90d83a4 100644 --- a/Completion/Linux/Command/_ss +++ b/Completion/Linux/Command/_ss @@ -32,7 +32,9 @@ _arguments -C -s \ "($info -d --dccp)"{-d,--dccp}'[display DCCP sockets]' \ "($info -w --raw)"{-w,--raw}'[display RAW sockets]' \ "($info -x --unix)"{-x,--unix}'[display Unix domain sockets]' \ - "($info -f --family)"{-f,--family}'[display sockets of specified type]:= family:(unix inet inet6 link netlink)' \ + "($info -f --family)"{-f,--family}'[display sockets of specified type]:= family:(unix inet inet6 link netlink unix)' \ + "($info -K --kill)"{-K,--kill}'[forcibly close sockets, display what wa= s closed]' \ + "($info -H --no-header)"{-H,--no-header}'[suppress header line]' \ "($info -A --query --socket)"{-A,--query,--socket}'[specify socket tabl= es to show]: :_values -s , socket\ table all inet tcp udp raw unix packet = netlink unix_dgram unix_stream unix_seqpacket packet_raw packet_dgram' \ "($info -D)"{-D,--diag=3D}'[dump raw info to file]:file:_files' \ "($info -F)"{-F,--filter=3D}'[read filter information from a file]:file= :_files' \ diff --git a/Completion/Unix/Command/_ant b/Completion/Unix/Command/_ant index ee9f7d9..195a543 100644 --- a/Completion/Unix/Command/_ant +++ b/Completion/Unix/Command/_ant @@ -41,6 +41,7 @@ _arguments -C \ '(- *)-version[display version information]' \ '(- *)-diagnostics[print information helpful to diagnosis or report pro= blems]' \ '(-q -quiet)'{-q,-quiet}'[be extra quiet]' \ + '(-s -silent)'{-s,-silent}'[print nothing but task outputs and build fa= ilures]' \ '(-v -verbose)'{-v,-verbose}'[be extra verbose]' \ '(-d -debug)'{-d,-debug}'[print debugging information]' \ '(-e -emacs)'{-e,-emacs}'[produce logging information without adornment= s]' \ diff --git a/Completion/Unix/Command/_dmidecode b/Completion/Unix/Command/= _dmidecode index 0ff5611..5701a94 100644 --- a/Completion/Unix/Command/_dmidecode +++ b/Completion/Unix/Command/_dmidecode @@ -1,10 +1,13 @@ #compdef dmidecode = -_arguments \ - '(-d --dev-mem)'{-d,--dev-mem}':memory device:_files' \ +_arguments -s \ + '(-d --dev-mem --from-dump)'{-d+,--dev-mem=3D}'[read memory from specif= ied file]:memory device [/dev/mem]:_files' \ + '(-)'{-h,--help}'[display usage information]' \ '(-q --quiet -u --dump)'{-q,--quiet}'[be less verbose]' \ - '(-t --type -u --dump -s --string)'{-s,--string}':DMI string:(bios-vend= or bios-version bios-release-date system-manufacturer system-product-name = system-version system-serial-number system-uuid baseboard-manufacturer bas= eboard-product-name baseboard-version baseboard-serial-number baseboard-as= set-tag chassis-manufacturer chassis-type chassis-version chassis-serial-n= umber chassis-asset-tag processor-family processor-manufacturer processor-= version processor-frequency)' \ - '(-t --type)'{-t,--type}':types to display:(bios system baseboard chass= is processor memory cache connector slot)' \ - '(-q --quiet -u --dump -s --string)'{-u,--dump}'[do not decode]' \ - '(-h --help)'{-h,--help}'[display usage information]' \ - '(-V --version)'{-V,--version}'[display version information]' + '(--type -u --dump --dump-bin -s --string)'{-s+,--string=3D}':DMI strin= g:(bios-vendor bios-version bios-release-date system-manufacturer system-p= roduct-name system-version system-serial-number system-uuid baseboard-manu= facturer baseboard-product-name baseboard-version baseboard-serial-number = baseboard-asset-tag chassis-manufacturer chassis-type chassis-version chas= sis-serial-number chassis-asset-tag processor-family processor-manufacture= r processor-version processor-frequency)' \ + '*(-s --string --dump-bin)'{-t+,--type=3D}'[only display entries of spe= cified type]:entry type:(bios system baseboard chassis processor memory ca= che connector slot)' \ + '(-q --quiet -u --dump -s --string)'{-u,--dump}"[don't decode entries]"= \ + '--dump-bin=3D[dump DMI data to a binary file]:file:_files' \ + '(-d --dev-mem)--from-dump=3D[read DMI data from a binary file]:file:_f= iles' \ + "--no-sysfs[don't attempt to read DMI data from sysfs files]" \ + '(-)'{-V,--version}'[display version information]' diff --git a/Completion/Unix/Command/_espeak b/Completion/Unix/Command/_es= peak index d868c79..4ab443b 100644 --- a/Completion/Unix/Command/_espeak +++ b/Completion/Unix/Command/_espeak @@ -1,33 +1,46 @@ #compdef espeak = -#TODO: complete non-existing filenames for -w and --phonout -#TODO: describe special cases for -k -#TODO: complete --punct better? +local curcontext=3D"$curcontext" state line expl ret=3D1 +typeset -A opt_args = -_arguments \ - '-h[help]' \ - '-f[file to speak]:text file:_files' \ - '--stdin[speak from stdin]' \ - '-q[quiet, no sound output]' \ - '-a[amplitude]:integer:(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 -18 19 20)' \ - '-l[line length]:integer: ' \ - '-p[pitch]:integer:(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 -19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 -43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 -67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 -91 92 93 94 95 96 97 98 99)' \ - '-s[speed]:words per minute: ' \ - '-v[voice]:voice name:(afrikaans bosnian catalan czech welsh-test dan= ish-test german greek default en-scottish english lancashire english_rp en= glish_wmids english-us en-westindies esperanto spanish spanish-latin-ameri= can finnish french french greek-ancient hindi-test croatian hungarian arme= nian armenian-west indonesian-test icelandic-test italian test/jbo kurdish= latin latvian macedonian-test dutch-test norwegian-test test/pap polish b= razil portugal romanian russian_test slovak albanian serbian swedish swahi= hi-test tamil turkish vietnam-test Mandarin cantonese-test)' \ - '-b[8-bit text]' \ - '-m[SSML or other XML text]' \ - '-w[wav output]:filename: ' \ - '-x[output phoneme mnemonics]' \ - '-X[output phoneme mnemonics and translation trace]' \ - '--stdout[output speech to stdout]' \ - '-k[capital letter indication]:integer:' \ - '--punct=3D-::characters: ' \ - '--voices=3D-[list available voices]::language code:(af bs ca cs cy d= a de el en en-sc en-uk en-uk-north en-uk-rp en-uk-wmids en-us en-wi eo es = es-la fi fr fr-be grc hi hr hu hy hy id is it jbo ku la lv mk nl no pap pl= pt pt-pt ro ru sk sq sr sv sw ta tr vi zh zh-yue)' \ - '--path=3D-[espeak-data path]:path:_files -/' \ - '--compile=3D-[compile]::voicename or debug: ' \ - '--phonout=3D-[output filename for -x/-X]:filename: ' = +_arguments -C \ + '(1 --stdin)-f+[specify file to speak]:text file:_files' \ + '(1 -f)--stdin[speak from stdin]' \ + '(-q)-a+[specify amplitude]:amplitude (0-200) [100]' \ + '(-q)-g+[specify pause between words]:pause (10ms) [1]' \ + '-k[capital letter indication]:integer:((1\:sound 2\:the\ word\ "capita= ls"))' \ + '-l[specify line length below which clause is ended]:length' \ + '(-q)-p+[specify pitch adjustment]:adjustment (0-99)' \ + '(-q)-s+[specify speed]:speed (words per minute) [175]' \ + '(-q)-v+[voice]:voice name:->voices' \ + '(--stdout -q)-w+[write speech to wav file]:wav file:_files -g "*.wav(-= .)"' \ + '-b+[specify input encoding]:encoding:((1\:UTF-8 2\:8-bit 3\:16-bit))' = \ + '-m[interpret SSML markup, ignore other XML]' \ + '(-a -g -p -s -v -w -z --split --stdout)-q[quiet, no sound output]' \ + '(-x --ipa)-x[output phoneme mnemonics]' \ + '(-X --ipa)-X[output phoneme mnemonics and translation trace]' \ + '(-q)-z[suppress final sentence pause at the end of the text]' \ + '--compile=3D-[compile pronunciation rules and dictionary]::voicename o= r debug' \ + '(-x -X)--ipa=3D-[output phonemes using International Phonetic Alphabet= ]::options:((1\:use\ ties 2\:use\ ZWJ 3\:separate\ with\ _))' \ + '--path=3D[specify espeak-data path]:path:_files -/' \ + '--pho[output mbrola phoneme data]' \ + '--phonout=3D[output filename for -x/-X/--ipa]:filename:_files' \ + '--punct=3D-[speak names of punctuation characters]::characters' \ + '(-q --stdout)--split=3D[periodically start new wav file]:period (minut= es)' \ + '(-w -q --split)--stdout[output speech to stdout]' \ + '--voices=3D-[list available voices]::language code:->languages' \ + '(-)'{-h,--help}'[display help information]' \ + '(-)--version[display version information]' && ret=3D0 + +case $state in + voices) + _wanted voices expl voice compadd \ + ${${${(f)"$(_call_program voices $words[1] --voices)"}[2,-1]#?(#c= 22)}%% *} && ret=3D0 + ;; + languages) + _wanted languages expl language compadd \ + ${${${(f)"$(_call_program voices $words[1] --voices)"}[2,-1]#?(#c= 4)}%% *} && ret=3D0 + ;; +esac + +return ret diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 8d3bd63..2178b82 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1353,6 +1353,7 @@ _git-push () { '(--no-signed --sign)--signed[GPG sign the push]' \ "(--sign --signed)--no-signed[don't GPG sign the push]" \ '--atomic[request atomic transaction on remote side]' \ + '(-o --push-option)'{-o+,--push-option=3D}'[transmit string to server= to pass to pre/post-receive hooks]:string' \ '(-4 --ipv4 -6 --ipv6)'{-4,--ipv4}'[use IPv4 addresses only]' \ '(-4 --ipv4 -6 --ipv6)'{-6,--ipv6}'[use IPv6 addresses only]' \ ': :__git_any_repositories' \ @@ -1767,6 +1768,7 @@ _git-submodule () { '(--merge --rebase)--checkout[checkout commit recorded in the superp= roject in the submodule on a detached HEAD]' \ '(--checkout --rebase)--merge[merge commit recorded in superproject = into current branch of submodule]' \ '(--checkout --merge)--rebase[rebase current branch onto commit reco= rded in superproject]' \ + '--no-recommend-shallow[ignore submodule..shallow from .gitmod= ules]' \ '--reference=3D[remote repository to clone]: :__git_any_repos= itories' \ '--recursive[traverse submodules recursively]' \ '--remote[use the status of the submodule''s remote-tracking = branch]' \ @@ -1968,6 +1970,8 @@ _git-worktree() { add:'create a new working tree' prune:'prune working tree information' list:'list details of each worktree' + lock:'prevent a working tree from being pruned' + unlock:'allow working tree to be pruned, moved or deleted' ) = _describe -t commands command commands && ret=3D0 @@ -1986,6 +1990,7 @@ _git-worktree() { '(-B --detach)-b+[create a new branch]: :__git_branch_names' \ '(-b --detach)-B+[create or reset a branch]: :__git_branch_names' \ '(-b -B)--detach[detach HEAD at named commit]' \ + '--no-checkout[suppress file checkout in new worktree]' \ ':path:_files' $args && ret=3D0 ;; (prune) @@ -1997,6 +2002,14 @@ _git-worktree() { (list) _arguments '--porcelain[machine-readable output]' && ret=3D0 ;; + (lock) + _arguments -C '--reason=3D[specify reason for locking]:reason' ': :->w= orktrees' && ret=3D0 + [[ -z $state ]] && return ret + ;& + (unlock) + _wanted directories expl 'working tree' compadd -S ' ' -f -M 'r:|/=3D*= r:|=3D*' \ + ${${(M)${(f)"$(_call_program directories git worktree list --porce= lain)"}:#worktree*}#* } + ;; esac ;; esac @@ -3539,8 +3552,8 @@ _git-remote () { _git-repack () { # TODO: --quiet is undocumented. _arguments -s \ - '(-A)-a[pack all objects into a single pack]' \ - '(-a)-A[pack all objects into a single pack, but unreachable objects = become loose]' \ + '(-A --unpack-unreachable)-a[pack all objects into a single pack]' \ + '(-a -k --keep-unreachable)-A[pack all objects into a single pack, bu= t unreachable objects become loose]' \ '-d[remove redundant packs after packing]' \ "--unpack-unreachable=3D[with -A, don't loosen objects older than spe= cified date]:date" \ '-f[pass --no-reuse-delta option to git pack-objects]' \ @@ -3550,6 +3563,7 @@ _git-repack () { '(-l --local)'{-l,--local}'[pass --local option to git pack-objects]'= \ '(-b --write-bitmap-index)'{-b,--write-bitmap-index}'[write a bitmap = index]' \ "--unpack-unreachable=3D[with -A, don't loosen objects older than spe= cified time]:time" \ + '(-k --keep-unreachable)'{-k,--keep-unreachable}'[with -a, repack unr= eachable objects]' \ '--window=3D[number of objects to consider when doing delta compressi= on]:number of objects' \ '--window-memory=3D[scale window size dynamically to not use more tha= n specified amount of memory]: : __git_guard_bytes' \ '--depth=3D[maximum delta depth]:maximum delta depth' \ @@ -3678,6 +3692,7 @@ _git-fsck () { '(-v --verbose)'{-v,--verbose}'[output additional information]' \ '--lost-found[write dangling objects into .git/lost-found]' \ '--progress[show progress]' \ + '--name-objects[show verbose names for reachable objects]' \ '*: :__git_objects' } = @@ -4548,6 +4563,7 @@ _git-pack-objects () { '(: --max-pack-size)--stdout[output pack to stdout]' \ '--include-tag[include unasked-for annotated tags if object they refe= rence is included]' \ '(--unpack-unreachable)--keep-unreachable[keep unreachable ]' \ + '--pack-loose-unreachable[pack loose unreachable objects]' \ '(--keep-unreachable)--unpack-unreachable=3D-[unpack unreachable obje= cts newer than specified time]::time' \ '--include-tag[include tag objects that refer to objects to be packed= ]' \ $thin_opt \ @@ -5205,12 +5221,11 @@ _git-upload-archive () { = (( $+functions[_git-upload-pack] )) || _git-upload-pack () { - # TODO: --advertise-refs is undocumented. - # TODO: --stateless-rpc is undocumented. _arguments -S -A '-*' \ + '--stateless-rpc[quit after a single request/response exchange]' \ + '--advertise-refs[exit immediately after initial ref advertisement]' = \ "--strict[don't try /.git/ if is not a git dir= ectory]" \ - '--timeout=3D-[interrupt transfer after given number of seconds of in= activity]: :__git_guard_number "inactivity timeout"' \ - --advertise-refs --stateless-rpc \ + '--timeout=3D-[interrupt transfer after period of inactivity]: :__git= _guard_number "inactivity timeout (seconds)"' \ ': :_directories' } = diff --git a/Completion/Unix/Command/_look b/Completion/Unix/Command/_look index 24a016a..be8cf8c 100644 --- a/Completion/Unix/Command/_look +++ b/Completion/Unix/Command/_look @@ -1,16 +1,34 @@ #compdef look = -local curcontext=3D"$curcontext" state line expl ret=3D1 +local curcontext=3D"$curcontext" state line expl args sep=3D'+' ret=3D1 typeset -A opt_args = -_arguments -C -s \ - '-t+[termination character]:termination character:' \ - '-f[case insensitive]' \ - '-d[dictionary order]' \ - ':string:->string' \ - ':dictionary file:_files' && ret=3D0 +case $OSTYPE in + linux*) + args=3D( + '(2 -a --alternative)'{-a,--alternative}'[use alternative dictionar= y file]' + '(-d --alphanum)'{-d,--alphanum}'[dictionary order]' + '(-f --ignore-case)'{-f,--ignore-case}'[case insensitive]' + '(-t --terminate)'{-t+,--terminate=3D}'[specify termination charact= er]:termination character' + '(-)'{-h,--help}'[display help information]' + '(-)'{-V,--version}'[display version information]' + ) + ;; + solaris*) sep=3D'-' ;& + *) + args=3D( -A "-*" + "-t${sep}[specify termination character]:termination character" + '-f[case insensitive]' + '-d[dictionary order]' + ) + ;; +esac + +_arguments -C -s -S $args \ + '1:string:->string' \ + '2:dictionary file:_files' && ret=3D0 = [[ -n "$state" && ! -prefix - ]] && _wanted values expl 'word prefix' \ - compadd - $(_call_program words $words[1] '"$PREFIX"' 2>/dev/null) &&= return + compadd - $(_call_program words $words[1] '"$PREFIX"') && return = return ret diff --git a/Completion/Unix/Command/_md5sum b/Completion/Unix/Command/_md= 5sum index c881a4e..073e6be 100644 --- a/Completion/Unix/Command/_md5sum +++ b/Completion/Unix/Command/_md5sum @@ -5,10 +5,11 @@ _arguments -S \ '(-c --check)'{-c,--check}'[read MD5 sums from the FILEs and check them= ]' \ '--tag[create a BSD-style checksum]' \ '(-t --text)'{-t,--text}'[read in text mode]' \ + "--ignore-missing[don't fail or report status for missing files]" \ '(-q --quiet)'{-q,--quiet}"[don't print OK for each successfully verifi= ed file]" \ '--status[no output, status code shows success]' \ '--strict[exit non-zero for improperly formatted checksum lines]' \ '(-w --warn)'{-w,--warn}'[warn about improperly formatted checksum line= s]' \ - '--help[display help and exit]' \ - '--version[output version information and exit]' \ + '(-)--help[display help and exit]' \ + '(-)--version[output version information and exit]' \ '*:files:_files' diff --git a/Completion/Unix/Command/_patch b/Completion/Unix/Command/_pat= ch index c0df00c..c2725d4 100644 --- a/Completion/Unix/Command/_patch +++ b/Completion/Unix/Command/_patch @@ -9,8 +9,7 @@ if (( ! $+_patch_args )); then [[ "$help" =3D *--[^h]* || "$help" =3D *\[-c\|-e\|-n\]* ]] && arg=3D+ = optionmap=3D( - '*\[-p\[strip-count\]\]*' '(--strip)-p-[number of path prefix compone= nts to strip]:number of path prefix components to strip:'"{$comp_p}" - '*( -p NUM[, ]|\[-p num\])*' '(--strip)-p+[number of path prefix comp= onents to strip]:number of path prefix components to strip:'"{$comp_p}" + '*( -p NUM[, ]|\[-p (num|strip-count)\])*' '(--strip)-p+[number of pa= th prefix components to strip]:number of path prefix components to strip:'= "{$comp_p}" '*\[--strip\[=3Dstrip-count\]\]*' '(-p)--strip=3D-[number of path pre= fix components to strip]:number of path prefix components to strip:'"{$com= p_p}" '* --strip=3DNUM[, ]*' '(-p)--strip=3D[number of path prefix componen= ts to strip]:number of path prefix components to strip:'"{$comp_p}" = @@ -35,8 +34,8 @@ if (( ! $+_patch_args )); then '*(\[-[a-zA-Z]#R[a-zA-Z]#\]| -R[, ])*' '(--reverse)-R[reverse mode]' '*(\[--reverse\]| --reverse[, ])*' '(-R)--reverse[reverse mode]' = - '*(\[-i patchfile\]| -i PATCHFILE[, ])*' '(--input)-i+[patch file]:pa= tch file:_files' - '* --input=3DPATCHFILE[, ]*' '(-i)--input=3D[patch file]:patch file:_= files' + '*(\[-i patchfile\]| -i PATCHFILE[, ])*' '*-i+[specify input patch fi= le]:patch file:_files' + '* --input=3DPATCHFILE[, ]*' '*--input=3D[specify input patch file]:p= atch file:_files' = '*(\[-o out-file\]| -o FILE[, ]|\[-o outfile\])*' "(--output)-o${arg}= [output file]:output file:_files" '*(\[--output=3Dout-file\]| --output=3DFILE[, ])*' '(-o)--output=3D[o= utput file]:output file:_files' @@ -46,6 +45,8 @@ if (( ! $+_patch_args )); then '*(\[-D symbol\]| -D NAME[, ]|\[-D define\])*' '(--ifdef)-D+[cpp symb= ol]:symbol:' '*(\[--ifdef=3Dsymbol\]| --ifdef=3DNAME[, ])*' '(-D)--ifdef=3D[cpp sy= mbol]:symbol:' = + '* --merge*' '(--reject-file --reject-format -r)--merge[merge using c= onflict markers instead of creating reject files]' + '*(\[-[a-zA-Z]#E[a-zA-Z]#\]| -E[, ])*' '(--remove-empty-files)-E[remo= ve empty files]' '*(\[--remove-empty-files\]| --remove-empty-files[, ])*' '(-E)--remov= e-empty-files[remove empty files]' = @@ -62,6 +63,7 @@ if (( ! $+_patch_args )); then '* --no-backup-if-mismatch[, ]*' '(--backup-if-mismatch)--no-backup-i= f-mismatch[back up only if otherwise requested]' = '*(\[-V {numbered,existing,simple}\]| -V STYLE[, ])*' "(--version-con= trol)-V${arg}[backup method]:backup method:(numbered existing simple)" + '*\[-V t \| nil \| never\]*' '(-B)-V+[specify backup method]:backup m= ethod:((t\:numbered nil\:existing never\:simple))' '*(\[--version-control=3D{numbered,existing,simple}\]| --version-cont= rol=3DSTYLE[, ])*' '(-V)--version-control=3D[backup method]:backup method:= (numbered existing simple)' = '*(\[-B backup-prefix\]| -B PREFIX[, ])*' "(--prefix)-B${arg}[specify= backup prefix]:backup prefix:" @@ -69,6 +71,7 @@ if (( ! $+_patch_args )); then '* -Y PREFIX[, ]*' '(--basename-prefix)-Y+[specify backup basename pr= efix]:backup basename prefix:' '* --basename-prefix=3DPREFIX[, ]*' '(-Y)--basename-prefix=3D[specify= backup basename prefix]:backup basename prefix:' '*\[-b backup-ext\]*' "( -z --suffix)-= b${arg}[specify backup suffix]:backup suffix:(.bak)" + '*\[-z backup-ext\]*' '(--suffix)-z+[specify backup suffix]:backup su= ffix [.orig]:(.bak)' '* -z SUFFIX[, ]*' '(-b --suffix)-= z+[specify backup suffix]:backup suffix:(.bak)' '*(\[--suffix=3Dbackup-ext\]| --suffix=3DSUFFIX[, ])*' '(-b -z = )--suffix=3D[specify backup suffix]:backup suffix:(.bak)' = @@ -90,24 +93,28 @@ if (( ! $+_patch_args )); then '*(\[--silent\]|--silent[, ])*' '(-s --quiet )--silent= [silent mode]' = '* --verbose[, ]*' '--verbose[verbose mode]' - '* --dry-run[, ]*' '--dry-run[don'\''t actually change files]' - '* --posix[, ]*' '--posix[POSIX mode]' + + '*(\[-[a-zA-Z]#C[a-zA-Z]#\])*' '(--check)-C[only check that the patch= would apply cleanly]' + '*\[--check\]*' '(-C)--check[only check that the patch would apply cl= eanly]' + '* --dry-run[, ]*' '--dry-run[only check that the patch would apply c= leanly]' + + '*--posix*' '--posix[POSIX mode]' = '*(\[-d directory\]| -d DIR[, ]|\[-d dir\])*' '(--directory)-d+[chang= e the working directory]:chdir to:_files -/' '*(\[--directory=3Ddirectory\]| --directory=3DDIR[, ])*' '(-d)--direc= tory=3D[change the working directory]:chdir to:_files -/' = + '* --reject-format=3D*' '--reject-format=3D[specify format of rejects= ]:format:(context unified)' + '* --read-only=3D*' '--read-only=3D[specify how to handle read-only i= nput files]:behaviour [warn]: (ignore warn fail)' + '* --binary[, ]*' '--binary[binary mode]' = - '*(\[-[a-zA-Z]#v[a-zA-Z]#\]| -v[, ])*' '(--version)-v[print version]' - '*(\[--version\]| --version[, ])*' '(-v)--version[print version]' - '* --help[, ]*' '--help[print help message]' + '*(\[-[a-zA-Z]#v[a-zA-Z]#\]| -v[, ])*' '(-)-v[print version]' + '*(\[--version\]| --version[, ])*' '(-)--version[print version]' + '* --help[, ]*' '(-)--help[print help message]' = '*\[-[a-zA-Z]#S[a-zA-Z]#\]*' '*-S[ignore this patch]' '*\[--skip\]*' '*--skip[ignore this patch]' = - '*(\[-[a-zA-Z]#C[a-zA-Z]#\])*' '(--check)-C[check only]' - '*\[--check\]*' '(-C)--check[check only]' - '*\[--index-first\]*' '--index-first[take Index: line precedence]' = '* --use-index-line *' '--use-index-line[deal with Index: line]' diff --git a/Completion/Unix/Command/_prove b/Completion/Unix/Command/_pro= ve index 1f21423..17b48a5 100644 --- a/Completion/Unix/Command/_prove +++ b/Completion/Unix/Command/_prove @@ -7,7 +7,7 @@ _arguments \ '(- *)'{-h,--help}'[display help and exit]' \ '(- *)'{-H,--man}'[display longer help and exit]' \ - '(- *)--version[display version and exit]' \ + '(- *)'{-V,--version}'[display version and exit]' \ '(--quiet -q -Q --QUIET)'{-v,--verbose}'[print all test lines]' \ {-l,--lib}'[add lib to path]' \ {-b,--blib}'[add blib to path]' \ diff --git a/Completion/Unix/Command/_tin b/Completion/Unix/Command/_tin index c63ccd9..61d203d 100644 --- a/Completion/Unix/Command/_tin +++ b/Completion/Unix/Command/_tin @@ -3,6 +3,8 @@ local newshosts expl state line curcontext=3D"$curcontext" ret=3D1 = _arguments -C -s \ + '(-6)-4[force connecting via IPv4]' \ + '(-4)-6[force connecting via IPv6]' \ '-a[toggle color flag]' \ '-A[force authentication on connect]' \ '-c[mark all news as read in subscribed groups]' \