Mercurial > hg-stable
changeset 39231:fd17590655cf
zsh_completion: drop -w, add -S to _arguments
From the docs: http://zsh.sourceforge.net/Doc/Release/Completion-System.html
_arguments -w: "allow option stacking even if one or more of the options take
arguments", so something like "-xy xarg yarg". Mercurial's command line parser
doesn't support that, so the flag got removed in zsh 92584634d3d3 and
bf8b61182043.
_arguments -S: "do not complete options after a ‘--’ appearing on the line". By
options it means things like "-x" and "--foo", but it will still complete
arguments like files.
Differential Revision: https://phab.mercurial-scm.org/D4262
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 10 Aug 2018 08:33:27 +0800 |
| parents | 27bbd62e9957 |
| children | 8ff14f8fe2d3 |
| files | contrib/zsh_completion |
| diffstat | 1 files changed, 79 insertions(+), 79 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/zsh_completion Fri Aug 10 08:19:36 2018 +0800 +++ b/contrib/zsh_completion Fri Aug 10 08:33:27 2018 +0800 @@ -82,7 +82,7 @@ if [[ -z "$cmd" ]] then - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ ':mercurial command:_hg_commands' return fi @@ -119,7 +119,7 @@ _hg_cmd_${cmd} else # complete unknown commands normally - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '*:files:_hg_files' fi } @@ -458,18 +458,18 @@ } _hg_cmd_add() { - _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts $_hg_subrepos_opts \ + _arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts $_hg_subrepos_opts \ '*:unknown files:_hg_unknown' } _hg_cmd_addremove() { - _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \ + _arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \ '(--similarity -s)'{-s+,--similarity=}'[guess renamed files by similarity (0<=s<=100)]:' \ '*:unknown or missing files:_hg_addremove' } _hg_cmd_annotate() { - _arguments -s -w : $_hg_global_opts $_hg_pat_opts \ + _arguments -s -S : $_hg_global_opts $_hg_pat_opts \ '(--rev -r)'{-r+,--rev=}'[annotate the specified revision]:revision:_hg_labels' \ '(--follow -f)'{-f,--follow}'[follow file copies and renames]' \ '(--text -a)'{-a,--text}'[treat all files as text]' \ @@ -481,7 +481,7 @@ } _hg_cmd_archive() { - _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_subrepos_opts \ + _arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_subrepos_opts \ '--no-decode[do not pass files through decoders]' \ '(--prefix -p)'{-p+,--prefix=}'[directory prefix for files in archive]:' \ '(--rev -r)'{-r+,--rev=}'[revision to distribute]:revision:_hg_labels' \ @@ -490,7 +490,7 @@ } _hg_cmd_backout() { - _arguments -s -w : $_hg_global_opts $_hg_mergetool_opts $_hg_pat_opts \ + _arguments -s -S : $_hg_global_opts $_hg_mergetool_opts $_hg_pat_opts \ '--merge[merge with old dirstate parent after backout]' \ '(--date -d)'{-d+,--date=}'[record datecode as commit date]:date code:' \ '--parent[parent to choose when backing out merge]' \ @@ -501,7 +501,7 @@ } _hg_cmd_bisect() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(-)'{-r,--reset}'[reset bisect state]' \ '(--extend -e)'{-e,--extend}'[extend the bisect range]' \ '(--good -g --bad -b --skip -s --reset -r)'{-g,--good}'[mark changeset good]'::revision:_hg_labels \ @@ -512,7 +512,7 @@ } _hg_cmd_bookmarks() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--force -f)'{-f,--force}'[force]' \ '(--inactive -i)'{-i,--inactive}'[mark a bookmark inactive]' \ '(--rev -r --delete -d --rename -m)'{-r+,--rev=}'[revision]:revision:_hg_labels' \ @@ -522,19 +522,19 @@ } _hg_cmd_branch() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--force -f)'{-f,--force}'[set branch name even if it shadows an existing branch]' \ '(--clean -C)'{-C,--clean}'[reset branch name to parent branch name]' } _hg_cmd_branches() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--active -a)'{-a,--active}'[show only branches that have unmerge heads]' \ '(--closed -c)'{-c,--closed}'[show normal and closed branches]' } _hg_cmd_bundle() { - _arguments -s -w : $_hg_global_opts $_hg_remote_opts \ + _arguments -s -S : $_hg_global_opts $_hg_remote_opts \ '(--force -f)'{-f,--force}'[run even when remote repository is unrelated]' \ '(2)*--base[a base changeset to specify instead of a destination]:revision:_hg_labels' \ '(--branch -b)'{-b+,--branch=}'[a specific branch to bundle]:' \ @@ -545,7 +545,7 @@ } _hg_cmd_cat() { - _arguments -s -w : $_hg_global_opts $_hg_pat_opts \ + _arguments -s -S : $_hg_global_opts $_hg_pat_opts \ '(--output -o)'{-o+,--output=}'[print output to file with formatted name]:filespec:' \ '(--rev -r)'{-r+,--rev=}'[revision]:revision:_hg_labels' \ '--decode[apply any matching decode filter]' \ @@ -553,7 +553,7 @@ } _hg_cmd_clone() { - _arguments -s -w : $_hg_global_opts $_hg_clone_opts \ + _arguments -s -S : $_hg_global_opts $_hg_clone_opts \ '(--rev -r)'{-r+,--rev=}'[a changeset you would like to have after cloning]:' \ '(--updaterev -u)'{-u+,--updaterev=}'[revision, tag or branch to check out]:' \ '(--branch -b)'{-b+,--branch=}'[clone only the specified branch]:' \ @@ -562,7 +562,7 @@ } _hg_cmd_commit() { - _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_subrepos_opts \ + _arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_subrepos_opts \ '(--addremove -A)'{-A,--addremove}'[mark new/missing files as added/removed before committing]' \ '(--message -m)'{-m+,--message=}'[use <text> as commit message]:text:' \ '(--logfile -l)'{-l+,--logfile=}'[read commit message from <file>]:log file:_files' \ @@ -574,7 +574,7 @@ } _hg_cmd_copy() { - _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \ + _arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \ '(--after -A)'{-A,--after}'[record a copy that has already occurred]' \ '(--force -f)'{-f,--force}'[forcibly copy over an existing managed file]' \ '*:file:_hg_files' @@ -582,7 +582,7 @@ _hg_cmd_diff() { typeset -A opt_args - _arguments -s -w : $_hg_global_opts $_hg_diff_opts $_hg_ignore_space_opts \ + _arguments -s -S : $_hg_global_opts $_hg_diff_opts $_hg_ignore_space_opts \ $_hg_pat_opts $_hg_subrepos_opts \ '*'{-r+,--rev=}'[revision]:revision:_hg_revrange' \ '(--show-function -p)'{-p,--show-function}'[show which function each change is in]' \ @@ -605,7 +605,7 @@ } _hg_cmd_export() { - _arguments -s -w : $_hg_global_opts $_hg_diff_opts \ + _arguments -s -S : $_hg_global_opts $_hg_diff_opts \ '(--outout -o)'{-o+,--output=}'[print output to file with formatted name]:filespec:' \ '--switch-parent[diff against the second parent]' \ '(--rev -r)'{-r+,--rev=}'[revision]:revision:_hg_labels' \ @@ -613,12 +613,12 @@ } _hg_cmd_forget() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '*:file:_hg_files' } _hg_cmd_graft() { - _arguments -s -w : $_hg_global_opts $_hg_dryrun_opts \ + _arguments -s -S : $_hg_global_opts $_hg_dryrun_opts \ $_hg_date_user_opts $_hg_mergetool_opts \ '(--continue -c)'{-c,--continue}'[resume interrupted graft]' \ '(--edit -e)'{-e,--edit}'[invoke editor on commit messages]' \ @@ -627,7 +627,7 @@ } _hg_cmd_grep() { - _arguments -s -w : $_hg_global_opts $_hg_pat_opts \ + _arguments -s -S : $_hg_global_opts $_hg_pat_opts \ '(--print0 -0)'{-0,--print0}'[end filenames with NUL]' \ '--all[print all revisions with matches]' \ '(--follow -f)'{-f,--follow}'[follow changeset or file history]' \ @@ -642,14 +642,14 @@ } _hg_cmd_heads() { - _arguments -s -w : $_hg_global_opts $_hg_template_opts \ + _arguments -s -S : $_hg_global_opts $_hg_template_opts \ '(--topo -t)'{-t,--topo}'[show topological heads only]' \ '(--closed -c)'{-c,--closed}'[show normal and closed branch heads]' \ '(--rev -r)'{-r+,--rev=}'[show only heads which are descendants of rev]:revision:_hg_labels' } _hg_cmd_help() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--extension -e)'{-e,--extension}'[show only help for extensions]' \ '(--command -c)'{-c,--command}'[show only help for commands]' \ '(--keyword -k)'{-k+,--keyword}'[show topics matching keyword]' \ @@ -657,7 +657,7 @@ } _hg_cmd_identify() { - _arguments -s -w : $_hg_global_opts $_hg_remote_opts \ + _arguments -s -S : $_hg_global_opts $_hg_remote_opts \ '(--rev -r)'{-r+,--rev=}'[identify the specified rev]:revision:_hg_labels' \ '(--num -n)'{-n,--num}'[show local revision number]' \ '(--id -i)'{-i,--id}'[show global revision id]' \ @@ -667,7 +667,7 @@ } _hg_cmd_import() { - _arguments -s -w : $_hg_global_opts $_hg_commit_opts \ + _arguments -s -S : $_hg_global_opts $_hg_commit_opts \ '(--strip -p)'{-p+,--strip=}'[directory strip option for patch (default: 1)]:count:' \ '(--force -f)'{-f,--force}'[skip check for outstanding uncommitted changes]' \ '--bypass[apply patch without touching the working directory]' \ @@ -682,7 +682,7 @@ } _hg_cmd_incoming() { - _arguments -s -w : $_hg_log_opts $_hg_branch_bmark_opts $_hg_remote_opts \ + _arguments -s -S : $_hg_log_opts $_hg_branch_bmark_opts $_hg_remote_opts \ $_hg_subrepos_opts \ '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \ '(--rev -r)'{-r+,--rev=}'[a specific revision up to which you would like to pull]:revision:_hg_labels' \ @@ -692,12 +692,12 @@ } _hg_cmd_init() { - _arguments -s -w : $_hg_global_opts $_hg_remote_opts \ + _arguments -s -S : $_hg_global_opts $_hg_remote_opts \ ':dir:_files -/' } _hg_cmd_locate() { - _arguments -s -w : $_hg_global_opts $_hg_pat_opts \ + _arguments -s -S : $_hg_global_opts $_hg_pat_opts \ '(--rev -r)'{-r+,--rev=}'[search repository as it stood at revision]:revision:_hg_labels' \ '(--print0 -0)'{-0,--print0}'[end filenames with NUL, for use with xargs]' \ '(--fullpath -f)'{-f,--fullpath}'[print complete paths]' \ @@ -705,7 +705,7 @@ } _hg_cmd_log() { - _arguments -s -w : $_hg_log_opts $_hg_pat_opts \ + _arguments -s -S : $_hg_log_opts $_hg_pat_opts \ '(--follow --follow-first -f)'{-f,--follow}'[follow changeset or history]' \ '(-f --follow)--follow-first[only follow the first parent of merge changesets]' \ '(--copies -C)'{-C,--copies}'[show copied files]' \ @@ -721,14 +721,14 @@ } _hg_cmd_manifest() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '--all[list files from all revisions]' \ '(--rev -r)'{-r+,--rev=}'[revision to display]:revision:_hg_labels' \ ':revision:_hg_labels' } _hg_cmd_merge() { - _arguments -s -w : $_hg_global_opts $_hg_mergetool_opts \ + _arguments -s -S : $_hg_global_opts $_hg_mergetool_opts \ '(--force -f)'{-f,--force}'[force a merge with outstanding changes]' \ '(--rev -r 1)'{-r+,--rev=}'[revision to merge]:revision:_hg_mergerevs' \ '(--preview -P)'{-P,--preview}'[review revisions to merge (no merge is performed)]' \ @@ -736,7 +736,7 @@ } _hg_cmd_outgoing() { - _arguments -s -w : $_hg_log_opts $_hg_branch_bmark_opts $_hg_remote_opts \ + _arguments -s -S : $_hg_log_opts $_hg_branch_bmark_opts $_hg_remote_opts \ $_hg_subrepos_opts \ '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \ '*'{-r+,--rev=}'[a specific revision you would like to push]:revision:_hg_revrange' \ @@ -745,18 +745,18 @@ } _hg_cmd_parents() { - _arguments -s -w : $_hg_global_opts $_hg_template_opts \ + _arguments -s -S : $_hg_global_opts $_hg_template_opts \ '(--rev -r)'{-r+,--rev=}'[show parents of the specified rev]:revision:_hg_labels' \ ':last modified file:_hg_files' } _hg_cmd_paths() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ ':path:_hg_paths' } _hg_cmd_phase() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--public -p)'{-p,--public}'[set changeset phase to public]' \ '(--draft -d)'{-d,--draft}'[set changeset phase to draft]' \ '(--secret -s)'{-s,--secret}'[set changeset phase to secret]' \ @@ -766,7 +766,7 @@ } _hg_cmd_pull() { - _arguments -s -w : $_hg_global_opts $_hg_branch_bmark_opts $_hg_remote_opts \ + _arguments -s -S : $_hg_global_opts $_hg_branch_bmark_opts $_hg_remote_opts \ '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \ '(--update -u)'{-u,--update}'[update to new tip if changesets were pulled]' \ '(--rev -r)'{-r+,--rev}'[a specific revision up to which you would like to pull]:revision:' \ @@ -774,7 +774,7 @@ } _hg_cmd_push() { - _arguments -s -w : $_hg_global_opts $_hg_branch_bmark_opts $_hg_remote_opts \ + _arguments -s -S : $_hg_global_opts $_hg_branch_bmark_opts $_hg_remote_opts \ '(--force -f)'{-f,--force}'[force push]' \ '(--rev -r)'{-r+,--rev=}'[a specific revision you would like to push]:revision:_hg_labels' \ '--new-branch[allow pushing a new branch]' \ @@ -782,14 +782,14 @@ } _hg_cmd_remove() { - _arguments -s -w : $_hg_global_opts $_hg_pat_opts \ + _arguments -s -S : $_hg_global_opts $_hg_pat_opts \ '(--after -A)'{-A,--after}'[record remove that has already occurred]' \ '(--force -f)'{-f,--force}'[remove file even if modified]' \ '*:file:_hg_files' } _hg_cmd_rename() { - _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \ + _arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \ '(--after -A)'{-A,--after}'[record a rename that has already occurred]' \ '(--force -f)'{-f,--force}'[forcibly copy over an existing managed file]' \ '*:file:_hg_files' @@ -799,7 +799,7 @@ local context state line typeset -A opt_args - _arguments -s -w : $_hg_global_opts $_hg_mergetool_opts $_hg_pat_opts \ + _arguments -s -S : $_hg_global_opts $_hg_mergetool_opts $_hg_pat_opts \ '(--all -a)'{-a,--all}'[select all unresolved files]' \ '(--no-status -n)'{-n,--no-status}'[hide status prefix]' \ '(--list -l --mark -m --unmark -u)'{-l,--list}'[list state of files needing merge]:*:merged files:->resolve_files' \ @@ -818,7 +818,7 @@ local context state line typeset -A opt_args - _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \ + _arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \ '(--all -a :)'{-a,--all}'[revert all changes when no arguments given]' \ '(--rev -r)'{-r+,--rev=}'[revision to revert to]:revision:_hg_labels' \ '(--no-backup -C)'{-C,--no-backup}'[do not save backup copies of files]' \ @@ -839,12 +839,12 @@ } _hg_cmd_rollback() { - _arguments -s -w : $_hg_global_opts $_hg_dryrun_opts \ + _arguments -s -S : $_hg_global_opts $_hg_dryrun_opts \ '(--force -f)'{-f,--force}'[ignore safety measures]' \ } _hg_cmd_serve() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--accesslog -A)'{-A+,--accesslog=}'[name of access log file]:log file:_files' \ '(--errorlog -E)'{-E+,--errorlog=}'[name of error log file]:log file:_files' \ '(--daemon -d)'{-d,--daemon}'[run server in background]' \ @@ -863,13 +863,13 @@ } _hg_cmd_showconfig() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--untrusted -u)'{-u,--untrusted}'[show untrusted configuration options]' \ ':config item:_hg_config' } _hg_cmd_status() { - _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_subrepos_opts \ + _arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_subrepos_opts \ '(--all -A)'{-A,--all}'[show status of all files]' \ '(--modified -m)'{-m,--modified}'[show only modified files]' \ '(--added -a)'{-a,--added}'[show only added files]' \ @@ -887,12 +887,12 @@ } _hg_cmd_summary() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '--remote[check for push and pull]' } _hg_cmd_tag() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--local -l)'{-l,--local}'[make the tag local]' \ '(--message -m)'{-m+,--message=}'[message for tag commit log entry]:message:' \ '(--date -d)'{-d+,--date=}'[record datecode as commit date]:date code:' \ @@ -905,18 +905,18 @@ } _hg_cmd_tip() { - _arguments -s -w : $_hg_global_opts $_hg_gitlike_opts $_hg_template_opts \ + _arguments -s -S : $_hg_global_opts $_hg_gitlike_opts $_hg_template_opts \ '(--patch -p)'{-p,--patch}'[show patch]' } _hg_cmd_unbundle() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--update -u)'{-u,--update}'[update to new tip if changesets were unbundled]' \ ':files:_files' } _hg_cmd_update() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--clean -C)'{-C,--clean}'[overwrite locally modified files]' \ '(--rev -r)'{-r+,--rev=}'[revision]:revision:_hg_labels' \ '(--check -c)'{-c,--check}'[update across branches if no uncommitted changes]' \ @@ -928,7 +928,7 @@ # HGK _hg_cmd_view() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--limit -l)'{-l+,--limit=}'[limit number of changes displayed]:' \ ':revision range:_hg_labels' } @@ -983,39 +983,39 @@ '(--summary -s)'{-s,--summary}'[print first line of patch header]') _hg_cmd_qapplied() { - _arguments -s -w : $_hg_global_opts $_hg_qseries_opts \ + _arguments -s -S : $_hg_global_opts $_hg_qseries_opts \ '(--last -1)'{-1,--last}'[show only the preceding applied patch]' \ '*:patch:_hg_qapplied' } _hg_cmd_qclone() { - _arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_clone_opts \ + _arguments -s -S : $_hg_global_opts $_hg_remote_opts $_hg_clone_opts \ '(--patches -p)'{-p+,--patches=}'[location of source patch repository]:' \ ':source repository:_hg_remote' \ ':destination:_hg_clone_dest' } _hg_cmd_qdelete() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--keep -k)'{-k,--keep}'[keep patch file]' \ '*'{-r+,--rev=}'[stop managing a revision]:applied patch:_hg_revrange' \ '*:unapplied patch:_hg_qdeletable' } _hg_cmd_qdiff() { - _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_diff_opts \ + _arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_diff_opts \ $_hg_ignore_space_opts \ '*:pattern:_hg_files' } _hg_cmd_qfinish() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--applied -a)'{-a,--applied}'[finish all applied patches]' \ '*:patch:_hg_qapplied' } _hg_cmd_qfold() { - _arguments -s -w : $_hg_global_opts $_h_commit_opts \ + _arguments -s -S : $_hg_global_opts $_h_commit_opts \ '(--keep,-k)'{-k,--keep}'[keep folded patch files]' \ '(--force -f)'{-f,--force}'[overwrite any local changes]' \ '--no-backup[do not save backup copies of files]' \ @@ -1023,14 +1023,14 @@ } _hg_cmd_qgoto() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--force -f)'{-f,--force}'[overwrite any local changes]' \ '--keep-changes[tolerate non-conflicting local changes]' \ ':patch:_hg_qseries' } _hg_cmd_qguard() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--list -l)'{-l,--list}'[list all patches and guards]' \ '(--none -n)'{-n,--none}'[drop all guards]' \ ':patch:_hg_qseries' \ @@ -1038,12 +1038,12 @@ } _hg_cmd_qheader() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ ':patch:_hg_qseries' } _hg_cmd_qimport() { - _arguments -s -w : $_hg_global_opts $_hg_gitlike_opts \ + _arguments -s -S : $_hg_global_opts $_hg_gitlike_opts \ '(--existing -e)'{-e,--existing}'[import file in patch dir]' \ '(--name -n 2)'{-n+,--name}'[patch file name]:name:' \ '(--force -f)'{-f,--force}'[overwrite existing files]' \ @@ -1053,16 +1053,16 @@ } _hg_cmd_qnew() { - _arguments -s -w : $_hg_global_opts $_hg_commit_opts $_hg_date_user_opts $_hg_gitlike_opts \ + _arguments -s -S : $_hg_global_opts $_hg_commit_opts $_hg_date_user_opts $_hg_gitlike_opts \ ':patch:' } _hg_cmd_qnext() { - _arguments -s -w : $_hg_global_opts $_hg_qseries_opts + _arguments -s -S : $_hg_global_opts $_hg_qseries_opts } _hg_cmd_qpop() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--all -a :)'{-a,--all}'[pop all patches]' \ '(--force -f)'{-f,--force}'[forget any local changes]' \ '--keep-changes[tolerate non-conflicting local changes]' \ @@ -1071,11 +1071,11 @@ } _hg_cmd_qprev() { - _arguments -s -w : $_hg_global_opts $_hg_qseries_opts + _arguments -s -S : $_hg_global_opts $_hg_qseries_opts } _hg_cmd_qpush() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--all -a :)'{-a,--all}'[apply all patches]' \ '(--list -l)'{-l,--list}'[list patch name in commit text]' \ '(--force -f)'{-f,--force}'[apply if the patch has rejects]' \ @@ -1087,19 +1087,19 @@ } _hg_cmd_qrefresh() { - _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_commit_opts $_hg_gitlike_opts \ + _arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_commit_opts $_hg_gitlike_opts \ '(--short -s)'{-s,--short}'[short refresh]' \ '*:files:_hg_files' } _hg_cmd_qrename() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ ':patch:_hg_qunapplied' \ ':destination:' } _hg_cmd_qselect() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--none -n :)'{-n,--none}'[disable all guards]' \ '(--series -s :)'{-s,--series}'[list all guards in series file]' \ '--pop[pop to before first guarded applied patch]' \ @@ -1108,21 +1108,21 @@ } _hg_cmd_qseries() { - _arguments -s -w : $_hg_global_opts $_hg_qseries_opts \ + _arguments -s -S : $_hg_global_opts $_hg_qseries_opts \ '(--missing -m)'{-m,--missing}'[print patches not in series]' } _hg_cmd_qunapplied() { - _arguments -s -w : $_hg_global_opts $_hg_qseries_opts \ + _arguments -s -S : $_hg_global_opts $_hg_qseries_opts \ '(--first -1)'{-1,--first}'[show only the first patch]' } _hg_cmd_qtop() { - _arguments -s -w : $_hg_global_opts $_hg_qseries_opts + _arguments -s -S : $_hg_global_opts $_hg_qseries_opts } _hg_cmd_strip() { - _arguments -s -w : $_hg_global_opts \ + _arguments -s -S : $_hg_global_opts \ '(--force -f)'{-f,--force}'[force removal, discard uncommitted changes, no backup]' \ '(--no-backup -n)'{-n,--no-backup}'[no backups]' \ '(--keep -k)'{-k,--keep}'[do not modify working copy during strip]' \ @@ -1133,7 +1133,7 @@ # Patchbomb _hg_cmd_email() { - _arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_gitlike_opts \ + _arguments -s -S : $_hg_global_opts $_hg_remote_opts $_hg_gitlike_opts \ '--plain[omit hg patch header]' \ '--body[send patches as inline message text (default)]' \ '(--outgoing -o)'{-o,--outgoing}'[send changes not found in the target repository]' \ @@ -1163,7 +1163,7 @@ # Rebase _hg_cmd_rebase() { - _arguments -s -w : $_hg_global_opts $_hg_commit_opts $_hg_mergetool_opts \ + _arguments -s -S : $_hg_global_opts $_hg_commit_opts $_hg_mergetool_opts \ '*'{-r+,--rev=}'[rebase these revisions]:revision:_hg_revrange' \ '(--source -s)'{-s+,--source=}'[rebase from the specified changeset]:revision:_hg_labels' \ '(--base -b)'{-b+,--base=}'[rebase from the base of the specified changeset]:revision:_hg_labels' \ @@ -1177,7 +1177,7 @@ # Record _hg_cmd_record() { - _arguments -s -w : $_hg_global_opts $_hg_commit_opts $_hg_pat_opts \ + _arguments -s -S : $_hg_global_opts $_hg_commit_opts $_hg_pat_opts \ $_hg_ignore_space_opts $_hg_subrepos_opts \ '(--addremove -A)'{-A,--addremove}'[mark new/missing files as added/removed before committing]' \ '--close-branch[mark a branch as closed, hiding it from the branch list]' \ @@ -1187,13 +1187,13 @@ } _hg_cmd_qrecord() { - _arguments -s -w : $_hg_global_opts $_hg_commit_opts $_hg_date_user_opts $_hg_gitlike_opts \ + _arguments -s -S : $_hg_global_opts $_hg_commit_opts $_hg_date_user_opts $_hg_gitlike_opts \ $_hg_pat_opts $_hg_ignore_space_opts $_hg_subrepos_opts } # Convert _hg_cmd_convert() { -_arguments -s -w : $_hg_global_opts \ +_arguments -s -S : $_hg_global_opts \ '(--source-type -s)'{-s,--source-type}'[source repository type]' \ '(--dest-type -d)'{-d,--dest-type}'[destination repository type]' \ '(--rev -r)'{-r+,--rev=}'[import up to target revision]:revision:' \ @@ -1213,7 +1213,7 @@ # Purge _hg_cmd_purge() { - _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_subrepos_opts \ + _arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_subrepos_opts \ '(--abort-on-err -a)'{-a,--abort-on-err}'[abort if an error occurs]' \ '--all[purge ignored files too]' \ '(--print -p)'{-p,--print}'[print filenames instead of deleting them]' \