This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4267

zsh_completion: update all options
ClosedPublic

Authored by av6 on Aug 11 2018, 12:10 AM.

Details

Reviewers
spectral
Group Reviewers
hg-reviewers
Commits
rHG362c4603602d: zsh_completion: update all options
Summary

It's just too hard to further split this patch. What it does:

  • adds missing flags
  • removes flags that are no longer there
  • updates flag descriptions and argument names
  • adds * where using the same option many times is okay
  • groups with () mutually exclusive flags that can't be used together
  • adds + and = to options that need arguments
  • removes + and = from options that don't take any arguments
  • fixes minor issues and a typo

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

av6 created this revision.Aug 11 2018, 12:10 AM
spectral accepted this revision.Aug 13 2018, 2:58 PM
spectral added a subscriber: spectral.
spectral added inline comments.
contrib/zsh_completion
373–374

I wonder how hard it would be to add tests to make sure these don't diverge from the actual output in the future? (no action required in this change, just curious if you have any ideas).

At my job our code review system has a "if this is modified, then you probably want to modify this other place" mechanism, I wonder if something like that, generically as part of one of the existing tests (or on its own) would be easier and make more sense than attempting to match the output, just rely on people doing the right thing when the tests prompt them to (with a way of ignoring it, perhaps via something in the commit description). Example:

  1. IfChange @command('^add', walkopts + subrepoopts + dryrunopts, _('[OPTION]... [FILE]...'), inferrrepo=True)
  2. ThenChange(contrib/zsh_completion, contrib/bash_completion) def add(ui, repo, *pats, **opts): ...

Though, since we'd be doing this for every @command, I'm back to thinking it'd probably be better to hard-code it for the completion stuff - something that says "Oh, you've modified the contents of an @command, make sure you update these other locations as well..."

644

I assume the first section here makes continue and abort mutually exclusive? I believe that revision arguments are also forbidden if either --continue or --abort are specified; I don't know if there's a way of representing that.

828

Does the order of the first section matter? Should the three of them be identical?

1198–1199

Does this indicate that hg rebase <hash> -d <dest> should work (without a -r, -s, or -b?) I don't think that's correct..

av6 added inline comments.Aug 14 2018, 12:28 AM
contrib/zsh_completion
644

Just having --rev -r inside the parentheses should be enough, but I'm not sure if implementing every piece of exclusivity logic here makes sense (I'm also concerned about completions diverging from real behavior). But I've found this in zsh's _git:
(- :)--abort[cancel revert or cherry-pick sequence]
This form disables completion of any other arguments, and I think it's future-proof enough to do this for --abort here. I'll do a follow-up to touch just exclusivity when this series lands.

828

I don't think it matters. All options that the group mentions just disappear from completion when -l, -m or -u is present.

1198–1199

You mean giving revisions without -r? No, * means that -r can be specified multiple times (and each would require an argument). To see how it's done for a command that has "optional" -r see _hg_cmd_update or _hg_cmd_strip above ^

spectral added inline comments.Aug 14 2018, 9:34 PM
contrib/zsh_completion
1198–1199

Got it, thanks for explaining :)

Closed by commit rHG362c4603602d: zsh_completion: update all options (authored by av6). · Explain WhyAug 20 2018, 3:19 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 10468

contrib/zsh_completion

