From e6fdd35a83881a957ac206b4e128886d07f37c71 Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Fri, 9 Jul 2021 00:23:52 +0200 Subject: 49150: consistently use singular form for headings on completion match groups --- Completion/Unix/Command/_tla | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Completion/Unix/Command/_tla') diff --git a/Completion/Unix/Command/_tla b/Completion/Unix/Command/_tla index 1e4cdd8d9..33dfc005f 100644 --- a/Completion/Unix/Command/_tla +++ b/Completion/Unix/Command/_tla @@ -45,8 +45,8 @@ _tla_revisions () { _arch_namespace tla 4 "$argv[@]" } (( $+functions[_tla_local_revisions] )) || _tla_local_revisions () { local expl1 expl2 tree_version=`$TLA tree-version` - _description -V applied-patches expl1 "patches from this version" - _description -V other-patches expl2 "patches from other versions" + _description -V applied-patches expl1 "patch from this version" + _description -V other-patches expl2 "patch from other versions" compadd "$expl1[@]" `$TLA logs` compadd "$expl2[@]" `$TLA logs --full $($TLA log-versions | grep -v $tree_version)` # This is incredibly slow. @@ -90,7 +90,7 @@ _tla_limit () { #presently only does push-mirror style limits if [ $archive ]; then if [[ $PREFIX != *--* ]]; then - _description -V categories expl "categories in $archive" + _description -V categories expl "category in $archive" compadd -q -S -- "$expl[@]" `$TLA categories -A $archive` else _tla_namespace_branches 3 @@ -107,7 +107,7 @@ _tla_tree_or_rev () { _tla_libraries () { local libraries expl libraries=($(_call_program tla $TLA my-revision-library)) - _description -V libraries expl "revision libraries" + _description -V libraries expl "revision library" compadd "$expl[@]" -a libraries } @@ -128,7 +128,7 @@ _tla_log_versions () { else logs=($(_call_program tla $TLA logs)) fi - _description -V versions expl "log versions" + _description -V versions expl "log version" compadd "$expl[@]" -a logs } @@ -278,12 +278,12 @@ methods=( cmd_tagging_method=($cmd_id_tagging_method) local cmd_add cmd_add_id cmd_add_tag -cmd_add=('*:files to add:_files') +cmd_add=('*:file to add:_files') cmd_add_id=($cmd_add) cmd_add_tag=($cmd_add) local cmd_delete cmd_delete_id cmd_delete_tag -cmd_delete=('*:files to delete:_files') +cmd_delete=('*:file to delete:_files') cmd_delete_id=($cmd_delete) cmd_delete_tag=($cmd_delete) @@ -312,7 +312,7 @@ cmd_changeset=( ':ORIG:_files -/' ':MOD:_files -/' ':DEST:_files -/' - '*:files:_files' + '*:file:_files' ) cmd_mkpatch=("$cmd_changeset[@]") @@ -328,7 +328,7 @@ local cmd_make_archive cmd_make_archive=('::name:' ':location:_files -/') local cmd_archive_setup -cmd_archive_setup=('*:versions:_tla_branches --trailing-dashes') +cmd_archive_setup=('*:version:_tla_branches --trailing-dashes') local cmd_make_category cmd_make_category=(':category:_tla_archives -S /') @@ -344,7 +344,7 @@ cmd_import=('::version:_tla_versions') cmd_imprev=($cmd_import) local cmd_commit cmd_cmtrev -cmd_commit=('::version:_tla_versions' ':separator:(--)' '*:files:_files') +cmd_commit=('::version:_tla_versions' ':separator:(--)' '*:file:_files') cmd_cmtrev=($cmd_commit) local cmd_get cmd_getrev @@ -619,7 +619,7 @@ _tla_main () { local -U cmds help=(${(f)"$($TLA help)"}) cmds=(${${${${(M)help:#* :*}/ #: #/:}%% ##}## #}) - arguments=(':commands:(($cmds))') + arguments=(':command:(($cmds))') fi _arguments -S -A '-*' \ {"${hide_short}(: -)-V",'(: -)--version'}'[display version]' \ -- cgit v1.2.3 From e9203d04aa8cd0e77ddafd8153368bf10a909d44 Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Sat, 10 Jul 2021 23:50:50 +0200 Subject: 49157: fix uses of literal % characters in completion descriptions --- ChangeLog | 5 +++++ Completion/Linux/Command/_valgrind | 8 ++++---- Completion/Unix/Command/_baz | 2 +- Completion/Unix/Command/_opustools | 4 ++-- Completion/Unix/Command/_tla | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) (limited to 'Completion/Unix/Command/_tla') diff --git a/ChangeLog b/ChangeLog index 1421c357d..62814354c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2021-07-10 Oliver Kiddle + * 49157: Completion/Linux/Command/_valgrind, + Completion/Unix/Command/_baz, Completion/Unix/Command/_opustools, + Completion/Unix/Command/_tla: fix uses of literal % characters in + completion descriptions + * 49156: Completion/Cygwin/Command/_cygserver, Completion/Debian/Command/_git-buildpackage, Completion/Linux/Command/_alsa-utils, Completion/Unix/Command/_adb, diff --git a/Completion/Linux/Command/_valgrind b/Completion/Linux/Command/_valgrind index 4a710e7f7..23a8cd734 100644 --- a/Completion/Linux/Command/_valgrind +++ b/Completion/Linux/Command/_valgrind @@ -20,7 +20,7 @@ common_own_malloc=( '--alignment=-[set minimum alignment of heap allocations]:number [16]' '--redzone-size=-[set minimum size of redzones added before/after heap blocks]:size (bytes) [16]' '--xtree-memory=-[profile heap memory in an xtree [none]:(none allocs full)' - '--xtree-memory-file=-[specify xtree memory report file]:file [xtmemory.kcg.%p]:_files' + '--xtree-memory-file=-[specify xtree memory report file]:file [xtmemory.kcg.%%p]:_files' ) common_read_varinfo=( @@ -67,7 +67,7 @@ args_addrcheck=( '(--show-leak-kinds)--show-reachable=-[show reachable blocks in leak check]:enable:(yes no)' '(--show-leak-kinds)--show-possibly-lost=-:enable:(yes no)' '--xtree-leak=-[output leak result in xtree format]:enable [no]:(yes no)' - '--xtree-leak-file=-[specify xtree leak report file]:file [xtleak.kcg.%p]:_files' + '--xtree-leak-file=-[specify xtree leak report file]:file [xtleak.kcg.%%p]:_files' '--undef-value-errors=-[check for undefined value errors]:enable [yes]:(yes no)' '--track-origins=-[show origins of undefined values]:enable [no]:(yes no)' $common_partial @@ -123,7 +123,7 @@ args_cachegrind=( '--LL=-[set LL cache manually]:size,assoc,line_size' '--cache-sim=-[collect cache stats]:enable [yes]:(yes no)' '--branch-sim=-[collect branch prediction stats]:enable [no]:(yes no)' - '--cachegrind-out-file=-[specify output file name]:file name [cachegrind.out.%p]:_files' + '--cachegrind-out-file=-[specify output file name]:file name [cachegrind.out.%%p]:_files' ) args_helgrind=( @@ -169,7 +169,7 @@ args_massif=( ))" '--detailed-freq=-[every Nth snapshot should be detailed]:snapshot interval [10]' '--max-snapshots=-[specofy maximum number of snapshots recorded]:maximum [100]' - '--massif-out-file=-[specify output file name]:filename [massif.out.%p]:_files' + '--massif-out-file=-[specify output file name]:filename [massif.out.%%p]:_files' ) args_exp_bbv=( diff --git a/Completion/Unix/Command/_baz b/Completion/Unix/Command/_baz index 4dfcdf882..0acdc4639 100644 --- a/Completion/Unix/Command/_baz +++ b/Completion/Unix/Command/_baz @@ -64,7 +64,7 @@ _baz_config () { if [[ -d "$root/configs" ]]; then configdir=("$root/configs") - _description files expl '%Bconfig file%b' + _description files expl 'config file' _files -W configdir "$expl[@]" && ret=0 else _message -e messages "No configs/ directory in tree whose root is $root" diff --git a/Completion/Unix/Command/_opustools b/Completion/Unix/Command/_opustools index c860a170f..1fd97798a 100644 --- a/Completion/Unix/Command/_opustools +++ b/Completion/Unix/Command/_opustools @@ -14,7 +14,7 @@ case $service in '--cvbr[use constrained variable bitrate encoding]' \ '--downmix-mono[downmix to mono]' \ '--downmix-stereo[downmix to stereo (if >2 channels)]' \ - '--expect-loss[set expected packet loss]:expected packet loss (%) (0-100) [0]' \ + '--expect-loss[set expected packet loss]:expected packet loss (%%) (0-100) [0]' \ '--framesize[set maximum frame size]:maximum frame size (milliseconds) [20]:(2.5 5 10 20 40 60)' \ '--hard-cbr[use hard constant bitrate encoding]' \ '--max-delay[set maximum container delay]:maximum container delay (milliseconds) (0-1000) [1000]' \ @@ -57,7 +57,7 @@ case $service in '--no-dither[do not dither 16-bit output]' \ '--float[output 32-bit floating-point samples]' \ '--force-wav[force RIFF wav header on output]' \ - '--packet-loss[simulate random packet loss]:packet loss probability (%) (0-100)' \ + '--packet-loss[simulate random packet loss]:packet loss probability (%%) (0-100)' \ '--save-range[save check values for every frame to a file]:output for check values:_files' ;; opusinfo) diff --git a/Completion/Unix/Command/_tla b/Completion/Unix/Command/_tla index 33dfc005f..ec7e76d44 100644 --- a/Completion/Unix/Command/_tla +++ b/Completion/Unix/Command/_tla @@ -73,7 +73,7 @@ _tla_config () { if [[ -d "$root/configs" ]]; then configdir=("$root/configs") - _description files expl '%Bconfig file%b' + _description files expl 'config file' _files -W configdir "$expl[@]" && ret=0 else _message -e messages "No configs/ directory in tree whose root is $root" -- cgit v1.2.3