_hg_help_topics() { _hg_help_topics() {
local topics local topics
(( $#_hg_cmd_list )) || _hg_get_commands (( $#_hg_cmd_list )) || _hg_get_commands
topics=($_hg_cmd_list $_hg_add_help_topics) topics=($_hg_cmd_list $_hg_add_help_topics)
_describe -t help_topics 'help topics' topics _describe -t help_topics 'help topics' topics
} }
# Common options # Common options
_hg_global_opts=( _hg_global_opts=(
'(--repository -R)'{-R+,--repository=}'[repository root directory]:repository:_files -/' '(--repository -R)'{-R+,--repository=}'[repository root directory or name of overlay bundle file]:repository:_files -/'
spectralUnsubmitted
Not Done

I wonder how hard it would be to add tests to make sure these don't diverge from the actual output in the future? (no action required in this change, just curious if you have any ideas).

At my job our code review system has a "if this is modified, then you probably want to modify this other place" mechanism, I wonder if something like that, generically as part of one of the existing tests (or on its own) would be easier and make more sense than attempting to match the output, just rely on people doing the right thing when the tests prompt them to (with a way of ignoring it, perhaps via something in the commit description). Example:

  1. IfChange @command('^add', walkopts + subrepoopts + dryrunopts, _('[OPTION]... [FILE]...'), inferrrepo=True)
  2. ThenChange(contrib/zsh_completion, contrib/bash_completion) def add(ui, repo, *pats, **opts): ...

Though, since we'd be doing this for every @command, I'm back to thinking it'd probably be better to hard-code it for the completion stuff - something that says "Oh, you've modified the contents of an @command, make sure you update these other locations as well..."

spectral: I wonder how hard it would be to add tests to make sure these don't diverge from the actual…
'--cwd[change working directory]:new working directory:_files -/' '--cwd=[change working directory]:new working directory:_files -/'
'(--noninteractive -y)'{-y,--noninteractive}'[do not prompt, assume yes for any required answers]' '(--noninteractive -y)'{-y,--noninteractive}'[do not prompt, automatically pick the first choice for all prompts]'
'(--verbose -v)'{-v,--verbose}'[enable additional output]' '(--verbose -v)'{-v,--verbose}'[enable additional output]'
'*--config[set/override config option]:defined config items:_hg_config' '*--config[set/override config option]:defined config items:_hg_config'
'(--quiet -q)'{-q,--quiet}'[suppress output]' '(--quiet -q)'{-q,--quiet}'[suppress output]'
'(--help -h)'{-h,--help}'[display help and exit]' '(--help -h)'{-h,--help}'[display help and exit]'
'--debug[debug mode]' '--debug[enable debugging output]'
'--debugger[start debugger]' '--debugger[start debugger]'
'--encoding[set the charset encoding]' '--encoding=[set the charset encoding]:encoding'
'--encodingmode[set the charset encoding mode]' '--encodingmode=[set the charset encoding mode]:encoding mode'
'--lsprof[print improved command execution profile]' '--traceback[always print a traceback on exception]'
'--traceback[print traceback on exception]'
'--time[time how long the command takes]' '--time[time how long the command takes]'
'--profile[profile]' '--profile[print command execution profile]'
'--version[output version information and exit]' '--version[output version information and exit]'
'--hidden[consider hidden changesets]'
'--color=[when to colorize]:when:(true false yes no always auto never debug)'
'--pager=[when to paginate (default: auto)]:when:(true false yes no always auto never)'
) )
_hg_pat_opts=( _hg_pat_opts=(
'*'{-I+,--include=}'[include names matching the given patterns]:dir:_files -W $(_hg_cmd root) -/' '*'{-I+,--include=}'[include names matching the given patterns]:dir:_files -W $(_hg_cmd root) -/'
'*'{-X+,--exclude=}'[exclude names matching the given patterns]:dir:_files -W $(_hg_cmd root) -/') '*'{-X+,--exclude=}'[exclude names matching the given patterns]:dir:_files -W $(_hg_cmd root) -/')
_hg_clone_opts=( _hg_clone_opts=(
$_hg_remote_opts $_hg_remote_opts
'(--noupdate -U)'{-U,--noupdate}'[do not update the new working directory]' '(--noupdate -U)'{-U,--noupdate}'[do not update the new working directory]'
'--pull[use pull protocol to copy metadata]' '--pull[use pull protocol to copy metadata]'
'--uncompressed[use uncompressed transfer (fast over LAN)]') '--uncompressed[use uncompressed transfer (fast over LAN)]')
_hg_date_user_opts=( _hg_date_user_opts=(
'(--currentdate -D)'{-D,--currentdate}'[record the current date as commit date]' '(--currentdate -D)'{-D,--currentdate}'[record the current date as commit date]'
'(--currentuser -U)'{-U,--currentuser}'[record the current user as committer]' '(--currentuser -U)'{-U,--currentuser}'[record the current user as committer]'
'(--date -d)'{-d+,--date=}'[record the specified date as commit date]:date:' '(--date -d)'{-d+,--date=}'[record the specified date as commit date]:date'
'(--user -u)'{-u+,--user=}'[record the specified user as committer]:user:') '(--user -u)'{-u+,--user=}'[record the specified user as committer]:user')
_hg_gitlike_opts=( _hg_gitlike_opts=(
'(--git -g)'{-g,--git}'[use git extended diff format]') '(--git -g)'{-g,--git}'[use git extended diff format]')
_hg_diff_opts=( _hg_diff_opts=(
$_hg_gitlike_opts $_hg_gitlike_opts
'(--text -a)'{-a,--text}'[treat all files as text]' '(--text -a)'{-a,--text}'[treat all files as text]'
'--nodates[omit dates from diff headers]') '--nodates[omit dates from diff headers]')
_hg_mergetool_opts=( _hg_mergetool_opts=(
'(--tool -t)'{-t+,--tool=}'[specify merge tool]:tool:') '(--tool -t)'{-t+,--tool=}'[specify merge tool]:merge tool'
)
_hg_dryrun_opts=( _hg_dryrun_opts=(
'(--dry-run -n)'{-n,--dry-run}'[do not perform actions, just print output]') '(--dry-run -n)'{-n,--dry-run}'[do not perform actions, just print output]')
_hg_ignore_space_opts=( _hg_ignore_space_opts=(
'(--ignore-all-space -w)'{-w,--ignore-all-space}'[ignore white space when comparing lines]' '(--ignore-all-space -w)'{-w,--ignore-all-space}'[ignore white space when comparing lines]'
'(--ignore-space-change -b)'{-b,--ignore-space-change}'[ignore changes in the amount of white space]' '(--ignore-space-change -b)'{-b,--ignore-space-change}'[ignore changes in the amount of white space]'
'(--ignore-blank-lines -B)'{-B,--ignore-blank-lines}'[ignore changes whose lines are all blank]') '(--ignore-blank-lines -B)'{-B,--ignore-blank-lines}'[ignore changes whose lines are all blank]'
'(--ignore-space-at-eol -Z)'{-Z,--ignore-space-at-eol}'[ignore changes in whitespace at EOL]'
)
_hg_template_opts=( _hg_template_opts=(
'--template[display with template]:template' '--template[display with template]:template'
) )
_hg_log_opts=( _hg_log_opts=(
$_hg_global_opts $_hg_template_opts $_hg_gitlike_opts $_hg_global_opts $_hg_template_opts $_hg_gitlike_opts
'(--limit -l)'{-l+,--limit=}'[limit number of changes displayed]:' '(--limit -l)'{-l+,--limit=}'[limit number of changes displayed]:limit'
'(--no-merges -M)'{-M,--no-merges}'[do not show merges]' '(--no-merges -M)'{-M,--no-merges}'[do not show merges]'
'(--patch -p)'{-p,--patch}'[show patch]' '(--patch -p)'{-p,--patch}'[show patch]'
'--stat[output diffstat-style summary of changes]' '--stat[output diffstat-style summary of changes]'
'(--graph -G)'{-G,--graph}'[show the revision DAG]'
) )
_hg_commit_opts=( _hg_commit_opts=(
'(-m --message -l --logfile --edit -e)'{-e,--edit}'[edit commit message]' '(-m --message -l --logfile --edit -e)'{-e,--edit}'[edit commit message]'
'(-e --edit -l --logfile --message -m)'{-m+,--message=}'[use <text> as commit message]:message:' '(-e --edit -l --logfile --message -m)'{-m+,--message=}'[use <text> as commit message]:message'
'(-e --edit -m --message --logfile -l)'{-l+,--logfile=}'[read the commit message from <file>]:log file:_files') '(-e --edit -m --message --logfile -l)'{-l+,--logfile=}'[read the commit message from <file>]:log file:_files')
_hg_remote_opts=( _hg_remote_opts=(
'(--ssh -e)'{-e+,--ssh=}'[specify ssh command to use]:' '(--ssh -e)'{-e+,--ssh=}'[specify ssh command to use]:command'
'--remotecmd[specify hg command to run on the remote side]:') '--remotecmd=[specify hg command to run on the remote side]:remote command'
'--insecure[do not verify server certificate (ignoring web.cacerts config)]'
)
_hg_branch_bmark_opts=( _hg_branch_bmark_opts=(
'(--bookmark -B)'{-B+,--bookmark=}'[specify bookmark(s)]:bookmark:_hg_bookmarks' '(--bookmark -B)'{-B+,--bookmark=}'[specify bookmark(s)]:bookmark:_hg_bookmarks'
'(--branch -b)'{-b+,--branch=}'[specify branch(es)]:branch:_hg_branches' '(--branch -b)'{-b+,--branch=}'[specify branch(es)]:branch:_hg_branches'
) )
_hg_subrepos_opts=( _hg_subrepos_opts=(
'(--subrepos -S)'{-S,--subrepos}'[recurse into subrepositories]') '(--subrepos -S)'{-S,--subrepos}'[recurse into subrepositories]')
_hg_cmd() { _hg_cmd() {
_call_program hg HGPLAIN=1 hg "$_hg_cmd_globals[@]" "$@" 2> /dev/null _call_program hg HGPLAIN=1 hg "$_hg_cmd_globals[@]" "$@" 2> /dev/null
} }
_hg_cmd_add() { _hg_cmd_add() {
_arguments -s -S : $_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' '*:unknown files:_hg_unknown'
} }
_hg_cmd_addremove() { _hg_cmd_addremove() {
_arguments -s -S : $_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)]:' \ '(--similarity -s)'{-s+,--similarity=}'[guess renamed files by similarity (0<=s<=100)]:similarity' \
'*:unknown or missing files:_hg_addremove' '*:unknown or missing files:_hg_addremove'
} }
_hg_cmd_annotate() { _hg_cmd_annotate() {
_arguments -s -S : $_hg_global_opts $_hg_pat_opts \ _arguments -s -S : $_hg_global_opts $_hg_ignore_space_opts $_hg_pat_opts \
'(--rev -r)'{-r+,--rev=}'[annotate the specified revision]:revision:_hg_labels' \ '(--rev -r)'{-r+,--rev=}'[annotate the specified revision]:revision:_hg_labels' \
'(--follow -f)'{-f,--follow}'[follow file copies and renames]' \ "--no-follow[don't follow copies and renames]" \
'(--text -a)'{-a,--text}'[treat all files as text]' \ '(--text -a)'{-a,--text}'[treat all files as text]' \
'(--user -u)'{-u,--user}'[list the author]' \ '(--user -u)'{-u,--user}'[list the author (long with -v)]' \
'(--date -d)'{-d,--date}'[list the date]' \ '(--file -f)'{-f,--file}'[list the filename]' \
'(--date -d)'{-d,--date}'[list the date (short with -q)]' \
'(--number -n)'{-n,--number}'[list the revision number (default)]' \ '(--number -n)'{-n,--number}'[list the revision number (default)]' \
'(--changeset -c)'{-c,--changeset}'[list the changeset]' \ '(--changeset -c)'{-c,--changeset}'[list the changeset]' \
'(--line-number -l)'{-l,--line-number}'[show line number at the first appearance]' \
'*:files:_hg_files' '*:files:_hg_files'
} }
_hg_cmd_archive() { _hg_cmd_archive() {
_arguments -s -S : $_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]' \ '--no-decode[do not pass files through decoders]' \
'(--prefix -p)'{-p+,--prefix=}'[directory prefix for files in archive]:' \ '(--prefix -p)'{-p+,--prefix=}'[directory prefix for files in archive]:prefix' \
'(--rev -r)'{-r+,--rev=}'[revision to distribute]:revision:_hg_labels' \ '(--rev -r)'{-r+,--rev=}'[revision to distribute]:revision:_hg_labels' \
'(--type -t)'{-t+,--type=}'[type of distribution to create]:archive type:(files tar tbz2 tgz uzip zip)' \ '(--type -t)'{-t+,--type=}'[type of distribution to create]:archive type:(files tar tbz2 tgz uzip zip)' \
'*:destination:_files' '*:destination:_files'
} }
_hg_cmd_backout() { _hg_cmd_backout() {
_arguments -s -S : $_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]' \ '--merge[merge with old dirstate parent after backout]' \
'(--date -d)'{-d+,--date=}'[record datecode as commit date]:date code:' \ '(--date -d)'{-d+,--date=}'[record the specified date as commit date]:date' \
'--parent[parent to choose when backing out merge]' \ '--parent[parent to choose when backing out merge]' \
'(--user -u)'{-u+,--user=}'[record user as commiter]:user:' \ '(--user -u)'{-u+,--user=}'[record the specified user as committer]:user' \
'(--rev -r)'{-r+,--rev=}'[revision]:revision:_hg_labels' \ '(--rev -r 1)'{-r+,--rev=}'[revision to backout]:revision:_hg_labels' \
'(--message -m)'{-m+,--message=}'[use <text> as commit message]:text:' \ '(--message -m)'{-m+,--message=}'[use <text> as commit message]:text' \
'(--logfile -l)'{-l+,--logfile=}'[read commit message from <file>]:log file:_files' '(--logfile -l)'{-l+,--logfile=}'[read commit message from <file>]:log file:_files' \
':revision:_hg_labels'
} }
_hg_cmd_bisect() { _hg_cmd_bisect() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts \
'(-)'{-r,--reset}'[reset bisect state]' \ '(-)'{-r,--reset}'[reset bisect state]' \
'(--extend -e)'{-e,--extend}'[extend the bisect range]' \ '(--extend -e)'{-e,--extend}'[extend the bisect range]' \
'(--good -g --bad -b --skip -s --reset -r)'{-g,--good}'[mark changeset good]'::revision:_hg_labels \ '(--good -g --bad -b --skip -s --reset -r)'{-g,--good}'[mark changeset good]'::revision:_hg_labels \
'(--good -g --bad -b --skip -s --reset -r)'{-b,--bad}'[mark changeset bad]'::revision:_hg_labels \ '(--good -g --bad -b --skip -s --reset -r)'{-b,--bad}'[mark changeset bad]'::revision:_hg_labels \
_hg_cmd_branch() { _hg_cmd_branch() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts \
'(--force -f)'{-f,--force}'[set branch name even if it shadows an existing branch]' \ '(--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]' '(--clean -C)'{-C,--clean}'[reset branch name to parent branch name]'
} }
_hg_cmd_branches() { _hg_cmd_branches() {
_arguments -s -S : $_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]' '(--closed -c)'{-c,--closed}'[show normal and closed branches]'
} }
_hg_cmd_bundle() { _hg_cmd_bundle() {
_arguments -s -S : $_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]' \ '(--force -f)'{-f,--force}'[run even when the destination is unrelated]' \
'(2)*--base[a base changeset to specify instead of a destination]:revision:_hg_labels' \ '(2)*--base[a base changeset assumed to be available at the destination]:revision:_hg_labels' \
'(--branch -b)'{-b+,--branch=}'[a specific branch to bundle]:' \ '*'{-b+,--branch=}'[a specific branch you would like to bundle]:branch:_hg_branches' \
'(--rev -r)'{-r+,--rev=}'[changeset(s) to bundle]:' \ '*'{-r+,--rev=}'[a changeset intended to be added to the destination]:revision:_hg_labels' \
'--all[bundle all changesets in the repository]' \ '--all[bundle all changesets in the repository]' \
'--type[bundle compression type to use (default: bzip2)]:bundle type' \
':output file:_files' \ ':output file:_files' \
':destination repository:_files -/' ':destination repository:_files -/'
} }
_hg_cmd_cat() { _hg_cmd_cat() {
_arguments -s -S : $_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:' \ '(--output -o)'{-o+,--output=}'[print output to file with formatted name]:format string' \
'(--rev -r)'{-r+,--rev=}'[revision]:revision:_hg_labels' \ '(--rev -r)'{-r+,--rev=}'[revision]:revision:_hg_labels' \
'--decode[apply any matching decode filter]' \ '--decode[apply any matching decode filter]' \
'*:file:_hg_files' '*:file:_hg_files'
} }
_hg_cmd_clone() { _hg_cmd_clone() {
_arguments -s -S : $_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]:' \ '*'{-r+,--rev=}'[do not clone everything, but include this changeset and its ancestors]:revision' \
'(--updaterev -u)'{-u+,--updaterev=}'[revision, tag or branch to check out]:' \ '(--updaterev -u)'{-u+,--updaterev=}'[revision, tag or branch to check out]:revision' \
'(--branch -b)'{-b+,--branch=}'[clone only the specified branch]:' \ '*'{-b+,--branch=}"[do not clone everything, but include this branch's changesets and their ancestors]:branch" \
':source repository:_hg_remote' \ ':source repository:_hg_remote' \
':destination:_hg_clone_dest' ':destination:_hg_clone_dest'
} }
_hg_cmd_commit() { _hg_cmd_commit() {
_arguments -s -S : $_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]' \ '(--addremove -A)'{-A,--addremove}'[mark new/missing files as added/removed before committing]' \
'(--message -m)'{-m+,--message=}'[use <text> as commit message]:text:' \ '(--message -m)'{-m+,--message=}'[use <text> as commit message]:text' \
'(--logfile -l)'{-l+,--logfile=}'[read commit message from <file>]:log file:_files' \ '(--logfile -l)'{-l+,--logfile=}'[read commit message from <file>]:log file:_files' \
'(--date -d)'{-d+,--date=}'[record datecode as commit date]:date code:' \ '(--date -d)'{-d+,--date=}'[record the specified date as commit date]:date' \
'(--user -u)'{-u+,--user=}'[record user as commiter]:user:' \ '(--user -u)'{-u+,--user=}'[record the specified user as committer]:user' \
'--amend[amend the parent of the working dir]' \ '--amend[amend the parent of the working directory]' \
'--close-branch[mark a branch as closed]' \ '--close-branch[mark a branch head as closed]' \
'(--interactive -i)'{-i,--interactive}'[use interactive mode]' \
'(--secret -s)'{-s,--secret}'[use the secret phase for committing]' \
'*:file:_hg_committable' '*:file:_hg_committable'
} }
_hg_cmd_copy() { _hg_cmd_copy() {
_arguments -s -S : $_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]' \ '(--after -A)'{-A,--after}'[record a copy that has already occurred]' \
'(--force -f)'{-f,--force}'[forcibly copy over an existing managed file]' \ '(--force -f)'{-f,--force}'[forcibly copy over an existing managed file]' \
'*:file:_hg_files' '*:file:_hg_files'
} }
_hg_cmd_diff() { _hg_cmd_diff() {
local context state state_descr line ret=1 local context state state_descr line ret=1
typeset -A opt_args typeset -A opt_args
_arguments -s -S : $_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 \ $_hg_pat_opts $_hg_subrepos_opts \
'*'{-r+,--rev=}'[revision]:revision:_hg_revrange' \ '*'{-r+,--rev=}'[revision]:revision:_hg_revrange' \
'--noprefix[omit a/ and b/ prefixes from filenames]' \
'(--show-function -p)'{-p,--show-function}'[show which function each change is in]' \ '(--show-function -p)'{-p,--show-function}'[show which function each change is in]' \
'(--change -c)'{-c+,--change=}'[change made by revision]:' \ '(--change -c)'{-c+,--change=}'[change made by revision]:revision:_hg_labels' \
'(--text -a)'{-a,--text}'[treat all files as text]' \ '(--text -a)'{-a,--text}'[treat all files as text]' \
'--reverse[produce a diff that undoes the changes]' \ '--reverse[produce a diff that undoes the changes]' \
'(--unified -U)'{-U+,--unified=}'[number of lines of context to show]:' \ '(--unified -U)'{-U+,--unified=}'[number of lines of context to show]:count' \
'--stat[output diffstat-style summary of changes]' \ '--stat[output diffstat-style summary of changes]' \
'--root=[produce diffs relative to subdirectory]:directory:_files -/' \
'*:file:->diff_files' && ret=0 '*:file:->diff_files' && ret=0
if [[ $state == 'diff_files' ]] if [[ $state == 'diff_files' ]]
then then
if [[ -n $opt_args[-r] ]] if [[ -n $opt_args[-r] ]]
then then
_hg_files && ret=0 _hg_files && ret=0
else else
_hg_committable && ret=0 _hg_committable && ret=0
fi fi
fi fi
return ret return ret
} }
_hg_cmd_export() { _hg_cmd_export() {
_arguments -s -S : $_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:' \ '(--output -o)'{-o+,--output=}'[print output to file with formatted name]:format string' \
'--switch-parent[diff against the second parent]' \ '--switch-parent[diff against the second parent]' \
'(--rev -r)'{-r+,--rev=}'[revision]:revision:_hg_labels' \ '*'{-r+,--rev=}'[revisions to export]:revision:_hg_labels' \
'*:revision:_hg_labels' '*:revision:_hg_labels'
} }
_hg_cmd_forget() { _hg_cmd_forget() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \
'(--interactive -i)'{-i,--interactive}'[use interactive mode]' \
'*:file:_hg_files' '*:file:_hg_files'
} }
_hg_cmd_graft() { _hg_cmd_graft() {
_arguments -s -S : $_hg_global_opts $_hg_dryrun_opts \ _arguments -s -S : $_hg_global_opts $_hg_dryrun_opts \
$_hg_date_user_opts $_hg_mergetool_opts \ $_hg_date_user_opts $_hg_mergetool_opts \
'(--continue -c)'{-c,--continue}'[resume interrupted graft]' \ '*'{-r+,--rev=}'[revisions to graft]:revision:_hg_labels' \
'(--continue -c --abort -a)'{-c,--continue}'[resume interrupted graft]' \
spectralUnsubmitted
Not Done

I assume the first section here makes continue and abort mutually exclusive? I believe that revision arguments are also forbidden if either --continue or --abort are specified; I don't know if there's a way of representing that.

spectral: I assume the first section here makes continue and abort mutually exclusive? I believe that…
av6AuthorUnsubmitted
Not Done

Just having --rev -r inside the parentheses should be enough, but I'm not sure if implementing every piece of exclusivity logic here makes sense (I'm also concerned about completions diverging from real behavior). But I've found this in zsh's _git:
(- :)--abort[cancel revert or cherry-pick sequence]
This form disables completion of any other arguments, and I think it's future-proof enough to do this for --abort here. I'll do a follow-up to touch just exclusivity when this series lands.

av6: Just having `--rev -r` inside the parentheses should be enough, but I'm not sure if…
'(--continue -c --abort -a)'{-a,--abort}'[abort interrupted graft]' \
'(--edit -e)'{-e,--edit}'[invoke editor on commit messages]' \ '(--edit -e)'{-e,--edit}'[invoke editor on commit messages]' \
'--log[append graft info to log message]' \ '--log[append graft info to log message]' \
'*:revision:_hg_labels' '*:revision:_hg_labels'
} }
_hg_cmd_grep() { _hg_cmd_grep() {
_arguments -s -S : $_hg_global_opts $_hg_pat_opts \ _arguments -s -S : $_hg_global_opts $_hg_pat_opts \
'(--print0 -0)'{-0,--print0}'[end filenames with NUL]' \ '(--print0 -0)'{-0,--print0}'[end filenames with NUL]' \
'(--closed -c)'{-c,--closed}'[show normal and closed branch heads]' \ '(--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' '(--rev -r)'{-r+,--rev=}'[show only heads which are descendants of rev]:revision:_hg_labels'
} }
_hg_cmd_help() { _hg_cmd_help() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts \
'(--extension -e)'{-e,--extension}'[show only help for extensions]' \ '(--extension -e)'{-e,--extension}'[show only help for extensions]' \
'(--command -c)'{-c,--command}'[show only help for commands]' \ '(--command -c)'{-c,--command}'[show only help for commands]' \
'(--keyword -k)'{-k+,--keyword}'[show topics matching keyword]' \ '(--keyword -k)'{-k,--keyword}'[show topics matching keyword]' \
'*:mercurial help topic:_hg_help_topics' '*:mercurial help topic:_hg_help_topics'
} }
_hg_cmd_identify() { _hg_cmd_identify() {
_arguments -s -S : $_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' \ '(--rev -r)'{-r+,--rev=}'[identify the specified rev]:revision:_hg_labels' \
'(--num -n)'{-n,--num}'[show local revision number]' \ '(--num -n)'{-n,--num}'[show local revision number]' \
'(--id -i)'{-i,--id}'[show global revision id]' \ '(--id -i)'{-i,--id}'[show global revision id]' \
'(--branch -b)'{-b,--branch}'[show branch]' \ '(--branch -b)'{-b,--branch}'[show branch]' \
'(--bookmark -B)'{-B,--bookmark}'[show bookmarks]' \ '(--bookmarks -B)'{-B,--bookmarks}'[show bookmarks]' \
'(--tags -t)'{-t,--tags}'[show tags]' '(--tags -t)'{-t,--tags}'[show tags]'
} }
_hg_cmd_import() { _hg_cmd_import() {
_arguments -s -S : $_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:' \ '(--strip -p)'{-p+,--strip=}'[directory strip option for patch (default: 1)]:count' \
'(--force -f)'{-f,--force}'[skip check for outstanding uncommitted changes]' \ '(--force -f)'{-f,--force}'[skip check for outstanding uncommitted changes]' \
'--bypass[apply patch without touching the working directory]' \ '--bypass[apply patch without touching the working directory]' \
'--no-commit[do not commit, just update the working directory]' \ '--no-commit[do not commit, just update the working directory]' \
'--partial[commit even if some hunks fail]' \ '--partial[commit even if some hunks fail]' \
'--exact[apply patch to the nodes from which it was generated]' \ '--exact[abort if patch would apply lossily]' \
'--import-branch[use any branch information in patch (implied by --exact)]' \ '--import-branch[use any branch information in patch (implied by --exact)]' \
'(--date -d)'{-d+,--date=}'[record datecode as commit date]:date code:' \ '(--date -d)'{-d+,--date=}'[record the specified date as commit date]:date' \
'(--user -u)'{-u+,--user=}'[record user as commiter]:user:' \ '(--user -u)'{-u+,--user=}'[record the specified user as committer]:user' \
'(--similarity -s)'{-s+,--similarity=}'[guess renamed files by similarity (0<=s<=100)]:' \ '(--similarity -s)'{-s+,--similarity=}'[guess renamed files by similarity (0<=s<=100)]:similarity' \
'*:patch:_files' '*:patch:_files'
} }
_hg_cmd_incoming() { _hg_cmd_incoming() {
_arguments -s -S : $_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 \ $_hg_subrepos_opts \
'(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \ '(--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' \ '*'{-r+,--rev=}'[a remote changeset intended to be added]:revision:_hg_labels' \
'(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \ '(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \
'--bundle[file to store the bundles into]:bundle file:_files' \ '--bundle[file to store the bundles into]:bundle file:_files' \
':source:_hg_remote' ':source:_hg_remote'
} }
_hg_cmd_init() { _hg_cmd_init() {
_arguments -s -S : $_hg_global_opts $_hg_remote_opts \ _arguments -s -S : $_hg_global_opts $_hg_remote_opts \
':dir:_files -/' ':dir:_files -/'
} }
_hg_cmd_locate() { _hg_cmd_locate() {
_arguments -s -S : $_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' \ '(--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]' \ '(--print0 -0)'{-0,--print0}'[end filenames with NUL, for use with xargs]' \
'(--fullpath -f)'{-f,--fullpath}'[print complete paths]' \ '(--fullpath -f)'{-f,--fullpath}'[print complete paths from the filesystem root]' \
'*:search pattern:_hg_files' '*:search pattern:_hg_files'
} }
_hg_cmd_log() { _hg_cmd_log() {
_arguments -s -S : $_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]' \ '(--follow --follow-first -f)'{-f,--follow}'[follow changeset or history]' \
'(-f --follow)--follow-first[only follow the first parent of merge changesets]' \ '(-f --follow)--follow-first[only follow the first parent of merge changesets]' \
'(--copies -C)'{-C,--copies}'[show copied files]' \ '(--copies -C)'{-C,--copies}'[show copied files]' \
'(--keyword -k)'{-k+,--keyword}'[search for a keyword]:' \ '*'{-k+,--keyword=}'[search for a keyword]:keyword' \
'*'{-r+,--rev=}'[show the specified revision or revset]:revision:_hg_revrange' \ '*'{-r+,--rev=}'[show the specified revision or revset]:revision:_hg_revrange' \
'(--only-merges -m)'{-m,--only-merges}'[show only merges]' \ '(--only-merges -m)'{-m,--only-merges}'[show only merges]' \
'(--prune -P)'{-P+,--prune=}'[do not display revision or any of its ancestors]:revision:_hg_labels' \ '*'{-P+,--prune=}'[do not display revision or any of its ancestors]:revision:_hg_labels' \
'(--graph -G)'{-G,--graph}'[show the revision DAG]' \ '*'{-b+,--branch=}'[show changesets within the given named branch]:branch:_hg_branches' \
'(--branch -b)'{-b+,--branch=}'[show changesets within the given named branch]:branch:_hg_branches' \ '*'{-u+,--user=}'[revisions committed by user]:user' \
'(--user -u)'{-u+,--user=}'[revisions committed by user]:user:' \ '(--date -d)'{-d+,--date=}'[show revisions matching date spec]:date' \
'(--date -d)'{-d+,--date=}'[show revisions matching date spec]:date:' \
'*:files:_hg_files' '*:files:_hg_files'
} }
_hg_cmd_manifest() { _hg_cmd_manifest() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts \
'--all[list files from all revisions]' \ '--all[list files from all revisions]' \
'(--rev -r)'{-r+,--rev=}'[revision to display]:revision:_hg_labels' \ '(--rev -r)'{-r+,--rev=}'[revision to display]:revision:_hg_labels' \
':revision:_hg_labels' ':revision:_hg_labels'
} }
_hg_cmd_merge() { _hg_cmd_merge() {
_arguments -s -S : $_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]' \ '(--force -f)'{-f,--force}'[force a merge with outstanding changes]' \
'(--rev -r 1)'{-r+,--rev=}'[revision to merge]:revision:_hg_mergerevs' \ '(--rev -r 1)'{-r+,--rev=}'[revision to merge]:revision:_hg_mergerevs' \
'(--preview -P)'{-P,--preview}'[review revisions to merge (no merge is performed)]' \ '(--preview -P)'{-P,--preview}'[review revisions to merge (no merge is performed)]' \
':revision:_hg_mergerevs' ':revision:_hg_mergerevs'
} }
_hg_cmd_outgoing() { _hg_cmd_outgoing() {
_arguments -s -S : $_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 \ $_hg_subrepos_opts \
'(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \ '(--force -f)'{-f,--force}'[run even when the destination is unrelated]' \
'*'{-r+,--rev=}'[a specific revision you would like to push]:revision:_hg_revrange' \ '*'{-r+,--rev=}'[a changeset intended to be included in the destination]:revision:_hg_revrange' \
'(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \ '(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \
':destination:_hg_remote' ':destination:_hg_remote'
} }
_hg_cmd_parents() { _hg_cmd_parents() {
_arguments -s -S : $_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' \ '(--rev -r)'{-r+,--rev=}'[show parents of the specified rev]:revision:_hg_labels' \
':last modified file:_hg_files' ':last modified file:_hg_files'
} }
_hg_cmd_paths() { _hg_cmd_paths() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts \
':path:_hg_paths' ':path:_hg_paths'
} }
_hg_cmd_phase() { _hg_cmd_phase() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts \
'(--public -p)'{-p,--public}'[set changeset phase to public]' \ '(--public -p --draft -d --secret -s)'{-p,--public}'[set changeset phase to public]' \
'(--draft -d)'{-d,--draft}'[set changeset phase to draft]' \ '(--public -p --draft -d --secret -s)'{-d,--draft}'[set changeset phase to draft]' \
'(--secret -s)'{-s,--secret}'[set changeset phase to secret]' \ '(--public -p --draft -d --secret -s)'{-s,--secret}'[set changeset phase to secret]' \
'(--force -f)'{-f,--force}'[allow to move boundary backward]' \ '(--force -f)'{-f,--force}'[allow to move boundary backward]' \
'(--rev -r)'{-r+,--rev=}'[target revision]:revision:_hg_labels' \ '*'{-r+,--rev=}'[target revision]:revision:_hg_labels' \
':revision:_hg_labels' '*:revision:_hg_labels'
} }
_hg_cmd_pull() { _hg_cmd_pull() {
_arguments -s -S : $_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]' \ '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
'(--update -u)'{-u,--update}'[update to new tip if changesets were pulled]' \ '(--update -u)'{-u,--update}'[update to new branch head if new descendants were pulled]' \
'(--rev -r)'{-r+,--rev}'[a specific revision up to which you would like to pull]:revision:' \ '*'{-r+,--rev=}'[a remote changeset intended to be added]:revision:_hg_labels' \
':source:_hg_remote' ':source:_hg_remote'
} }
_hg_cmd_push() { _hg_cmd_push() {
_arguments -s -S : $_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]' \ '(--force -f)'{-f,--force}'[force push]' \
'(--rev -r)'{-r+,--rev=}'[a specific revision you would like to push]:revision:_hg_labels' \ '*'{-r+,--rev=}'[a changeset intended to be included in the destination]:revision:_hg_labels' \
'--new-branch[allow pushing a new branch]' \ '--new-branch[allow pushing a new branch]' \
':destination:_hg_remote' ':destination:_hg_remote'
} }
_hg_cmd_remove() { _hg_cmd_remove() {
_arguments -s -S : $_hg_global_opts $_hg_pat_opts \ _arguments -s -S : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \
'(--after -A)'{-A,--after}'[record remove that has already occurred]' \ '(--after -A)'{-A,--after}'[record delete for missing files]' \
'(--force -f)'{-f,--force}'[remove file even if modified]' \ '(--force -f)'{-f,--force}'[forget added files, delete modified files]' \
'*:file:_hg_files' '*:file:_hg_files'
} }
_hg_cmd_rename() { _hg_cmd_rename() {
_arguments -s -S : $_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]' \ '(--after -A)'{-A,--after}'[record a rename that has already occurred]' \
'(--force -f)'{-f,--force}'[forcibly copy over an existing managed file]' \ '(--force -f)'{-f,--force}'[forcibly copy over an existing managed file]' \
'*:file:_hg_files' '*:file:_hg_files'
} }
_hg_cmd_resolve() { _hg_cmd_resolve() {
local context state state_descr line ret=1 local context state state_descr line ret=1
typeset -A opt_args typeset -A opt_args
_arguments -s -S : $_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]' \ '(--all -a)'{-a,--all}'[select all unresolved files]' \
'(--no-status -n)'{-n,--no-status}'[hide status prefix]' \ '(--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' \ '(--list -l --mark -m --unmark -u)'{-l,--list}'[list state of files needing merge]:*:merged files:->resolve_files' \
'(--mark -m --list -l --unmark -u)'{-m,--mark}'[mark files as resolved]:*:unresolved files:_hg_unresolved' \ '(--mark -m --list -l --unmark -u)'{-m,--mark}'[mark files as resolved]:*:unresolved files:_hg_unresolved' \
'(--unmark -u --list -l --mark -m)'{-u,--unmark}'[unmark files as resolved]:*:resolved files:_hg_resolved' \ '(--unmark -u --list -l --mark -m)'{-u,--unmark}'[mark files as unresolved]:*:resolved files:_hg_resolved' \
spectralUnsubmitted
Not Done

Does the order of the first section matter? Should the three of them be identical?

spectral: Does the order of the first section matter? Should the three of them be identical?
av6AuthorUnsubmitted
Not Done

I don't think it matters. All options that the group mentions just disappear from completion when -l, -m or -u is present.

av6: I don't think it matters. All options that the group mentions just disappear from completion…
'*:file:_hg_unresolved' && ret=0 '*:file:_hg_unresolved' && ret=0
if [[ $state == 'resolve_files' ]] if [[ $state == 'resolve_files' ]]
then then
_alternative 'files:resolved files:_hg_resolved' \ _alternative 'files:resolved files:_hg_resolved' \
'files:unresolved files:_hg_unresolved' && ret=0 'files:unresolved files:_hg_unresolved' && ret=0
fi fi
return ret return ret
} }
_hg_cmd_revert() { _hg_cmd_revert() {
local context state state_descr line ret=1 local context state state_descr line ret=1
typeset -A opt_args typeset -A opt_args
_arguments -s -S : $_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]' \ '(--all -a :)'{-a,--all}'[revert all changes when no arguments given]' \
'(--rev -r)'{-r+,--rev=}'[revision to revert to]:revision:_hg_labels' \ '(--rev -r)'{-r+,--rev=}'[revision to revert to]:revision:_hg_labels' \
'(--no-backup -C)'{-C,--no-backup}'[do not save backup copies of files]' \ '(--no-backup -C)'{-C,--no-backup}'[do not save backup copies of files]' \
'(--date -d)'{-d+,--date=}'[tipmost revision matching date]:date code:' \ '(--date -d)'{-d+,--date=}'[tipmost revision matching date]:date' \
'(--interactive -i)'{-i,--interactive}'[interactively select the changes]' \
'*:file:->revert_files' && ret=0 '*:file:->revert_files' && ret=0
if [[ $state == 'revert_files' ]] if [[ $state == 'revert_files' ]]
then then
if [[ -n $opt_args[-r] ]] if [[ -n $opt_args[-r] ]]
then then
_hg_files && ret=0 _hg_files && ret=0
else else
typeset -a status_files typeset -a status_files
_hg_status mard _hg_status mard
_wanted files expl 'modified, added, removed or deleted file' _multi_parts / status_files && ret=0 _wanted files expl 'modified, added, removed or deleted file' _multi_parts / status_files && ret=0
fi fi
fi fi
return ret return ret
} }
_hg_cmd_rollback() { _hg_cmd_rollback() {
_arguments -s -S : $_hg_global_opts $_hg_dryrun_opts \ _arguments -s -S : $_hg_global_opts $_hg_dryrun_opts \
'(--force -f)'{-f,--force}'[ignore safety measures]' \ '(--force -f)'{-f,--force}'[ignore safety measures]' \
} }
_hg_cmd_serve() { _hg_cmd_serve() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts \
'(--accesslog -A)'{-A+,--accesslog=}'[name of access log file]:log file:_files' \ '(--accesslog -A)'{-A+,--accesslog=}'[name of access log file to write to]:log file:_files' \
'(--errorlog -E)'{-E+,--errorlog=}'[name of error log file]:log file:_files' \ '(--errorlog -E)'{-E+,--errorlog=}'[name of error log file to write to]:log file:_files' \
'(--daemon -d)'{-d,--daemon}'[run server in background]' \ '(--daemon -d)'{-d,--daemon}'[run server in background]' \
'(--port -p)'{-p+,--port=}'[listen port]:listen port:' \ '(--port -p)'{-p+,--port=}'[port to listen on (default: 8000)]:listen port' \
'(--address -a)'{-a+,--address=}'[interface address]:interface address:' \ '(--address -a)'{-a+,--address=}'[address to listen on (default: all interfaces)]:interface address' \
'--prefix[prefix path to serve from]:directory:_files' \ '--prefix=[prefix path to serve from (default: server root)]:directory:_files' \
'(--name -n)'{-n+,--name=}'[name to show in web pages]:repository name:' \ '(--name -n)'{-n+,--name=}'[name to show in web pages (default: working directory)]:repository name' \
'--web-conf[name of the hgweb config file]:webconf_file:_files' \ '--web-conf=[name of the hgweb config file]:config file:_files' \
'--pid-file[name of file to write process ID to]:pid_file:_files' \ '--pid-file=[name of file to write process ID to]:pid file:_files' \
'--cmdserver[cmdserver mode]:mode:' \ '--cmdserver[for remote clients]' \
'(--templates -t)'{-t,--templates}'[web template directory]:template dir:_files -/' \ '(--templates -t)'{-t+,--templates=}'[web template directory]:template dir:_files -/' \
'--style[web template style]:style' \ '--style=[template style to use]:style' \
'--stdio[for remote clients]' \ '--stdio[for remote clients]' \
'--certificate[certificate file]:cert_file:_files' \ '(--ipv6 -6)'{-6,--ipv6}'[use IPv6 in addition to IPv4]' \
'(--ipv6 -6)'{-6,--ipv6}'[use IPv6 in addition to IPv4]' '--certificate=[SSL certificate file]:certificate file:_files' \
'--print-url[start and print only the URL]'
} }
_hg_cmd_showconfig() { _hg_cmd_showconfig() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts \
'(--untrusted -u)'{-u,--untrusted}'[show untrusted configuration options]' \ '(--untrusted -u)'{-u,--untrusted}'[show untrusted configuration options]' \
':config item:_hg_config' '(--edit -e)'{-e,--edit}'[edit user config]' \
'(--local -l --global -g)'{-l,--local}'[edit repository config]' \
'(--local -l --global -g)'{-g,--global}'[edit global config]' \
'*:config item:_hg_config'
} }
_hg_cmd_status() { _hg_cmd_status() {
_arguments -s -S : $_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]' \ '(--all -A)'{-A,--all}'[show status of all files]' \
'(--modified -m)'{-m,--modified}'[show only modified files]' \ '(--modified -m)'{-m,--modified}'[show only modified files]' \
'(--added -a)'{-a,--added}'[show only added files]' \ '(--added -a)'{-a,--added}'[show only added files]' \
'(--removed -r)'{-r,--removed}'[show only removed files]' \ '(--removed -r)'{-r,--removed}'[show only removed files]' \
'(--deleted -d)'{-d,--deleted}'[show only deleted (but tracked) files]' \ '(--deleted -d)'{-d,--deleted}'[show only deleted (but tracked) files]' \
'(--clean -c)'{-c,--clean}'[show only files without changes]' \ '(--clean -c)'{-c,--clean}'[show only files without changes]' \
'(--unknown -u)'{-u,--unknown}'[show only unknown files]' \ '(--unknown -u)'{-u,--unknown}'[show only unknown (not tracked) files]' \
'(--ignored -i)'{-i,--ignored}'[show ignored files]' \ '(--ignored -i)'{-i,--ignored}'[show ignored files]' \
'(--no-status -n)'{-n,--no-status}'[hide status prefix]' \ '(--no-status -n)'{-n,--no-status}'[hide status prefix]' \
'(--copies -C)'{-C,--copies}'[show source of copied files]' \ '(--copies -C)'{-C,--copies}'[show source of copied files]' \
'(--print0 -0)'{-0,--print0}'[end filenames with NUL, for use with xargs]' \ '(--print0 -0)'{-0,--print0}'[end filenames with NUL, for use with xargs]' \
'--rev[show difference from revision]:revision:_hg_labels' \ '*--rev=[show difference from revision]:revision:_hg_labels' \
'--change[list the changed files of a revision]:revision:_hg_labels' \ '--change=[list the changed files of a revision]:revision:_hg_labels' \
'*:files:_files' '*:files:_files'
} }
_hg_cmd_summary() { _hg_cmd_summary() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts \
'--remote[check for push and pull]' '--remote[check for push and pull]'
} }
_hg_cmd_tag() { _hg_cmd_tag() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts \
'(--local -l)'{-l,--local}'[make the tag local]' \ '(--local -l)'{-l,--local}'[make the tag local]' \
'(--message -m)'{-m+,--message=}'[message for tag commit log entry]:message:' \ '(--message -m)'{-m+,--message=}'[message for tag commit log entry]:message' \
'(--date -d)'{-d+,--date=}'[record datecode as commit date]:date code:' \ '(--date -d)'{-d+,--date=}'[record the specified date as commit date]:date' \
'(--user -u)'{-u+,--user=}'[record user as commiter]:user:' \ '(--user -u)'{-u+,--user=}'[record the specified user as committer]:user' \
'(--rev -r)'{-r+,--rev=}'[revision to tag]:revision:_hg_labels' \ '(--rev -r)'{-r+,--rev=}'[revision to tag]:revision:_hg_labels' \
'(--force -f)'{-f,--force}'[force tag]' \ '(--force -f)'{-f,--force}'[force tag]' \
'--remove[remove a tag]' \ '--remove[remove a tag]' \
'(--edit -e)'{-e,--edit}'[edit commit message]' \ '(--edit -e)'{-e,--edit}'[edit commit message]' \
':tag name:' ':tag name:'
} }
_hg_cmd_tip() { _hg_cmd_tip() {
_arguments -s -S : $_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]' '(--patch -p)'{-p,--patch}'[show patch]'
} }
_hg_cmd_unbundle() { _hg_cmd_unbundle() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts \
'(--update -u)'{-u,--update}'[update to new tip if changesets were unbundled]' \ '(--update -u)'{-u,--update}'[update to new tip if changesets were unbundled]' \
':files:_files' '*:files:_files'
} }
_hg_cmd_update() { _hg_cmd_update() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts $_hg_mergetool_opts \
'(--clean -C)'{-C,--clean}'[overwrite locally modified files]' \ '(--clean -C)'{-C,--clean}'[discard uncommitted changes (no backup)]' \
'(--rev -r)'{-r+,--rev=}'[revision]:revision:_hg_labels' \ '(--check -c)'{-c,--check}'[require clean working directory]' \
'(--check -c)'{-c,--check}'[update across branches if no uncommitted changes]' \ '(--merge -m)'{-m,--merge}'[merge uncommitted changes]' \
'(--date -d)'{-d+,--date=}'[tipmost revision matching date]:' \ '(--date -d)'{-d+,--date=}'[tipmost revision matching date]:date' \
'(--rev -r 1)'{-r+,--rev=}'[revision]:revision:_hg_labels' \
':revision:_hg_labels' ':revision:_hg_labels'
} }
## extensions ## ## extensions ##
# HGK # HGK
_hg_cmd_view() { _hg_cmd_view() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts \
'(--limit -l)'{-l+,--limit=}'[limit number of changes displayed]:' \ '(--limit -l)'{-l+,--limit=}'[limit number of changes displayed]:limit' \
':revision range:_hg_labels' ':revision range:_hg_labels'
} }
# MQ # MQ
_hg_qseries() { _hg_qseries() {
typeset -a patches typeset -a patches
patches=(${(f)"$(_hg_cmd qseries)"}) patches=(${(f)"$(_hg_cmd qseries)"})
(( $#patches )) && _describe -t hg-patches 'patches' patches (( $#patches )) && _describe -t hg-patches 'patches' patches
_hg_cmd_qfinish() { _hg_cmd_qfinish() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts \
'(--applied -a)'{-a,--applied}'[finish all applied patches]' \ '(--applied -a)'{-a,--applied}'[finish all applied patches]' \
'*:patch:_hg_qapplied' '*:patch:_hg_qapplied'
} }
_hg_cmd_qfold() { _hg_cmd_qfold() {
_arguments -s -S : $_hg_global_opts $_h_commit_opts \ _arguments -s -S : $_hg_global_opts $_h_commit_opts \
'(--keep,-k)'{-k,--keep}'[keep folded patch files]' \ '(--keep -k)'{-k,--keep}'[keep folded patch files]' \
'(--force -f)'{-f,--force}'[overwrite any local changes]' \ '(--force -f)'{-f,--force}'[overwrite any local changes]' \
'--no-backup[do not save backup copies of files]' \ '--no-backup[do not save backup copies of files]' \
'*:unapplied patch:_hg_qunapplied' '*:unapplied patch:_hg_qunapplied'
} }
_hg_cmd_qgoto() { _hg_cmd_qgoto() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts \
'(--force -f)'{-f,--force}'[overwrite any local changes]' \ '(--force -f)'{-f,--force}'[overwrite any local changes]' \
_hg_cmd_qheader() { _hg_cmd_qheader() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts \
':patch:_hg_qseries' ':patch:_hg_qseries'
} }
_hg_cmd_qimport() { _hg_cmd_qimport() {
_arguments -s -S : $_hg_global_opts $_hg_gitlike_opts \ _arguments -s -S : $_hg_global_opts $_hg_gitlike_opts \
'(--existing -e)'{-e,--existing}'[import file in patch dir]' \ '(--existing -e)'{-e,--existing}'[import file in patch dir]' \
'(--name -n 2)'{-n+,--name}'[patch file name]:name:' \ '(--name -n 2)'{-n+,--name}'[patch file name]:name' \
'(--force -f)'{-f,--force}'[overwrite existing files]' \ '(--force -f)'{-f,--force}'[overwrite existing files]' \
'*'{-r+,--rev=}'[place existing revisions under mq control]:revision:_hg_revrange' \ '*'{-r+,--rev=}'[place existing revisions under mq control]:revision:_hg_revrange' \
'(--push -P)'{-P,--push}'[qpush after importing]' \ '(--push -P)'{-P,--push}'[qpush after importing]' \
'*:patch:_files' '*:patch:_files'
} }
_hg_cmd_qnew() { _hg_cmd_qnew() {
_arguments -s -S : $_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_cmd_qtop() { _hg_cmd_qtop() {
_arguments -s -S : $_hg_global_opts $_hg_qseries_opts _arguments -s -S : $_hg_global_opts $_hg_qseries_opts
} }
_hg_cmd_strip() { _hg_cmd_strip() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts \
'(--force -f)'{-f,--force}'[force removal, discard uncommitted changes, no backup]' \ '(--force -f)'{-f,--force}'[force removal of changesets, discard uncommitted changes (no backup)]' \
'(--no-backup -n)'{-n,--no-backup}'[no backups]' \ '--no-backup[no backups]' \
'(--keep -k)'{-k,--keep}'[do not modify working copy during strip]' \ '(--keep -k)'{-k,--keep}'[do not modify working directory during strip]' \
'(--bookmark -B)'{-B+,--bookmark=}'[remove revs only reachable from given bookmark]:bookmark:_hg_bookmarks' \ '*'{-B+,--bookmark=}'[remove revs only reachable from given bookmark]:bookmark:_hg_bookmarks' \
'(--rev -r)'{-r+,--rev=}'[revision]:revision:_hg_labels' \ '*'{-r+,--rev=}'[revision]:revision:_hg_labels' \
':revision:_hg_labels' '*:revision:_hg_labels'
} }
# Patchbomb # Patchbomb
_hg_cmd_email() { _hg_cmd_email() {
_arguments -s -S : $_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]' \ '--plain[omit hg patch header]' \
'--body[send patches as inline message text (default)]' \ '--body[send patches as inline message text (default)]' \
'(--outgoing -o)'{-o,--outgoing}'[send changes not found in the target repository]' \ '(--outgoing -o)'{-o,--outgoing}'[send changes not found in the target repository]' \
'(--bundle -b)'{-b,--bundle}'[send changes not in target as a binary bundle]' \ '(--bundle -b)'{-b,--bundle}'[send changes not in target as a binary bundle]' \
'--bundlename[name of the bundle attachment file (default: bundle)]:' \ '--bundlename[name of the bundle attachment file (default: bundle)]:' \
'*'{-r+,--rev=}'[search in given revision range]:revision:_hg_revrange' \ '*'{-r+,--rev=}'[search in given revision range]:revision:_hg_revrange' \
'--force[run even when remote repository is unrelated (with -b/--bundle)]' \ '--force[run even when remote repository is unrelated (with -b/--bundle)]' \
'*--base[a base changeset to specify instead of a destination (with -b/--bundle)]:revision:_hg_labels' \ '*--base=[a base changeset to specify instead of a destination (with -b/--bundle)]:revision:_hg_labels' \
'--intro[send an introduction email for a single patch]' \ '--intro[send an introduction email for a single patch]' \
'(--inline -i --attach -a)'{-a,--attach}'[send patches as attachments]' \ '(--inline -i --attach -a)'{-a,--attach}'[send patches as attachments]' \
'(--attach -a --inline -i)'{-i,--inline}'[send patches as inline attachments]' \ '(--attach -a --inline -i)'{-i,--inline}'[send patches as inline attachments]' \
'*--bcc[email addresses of blind carbon copy recipients]:email:' \ '*--bcc=[email addresses of blind carbon copy recipients]:email' \
'*'{-c+,--cc}'[email addresses of copy recipients]:email:' \ '*'{-c+,--cc=}'[email addresses of copy recipients]:email' \
'(--diffstat -d)'{-d,--diffstat}'[add diffstat output to messages]' \ '(--diffstat -d)'{-d,--diffstat}'[add diffstat output to messages]' \
'--date[use the given date as the sending date]:date:' \ '--date=[use the given date as the sending date]:date' \
'--desc[use the given file as the series description]:files:_files' \ '--desc=[use the given file as the series description]:files:_files' \
'(--from -f)'{-f,--from}'[email address of sender]:email:' \ '(--from -f)'{-f+,--from=}'[email address of sender]:email' \
'(--test -n)'{-n,--test}'[print messages that would be sent]' \ '(--test -n)'{-n,--test}'[print messages that would be sent]' \
'(--mbox -m)'{-m,--mbox}'[write messages to mbox file instead of sending them]:file:' \ '(--mbox -m)'{-m+,--mbox=}'[write messages to mbox file instead of sending them]:file:_files' \
'*--reply-to[email addresses replies should be sent to]:email:' \ '*--reply-to=[email addresses replies should be sent to]:email' \
'(--subject -s)'{-s,--subject}'[subject of first message (intro or single patch)]:subject:' \ '(--subject -s)'{-s+,--subject=}'[subject of first message (intro or single patch)]:subject' \
'--in-reply-to[message identifier to reply to]:msgid:' \ '--in-reply-to=[message identifier to reply to]:msgid' \
'*--flag[flags to add in subject prefixes]:flag:' \ '*--flag=[flags to add in subject prefixes]:flag' \
'*'{-t,--to}'[email addresses of recipients]:email:' \ '*'{-t+,--to=}'[email addresses of recipients]:email' \
':revision:_hg_revrange' ':revision:_hg_revrange'
} }
# Rebase # Rebase
_hg_cmd_rebase() { _hg_cmd_rebase() {
_arguments -s -S : $_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' \ '*'{-r+,--rev=}'[rebase these revisions]:revision:_hg_revrange' \
'(--source -s)'{-s+,--source=}'[rebase from the specified changeset]:revision:_hg_labels' \ '(--source -s --base -b)'{-s+,--source=}'[rebase the specified changeset and descendants]:revision:_hg_labels' \
spectralUnsubmitted
Not Done

Does this indicate that hg rebase <hash> -d <dest> should work (without a -r, -s, or -b?) I don't think that's correct..

spectral: Does this indicate that `hg rebase <hash> -d <dest>` should work (without a `-r`, `-s`, or `-b`?
av6AuthorUnsubmitted
Not Done

You mean giving revisions without -r? No, * means that -r can be specified multiple times (and each would require an argument). To see how it's done for a command that has "optional" -r see _hg_cmd_update or _hg_cmd_strip above ^

av6: You mean giving revisions without `-r`? No, `*` means that `-r` can be specified multiple times…
spectralUnsubmitted
Not Done

Got it, thanks for explaining :)

spectral: Got it, thanks for explaining :)
'(--base -b)'{-b+,--base=}'[rebase from the base of the specified changeset]:revision:_hg_labels' \ '(--source -s --base -b)'{-b+,--base=}'[rebase everything from branching point of specified changeset]:revision:_hg_labels' \
'(--dest -d)'{-d+,--dest=}'[rebase onto the specified changeset]:revision:_hg_labels' \ '(--dest -d)'{-d+,--dest=}'[rebase onto the specified changeset]:revision:_hg_labels' \
'--collapse[collapse the rebased changeset]' \ '--collapse[collapse the rebased changesets]' \
'--keep[keep original changeset]' \ '(--keep -k)'{-k,--keep}'[keep original changesets]' \
'--keepbranches[keep original branch name]' \ '--keepbranches[keep original branch names]' \
'(--continue -c)'{-c,--continue}'[continue an interrupted rebase]' \ '(--continue -c --abort -a)'{-c,--continue}'[continue an interrupted rebase]' \
'(--abort -a)'{-a,--abort}'[abort an interrupted rebase]' \ '(--continue -c --abort -a)'{-a,--abort}'[abort an interrupted rebase]' \
} }
# Record # Record
_hg_cmd_record() { _hg_cmd_record() {
_arguments -s -S : $_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 \ $_hg_ignore_space_opts $_hg_subrepos_opts \
'(--addremove -A)'{-A,--addremove}'[mark new/missing files as added/removed before committing]' \ '(--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]' \ '--close-branch[mark a branch as closed, hiding it from the branch list]' \
'--amend[amend the parent of the working dir]' \ '--amend[amend the parent of the working dir]' \
'(--date -d)'{-d+,--date=}'[record the specified date as commit date]:date:' \ '(--date -d)'{-d+,--date=}'[record the specified date as commit date]:date' \
'(--user -u)'{-u+,--user=}'[record the specified user as committer]:user:' '(--user -u)'{-u+,--user=}'[record the specified user as committer]:user'
} }
_hg_cmd_qrecord() { _hg_cmd_qrecord() {
_arguments -s -S : $_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 $_hg_pat_opts $_hg_ignore_space_opts $_hg_subrepos_opts
} }
# Convert # Convert
_hg_cmd_convert() { _hg_cmd_convert() {
_arguments -s -S : $_hg_global_opts \ _arguments -s -S : $_hg_global_opts \
'(--source-type -s)'{-s,--source-type}'[source repository type]' \ '(--source-type -s)'{-s+,--source-type=}'[source repository type]:type:(hg cvs darcs git svn mtn gnuarch bzr p4)' \
'(--dest-type -d)'{-d,--dest-type}'[destination repository type]' \ '(--dest-type -d)'{-d+,--dest-type=}'[destination repository type]:type:(hg svn)' \
'(--rev -r)'{-r+,--rev=}'[import up to target revision]:revision:' \ '*'{-r+,--rev=}'[import up to target revision]:revision' \
'(--authormap -A)'{-A+,--authormap=}'[remap usernames using this file]:file:_files' \ '(--authormap -A)'{-A+,--authormap=}'[remap usernames using this file]:file:_files' \
'--filemap[remap file names using contents of file]:file:_files' \ '--filemap=[remap file names using contents of file]:file:_files' \
'--splicemap[splice synthesized history into place]:file:_files' \ '--full[apply filemap changes by converting all files again]' \
'--branchmap[change branch names while converting]:file:_files' \ '--splicemap=[splice synthesized history into place]:file:_files' \
'--branchmap=[change branch names while converting]:file:_files' \
'--branchsort[try to sort changesets by branches]' \ '--branchsort[try to sort changesets by branches]' \
'--datesort[try to sort changesets by date]' \ '--datesort[try to sort changesets by date]' \
'--sourcesort[preserve source changesets order]' '--sourcesort[preserve source changesets order]' \
'--closesort[try to reorder closed revisions]'
} }
# Purge # Purge
_hg_cmd_purge() { _hg_cmd_purge() {
_arguments -s -S : $_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]' \ '(--abort-on-err -a)'{-a,--abort-on-err}'[abort if an error occurs]' \
'--all[purge ignored files too]' \ '--all[purge ignored files too]' \
'(--print -p)'{-p,--print}'[print filenames instead of deleting them]' \ '(--print -p)'{-p,--print}'[print filenames instead of deleting them]' \
'(--print0 -0)'{-0,--print0}'[end filenames with NUL, for use with xargs (implies -p/--print)]' '(--print0 -0)'{-0,--print0}'[end filenames with NUL, for use with xargs (implies -p/--print)]'
} }
_hg "$@" _hg "$@"