Commits

Nikolaj Sjujskij committed 551f168

zsh: drop monolithic completion patch (everything's migrated)

  • Participants
  • Parent commits 5c0ca68

Comments (0)

Files changed (9)

old_zsh_comp

-# HG changeset patch
-# Parent b131e24e2984a610d77e124dd3f58b2b5eda6d1a
-zsh completion: catch up with Mercurial 2.3
-
- * add `forget`, `recover`, `rollback`, `root`, `tags`, `verify` commands;
- * --subrepos/-S for all supporting commands;
- * bookmarks and branches opts for push/pull/incoming/outgoing;
- * log opts for incoming/outgoing;
- * define separate vars for "ignore whitespaces", "common clone/qclone",
-   "date and user, current or not", log option sets, --tool and --git;
- * backout: add --tool;
- * bisect: add --extend;
- * bookmarks: add --inactive;
- * branches: add --closed;
- * bundle: add --rev, --all, --branch;
- * cat: add --decode;
- * clone: add --updaterev, --branch, --pull and use common-with-qclone opts;
- * commit: add --close-branch;
- * diff: add --change, --reverse, --stat, --text, --unified;
- * export: add --rev;
- * grep: add --date;
- * heads: add --topo, --closed;
- * help: add --extension, --command, --keywords; complete additional help
-   topics also, not commands only;
- * identify: add --bookmark and remote_opts;
- * import: add --no-commit, --exact, --import-branch, --date, --user,
-   --similarity and commit options;
- * log: add --user, --date, --stat, --git;
- * manifest: add --rev;
- * push: add --new-branch;
- * resolve: add --all, --no-status, --tool and pattern options;
- * revert: add --date;
- * serve: add --prefix, --web-conf, --pid-file, --cmdserver, --certificate;
- * status: add --change;
- * tag: add --force, --edit, --remove;
- * tip: add --git;
- * update: add --check, --date;
- * require argument for several options of rebase, graft and merge;
- * extensions: convert, fetch, graphlog, purge, record;
- * MQ:
-   * add qclone command;
-   * qapplied/qunapplied: add --last/--first;
-   * qdiff: add all diff options;
-   * qfold: add --force, --no-backup;
-   * qgoto: add --keep-changes;
-   * qimport: add --git, --push;
-   * qnew: add user- and date-related options;
-   * qpop/qpush: add --keep-changes and --no-backup, drop --name;
-   * qpush: drop deprecated --merge;
-   * strip: add --rev, --keep, --bookmark, update descriptions, drop --backup.
-
-Thanks to Danek Duvall for syntax review.
-
-diff --git a/contrib/zsh_completion b/contrib/zsh_completion
---- a/contrib/zsh_completion
-+++ b/contrib/zsh_completion
-@@ -361,6 +361,19 @@
-     'urls:URL:_hg_urls'
- }
- 
-+_hg_add_help_topics=(
-+    config dates diffs environment extensions filesets glossary hgignore hgweb
-+    merge-tools multirevs obsolescence patterns phases revisions revsets
-+    subrepos templating urls
-+)
-+
-+_hg_help_topics() {
-+    local topics
-+    (( $#_hg_cmd_list )) || _hg_get_commands
-+    topics=($_hg_cmd_list $_hg_add_help_topics)
-+    _describe -t help_topics 'help topics' topics
-+}
-+
- # Common options
- _hg_global_opts=(
-     '(--repository -R)'{-R+,--repository}'[repository root directory]:repository:_files -/'
-@@ -385,18 +398,48 @@
-   '*'{-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) -/')
- 
-+_hg_clone_opts=(
-+  '(--noupdate -U)'{-U,--noupdate}'[do not update the new working directory]'
-+  '--pull[use pull protocol to copy metadata]'
-+  '--uncompressed[use uncompressed transfer (fast over LAN)]')
-+
-+_hg_date_user_opts=(
-+  '(--currentdate -D)'{-D,--currentdate}'[record the current date as commit date]'
-+  '(--currentuser -U)'{-U,--currentuser}'[record the current user as committer]'
-+  '(--date -d)'{-d+,--date}'[record the specified date as commit date]:date:'
-+  '(--user -u)'{-u+,--user}'[record the specified user as committer]:user:')
-+
-+_hg_gitlike_opts=(
-+  '(--git -g)'{-g,--git}'[use git extended diff format]')
-+
- _hg_diff_opts=(
-+  $_hg_gitlike_opts
-   '(--text -a)'{-a,--text}'[treat all files as text]'
--  '(--git -g)'{-g,--git}'[use git extended diff format]'
--  "--nodates[omit dates from diff headers]")
-+  '--nodates[omit dates from diff headers]')
-+
-+_hg_mergetool_opts=(
-+  '(--tool -t)'{-t+,--tool}'[specify merge tool]:tool:')
- 
- _hg_dryrun_opts=(
-   '(--dry-run -n)'{-n,--dry-run}'[do not perform actions, just print output]')
- 
-+_hg_ignore_space_opts=(
-+  '(--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-blank-lines -B)'{-B,--ignore-blank-lines}'[ignore changes whose lines are all blank]')
-+
- _hg_style_opts=(
-   '--style[display using template map file]:'
-   '--template[display with template]:')
- 
-+_hg_log_opts=(
-+  $_hg_global_opts $_hg_style_opts $_hg_gitlike_opts
-+  '(--limit -l)'{-l+,--limit}'[limit number of changes displayed]:'
-+  '(--no-merges -M)'{-M,--no-merges}'[do not show merges]'
-+  '(--patch -p)'{-p,--patch}'[show patch]'
-+  '--stat[output diffstat-style summary of changes]'
-+)
-+
- _hg_commit_opts=(
-   '(-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:'
-@@ -406,12 +449,20 @@
-   '(--ssh -e)'{-e+,--ssh}'[specify ssh command to use]:'
-   '--remotecmd[specify hg command to run on the remote side]:')
- 
-+_hg_branch_bmark_opts=(
-+  '(--bookmark -B)'{-B+,--bookmark}'[specify bookmark(s)]:bookmark:_hg_bookmarks'
-+  '(--branch -b)'{-b+,--branch}'[specify branch(es)]:branch:_hg_branches'
-+)
-+
-+_hg_subrepos_opts=(
-+  '(--subrepos -S)'{-S,--subrepos}'[recurse into subrepositories]')
-+
- _hg_cmd() {
-   _call_program hg HGPLAIN=1 hg "$_hg_cmd_globals[@]" "$@" 2> /dev/null
- }
- 
- _hg_cmd_add() {
--  _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \
-+  _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts $_hg_subrepos_opts \
-   '*:unknown files:_hg_unknown'
- }
- 
-@@ -434,7 +485,7 @@
- }
- 
- _hg_cmd_archive() {
--  _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
-+  _arguments -s -w : $_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' \
-@@ -443,7 +494,7 @@
- }
- 
- _hg_cmd_backout() {
--  _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
-+  _arguments -s -w : $_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]' \
-@@ -456,6 +507,7 @@
- _hg_cmd_bisect() {
-   _arguments -s -w : $_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 \
-   '(--good -g --bad -b --skip -s --reset -r)'{-b,--bad}'[mark changeset bad]'::revision:_hg_labels \
-   '(--good -g --bad -b --skip -s --reset -r)'{-s,--skip}'[skip testing changeset]' \
-@@ -466,6 +518,7 @@
- _hg_cmd_bookmarks() {
-   _arguments -s -w : $_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' \
-   '(--rev -r --delete -d --rename -m)'{-d,--delete}'[delete a given bookmark]' \
-   '(--rev -r --delete -d --rename -m)'{-m+,--rename}'[rename a given bookmark]:bookmark:_hg_bookmarks' \
-@@ -480,13 +533,17 @@
- 
- _hg_cmd_branches() {
-   _arguments -s -w : $_hg_global_opts \
--  '(--active -a)'{-a,--active}'[show only branches that have unmerge heads]'
-+  '(--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 \
-   '(--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]' \
-+  '(--rev -r)'{-r+,--rev}'[changeset(s) to bundle]:' \
-+  '--all[bundle all changesets in the repository]' \
-   ':output file:_files' \
-   ':destination repository:_files -/'
- }
-@@ -495,26 +552,28 @@
-   _arguments -s -w : $_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]' \
-   '*:file:_hg_files'
- }
- 
- _hg_cmd_clone() {
--  _arguments -s -w : $_hg_global_opts $_hg_remote_opts \
--  '(--noupdate -U)'{-U,--noupdate}'[do not update the new working directory]' \
-+  _arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_clone_opts \
-   '(--rev -r)'{-r+,--rev}'[a changeset you would like to have after cloning]:' \
--  '--uncompressed[use uncompressed transfer (fast over LAN)]' \
-+  '(--updaterev -u)'{-u+,--updaterev}'[revision, tag or branch to check out]' \
-+  '(--branch -b)'{-b+,--branch}'[clone only the specified branch]' \
-   ':source repository:_hg_remote' \
-   ':destination:_hg_clone_dest'
- }
- 
- _hg_cmd_commit() {
--  _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
-+  _arguments -s -w : $_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 -g \*.txt' \
-   '(--date -d)'{-d+,--date}'[record datecode as commit date]:date code:' \
-   '(--user -u)'{-u+,--user}'[record user as commiter]:user:' \
-   '--amend[amend the parent of the working dir]' \
-+  '--close-branch[mark a branch as closed]' \
-   '*:file:_hg_files'
- }
- 
-@@ -528,11 +587,14 @@
- _hg_cmd_diff() {
-   typeset -A opt_args
-   _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_diff_opts \
-+                     $_hg_ignore_space_opts $_hg_subrepos_opts \
-   '*'{-r,--rev}'+[revision]:revision:_hg_revrange' \
-   '(--show-function -p)'{-p,--show-function}'[show which function each change is in]' \
--  '(--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-blank-lines -B)'{-B,--ignore-blank-lines}'[ignore changes whose lines are all blank]' \
-+  '(--change -c)'{-c,--change}'[change made by revision]' \
-+  '(--text -a)'{-a,--text}'[treat all files as text]' \
-+  '--reverse[produce a diff that undoes the changes]' \
-+  '(--unified -U)'{-U,--unified}'[number of lines of context to show]' \
-+  '--stat[output diffstat-style summary of changes]' \
-   '*:file:->diff_files'
- 
-   if [[ $state == 'diff_files' ]]
-@@ -550,20 +612,20 @@
-   _arguments -s -w : $_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' \
-   '*:revision:_hg_labels'
- }
- 
-+_hg_cmd_forget() {
-+  _arguments -s -w : $_hg_global_opts \
-+  '*:file:_hg_files'
-+}
-+
- _hg_cmd_graft() {
--  _arguments -s -w : $_hg_global_opts \
-+  _arguments -s -w : $_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]' \
-   '--log[append graft info to log message]' \
--  '(--currentdate -D)'{-D,--currentdate}'[record the current date as commit date]' \
--  '(--currentuser -U)'{-U,--currentuser}'[record the current user as committer]' \
--  '(--date -d)'{-d,--date}'[record the specified date as commit date]' \
--  '(--user -u)'{-u,--user}'[record the specified user as committer]' \
--  '(--tool -t)'{-t,--tool}'[specify merge tool]' \
--  '(--dry-run -n)'{-n,--dry-run}'[do not perform actions, just print output]' \
-   '*:revision:_hg_labels'
- }
- 
-@@ -577,44 +639,54 @@
-   '(--line-number -n)'{-n,--line-number}'[print matching line numbers]' \
-   '*'{-r+,--rev}'[search in given revision range]:revision:_hg_revrange' \
-   '(--user -u)'{-u,--user}'[print user who committed change]' \
-+  '(--date -d)'{-d,--date}'[print date of a changeset]' \
-   '1:search pattern:' \
-   '*:files:_hg_files'
- }
- 
- _hg_cmd_heads() {
-   _arguments -s -w : $_hg_global_opts $_hg_style_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 \
--  '*:mercurial command:_hg_commands'
-+  '(--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]' \
-+  '*:mercurial help topic:_hg_help_topics'
- }
- 
- _hg_cmd_identify() {
--  _arguments -s -w : $_hg_global_opts \
-+  _arguments -s -w : $_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]' \
-   '(--branch -b)'{-b+,--branch}'[show branch]' \
-+  '(--bookmark -B)'{-B+,--bookmark}'[show bookmarks]' \
-   '(--tags -t)'{-t+,--tags}'[show tags]'
- }
- 
- _hg_cmd_import() {
--  _arguments -s -w : $_hg_global_opts \
-+  _arguments -s -w : $_hg_global_opts $_hg_commit_opts \
-   '(--strip -p)'{-p+,--strip}'[directory strip option for patch (default: 1)]:count:' \
--  '(--message -m)'{-m+,--message}'[use <text> as commit message]:text:' \
-   '(--force -f)'{-f,--force}'[skip check for outstanding uncommitted changes]' \
-   '--bypass[apply patch without touching the working directory]' \
-+  '--no-commit[do not commit, just update the working directory]' \
-+  '--exact[apply patch to the nodes from which it was generated]' \
-+  '--import-branch[use any branch information in patch (implied by --exact)]' \
-+  '(--date -d)'{-d+,--date}'[record datecode as commit date]:date code:' \
-+  '(--user -u)'{-u+,--user}'[record user as commiter]:user:' \
-+  '(--similarity -s)'{-s+,--similarity}'[guess renamed files by similarity (0<=s<=100)]:' \
-   '*:patch:_files'
- }
- 
- _hg_cmd_incoming() {
--  _arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_style_opts \
--  '(--no-merges -M)'{-M,--no-merges}'[do not show merge revisions]' \
-+  _arguments -s -w : $_hg_log_opts $_hg_remote_opts $_hg_branch_bmark_opts $_hg_subrepos_opts \
-   '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
--  '(--patch -p)'{-p,--patch}'[show patch]' \
--  '(--rev -r)'{-r+,--rev}'[a specific revision up to which you would like to pull]:revision:_hg_tags' \
-+  '(--rev -r)'{-r+,--rev}'[a specific revision up to which you would like to pull]:revision:_hg_labels' \
-   '(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \
-   '--bundle[file to store the bundles into]:bundle file:_files' \
-   ':source:_hg_remote'
-@@ -634,42 +706,40 @@
- }
- 
- _hg_cmd_log() {
--  _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_style_opts \
-+  _arguments -s -w : $_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]' \
-   '(--keyword -k)'{-k+,--keyword}'[search for a keyword]:' \
--  '(--limit -l)'{-l+,--limit}'[limit number of changes displayed]:' \
-   '*'{-r,--rev}'[show the specified revision or range]:revision:_hg_revrange' \
--  '(--no-merges -M)'{-M,--no-merges}'[do not show merges]' \
-   '(--only-merges -m)'{-m,--only-merges}'[show only merges]' \
--  '(--patch -p)'{-p,--patch}'[show patch]' \
-   '(--prune -P)'{-P+,--prune}'[do not display revision or any of its ancestors]:revision:_hg_labels' \
-   '(--branch -b)'{-b+,--branch}'[show changesets within the given named branch]:branch:_hg_branches' \
-+  '(--user -u)'{-u+,--user}'[revisions committed by user]:user:' \
-+  '(--date -d)'{-d+,--date}'[show revisions matching date spec]:date:' \
-   '*:files:_hg_files'
- }
- 
- _hg_cmd_manifest() {
-   _arguments -s -w : $_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 \
-+  _arguments -s -w : $_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)]' \
--  '(--tool -t)'{-t,--tool}'[specify merge tool]' \
-   ':revision:_hg_mergerevs'
- }
- 
- _hg_cmd_outgoing() {
-   _arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_style_opts \
--  '(--no-merges -M)'{-M,--no-merges}'[do not show merge revisions]' \
-+                     $_hg_branch_bmark_opts $_hg_subrepos_opts \
-   '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
--  '(--patch -p)'{-p,--patch}'[show patch]' \
--  '(--rev -r)'{-r+,--rev}'[a specific revision you would like to push]' \
-+  '*'{-r,--rev}'[a specific revision you would like to push]:revision:_hg_revrange' \
-   '(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \
-   ':destination:_hg_remote'
- }
-@@ -696,7 +766,7 @@
- }
- 
- _hg_cmd_pull() {
--  _arguments -s -w : $_hg_global_opts $_hg_remote_opts \
-+  _arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_branch_bmark_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:' \
-@@ -704,12 +774,17 @@
- }
- 
- _hg_cmd_push() {
--  _arguments -s -w : $_hg_global_opts $_hg_remote_opts \
-+  _arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_branch_bmark_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]' \
-   ':destination:_hg_remote'
- }
- 
-+_hg_cmd_recover() {
-+  _arguments -s -w : $_hg_global_opts
-+}
-+
- _hg_cmd_remove() {
-   _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
-   '(--after -A)'{-A,--after}'[record remove that has already occurred]' \
-@@ -728,7 +803,9 @@
-   local context state line
-   typeset -A opt_args
- 
--  _arguments -s -w : $_hg_global_opts \
-+  _arguments -s -w : $_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' \
-   '(--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' \
-@@ -749,6 +826,7 @@
-   '(--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]' \
-+  '(--date -d)'{-d+,--date}'[tipmost revision matching date]:date code:' \
-   '*:file:->diff_files'
- 
-   if [[ $state == 'diff_files' ]]
-@@ -764,6 +842,15 @@
-   fi
- }
- 
-+_hg_cmd_rollback() {
-+  _arguments -s -w : $_hg_global_opts $_hg_dryrun_opts \
-+  '(--force -f)'{-f,--force}'[ignore safety measures]' \
-+}
-+
-+_hg_cmd_root() {
-+  _arguments -s -w : $_hg_global_opts \
-+}
-+
- _hg_cmd_serve() {
-   _arguments -s -w : $_hg_global_opts \
-   '(--accesslog -A)'{-A+,--accesslog}'[name of access log file]:log file:_files' \
-@@ -771,10 +858,15 @@
-   '(--daemon -d)'{-d,--daemon}'[run server in background]' \
-   '(--port -p)'{-p+,--port}'[listen port]:listen port:' \
-   '(--address -a)'{-a+,--address}'[interface address]:interface address:' \
-+  '--prefix[prefix path to serve from]:directory:_files' \
-   '(--name -n)'{-n+,--name}'[name to show in web pages]:repository name:' \
-+  '--web-conf[name of the hgweb config file]:webconf_file:_files' \
-+  '--pid-file[name of file to write process ID to]:pid_file:_files' \
-+  '--cmdserver[cmdserver mode]:mode:' \
-   '(--templates -t)'{-t,--templates}'[web template directory]:template dir:_files -/' \
-   '--style[web template style]:style' \
-   '--stdio[for remote clients]' \
-+  '--certificate[certificate file]:cert_file:_files' \
-   '(--ipv6 -6)'{-6,--ipv6}'[use IPv6 in addition to IPv4]'
- }
- 
-@@ -785,7 +877,7 @@
- }
- 
- _hg_cmd_status() {
--  _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
-+  _arguments -s -w : $_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]' \
-@@ -798,6 +890,7 @@
-   '(--copies -C)'{-C,--copies}'[show source of copied files]' \
-   '(--print0 -0)'{-0,--print0}'[end filenames with NUL, for use with xargs]' \
-   '--rev[show difference from revision]:revision:_hg_labels' \
-+  '--change[list the changed files of a revision]:revision:_hg_labels' \
-   '*:files:_files'
- }
- 
-@@ -813,11 +906,18 @@
-   '(--date -d)'{-d+,--date}'[record datecode as commit date]:date code:' \
-   '(--user -u)'{-u+,--user}'[record user as commiter]:user:' \
-   '(--rev -r)'{-r+,--rev}'[revision to tag]:revision:_hg_labels' \
-+  '(--force -f)'{-f,--force}'[force tag]' \
-+  '--remove[remove a tag]' \
-+  '(--edit -e)'{-e,--edit}'[edit commit message]' \
-   ':tag name:'
- }
- 
-+_hg_cmd_tags() {
-+  _arguments -s -w : $_hg_global_opts
-+}
-+
- _hg_cmd_tip() {
--  _arguments -s -w : $_hg_global_opts $_hg_style_opts \
-+  _arguments -s -w : $_hg_global_opts $_hg_style_opts $_hg_gitlike_opts \
-   '(--patch -p)'{-p,--patch}'[show patch]'
- }
- 
-@@ -831,9 +931,15 @@
-   _arguments -s -w : $_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]' \
-+  '(--date -d)'{-d+,--date}'[tipmost revision matching date]' \
-   ':revision:_hg_labels'
- }
- 
-+_hg_cmd_verify() {
-+  _arguments -s -w : $_hg_global_opts
-+}
-+
- ## extensions ##
- 
- # HGK
-@@ -893,7 +999,16 @@
-   '(--summary -s)'{-s,--summary}'[print first line of patch header]')
- 
- _hg_cmd_qapplied() {
--  _arguments -s -w : $_hg_global_opts $_hg_qseries_opts
-+  _arguments -s -w : $_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 \
-+  '(--patches -p)'{-p+,--patches}'[location of source patch repository]' \
-+  ':source repository:_hg_remote' \
-+  ':destination:_hg_clone_dest'
- }
- 
- _hg_cmd_qdelete() {
-@@ -904,7 +1019,8 @@
- }
- 
- _hg_cmd_qdiff() {
--  _arguments -s -w : $_hg_global_opts $_hg_pat_opts \
-+  _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_diff_opts \
-+                     $_hg_ignore_space_opts \
-   '*:pattern:_hg_files'
- }
- 
-@@ -917,12 +1033,15 @@
- _hg_cmd_qfold() {
-   _arguments -s -w : $_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]' \
-   '*:unapplied patch:_hg_qunapplied'
- }
- 
- _hg_cmd_qgoto() {
-   _arguments -s -w : $_hg_global_opts \
-   '(--force -f)'{-f,--force}'[overwrite any local changes]' \
-+  '--keep-changes[tolerate non-conflicting local changes]' \
-   ':patch:_hg_qseries'
- }
- 
-@@ -940,17 +1059,17 @@
- }
- 
- _hg_cmd_qimport() {
--  _arguments -s -w : $_hg_global_opts \
-+  _arguments -s -w : $_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]' \
-   '*'{-r+,--rev}'[place existing revisions under mq control]:revision:_hg_revrange' \
-+  '(--push -P)'{-P,--push}'[qpush after importing]' \
-   '*:patch:_files'
- }
- 
- _hg_cmd_qnew() {
--  _arguments -s -w : $_hg_global_opts $_hg_commit_opts \
--  '(--force -f)'{-f,--force}'[import uncommitted changes into patch]' \
-+  _arguments -s -w : $_hg_global_opts $_hg_commit_opts $_hg_date_user_opts $_hg_gitlike_opts \
-   ':patch:'
- }
- 
-@@ -961,8 +1080,9 @@
- _hg_cmd_qpop() {
-   _arguments -s -w : $_hg_global_opts \
-   '(--all -a :)'{-a,--all}'[pop all patches]' \
--  '(--name -n)'{-n+,--name}'[queue name to pop]:' \
-   '(--force -f)'{-f,--force}'[forget any local changes]' \
-+  '--keep-changes[tolerate non-conflicting local changes]' \
-+  '--no-backup[do not save backup copies of files]' \
-   ':patch:_hg_qapplied'
- }
- 
-@@ -974,17 +1094,16 @@
-   _arguments -s -w : $_hg_global_opts \
-   '(--all -a :)'{-a,--all}'[apply all patches]' \
-   '(--list -l)'{-l,--list}'[list patch name in commit text]' \
--  '(--merge -m)'{-m+,--merge}'[merge from another queue]:' \
--  '(--name -n)'{-n+,--name}'[merge queue name]:' \
-   '(--force -f)'{-f,--force}'[apply if the patch has rejects]' \
-   '(--exact -e)'{-e,--exact}'[apply the target patch to its recorded parent]' \
-   '--move[reorder patch series and apply only the patch]' \
-+  '--keep-changes[tolerate non-conflicting local changes]' \
-+  '--no-backup[do not save backup copies of files]' \
-   ':patch:_hg_qunapplied'
- }
- 
- _hg_cmd_qrefresh() {
--  _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_commit_opts \
--  '(--git -g)'{-g,--git}'[use git extended diff format]' \
-+  _arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_commit_opts $_hg_gitlike_opts \
-   '(--short -s)'{-s,--short}'[short refresh]' \
-   '*:files:_hg_files'
- }
-@@ -1010,7 +1129,8 @@
- }
- 
- _hg_cmd_qunapplied() {
--  _arguments -s -w : $_hg_global_opts $_hg_qseries_opts
-+  _arguments -s -w : $_hg_global_opts $_hg_qseries_opts \
-+  '(--first -1)'{-1,--first}'[show only the first patch]'
- }
- 
- _hg_cmd_qtop() {
-@@ -1019,16 +1139,17 @@
- 
- _hg_cmd_strip() {
-   _arguments -s -w : $_hg_global_opts \
--  '(--force -f)'{-f,--force}'[force multi-head removal]' \
--  '(--backup -b)'{-b,--backup}'[bundle unrelated changesets]' \
--  '(--nobackup -n)'{-n,--nobackup}'[no backups]' \
-+  '(--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]' \
-+  '(--bookmark -B)'{-B+,--bookmark}'[remove revs only reachable from given bookmark]:bookmark:_hg_bookmarks' \
-+  '(--rev -r)'{-r+,--rev}'[revision]:revision:_hg_labels' \
-   ':revision:_hg_labels'
- }
- 
- # Patchbomb
- _hg_cmd_email() {
--  _arguments -s -w : $_hg_global_opts $_hg_remote_opts \
--  '(--git -g)'{-g,--git}'[use git extended diff format]' \
-+  _arguments -s -w : $_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]' \
-@@ -1058,20 +1179,71 @@
- 
- # Rebase
- _hg_cmd_rebase() {
--  _arguments -s -w : $_hg_global_opts \
-+  _arguments -s -w : $_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' \
--  '(--dest -d)'{-d,--dest}'[rebase onto the specified changeset]' \
-+  '(--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' \
-+  '(--dest -d)'{-d+,--dest}'[rebase onto the specified changeset]:revision:_hg_labels' \
-   '--collapse[collapse the rebased changeset]' \
--  '(--message -m)'{-m+,--message}'[use <text> as collapse commit message]:text:' \
--  '(--edit -e)'{-e,--edit}'[invoke editor on commit messages]' \
--  '(--logfile -l)'{-l+,--logfile}'[read collapse commit message from <file>]:log file:_files -g \*.txt' \
-   '--keep[keep original changeset]' \
-   '--keepbranches[keep original branch name]' \
--  '(--tool -t)'{-t,--tool}'[specify merge tool]' \
-   '(--continue -c)'{-c,--continue}'[continue an interrupted rebase]' \
-   '(--abort -a)'{-a,--abort}'[abort an interrupted rebase]' \
- }
- 
-+# Record
-+_hg_cmd_record() {
-+  _arguments -s -w : $_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]' \
-+  '--amend[amend the parent of the working dir]' \
-+  '(--date -d)'{-d+,--date}'[record the specified date as commit date]:date:' \
-+  '(--user -u)'{-u+,--user}'[record the specified user as committer]:user:'
-+}
-+
-+_hg_cmd_qrecord() {
-+  _arguments -s -w : $_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 \
-+  '(--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:' \
-+  '(--authormap -A)'{-A+,--authormap}'[remap usernames using this file]:file:_files' \
-+  '--filemap[remap file names using contents of file]: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]' \
-+  '--datesort[try to sort changesets by date]' \
-+  '--sourcesort[preserve source changesets order]'
-+}
-+
-+# Fetch
-+_hg_cmd_fetch() {
-+  _arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_commit_opts \
-+  '(--rev -r)'{-r+,--rev}'[a specific revision up to which you would like to pull]:revision:' \
-+  '--switch-parent[switch parents when merging]' \
-+  '(--date -d)'{-d+,--date}'[record the specified date as commit date]:date:' \
-+  '(--user -u)'{-u+,--user}'[record the specified user as committer]:user:' \
-+  ':source:_hg_remote'
-+}
-+
-+# Graphlog
-+_hg_cmd_glog() {
-+  _hg_cmd_log $@
-+}
-+
-+# Purge
-+_hg_cmd_purge() {
-+  _arguments -s -w : $_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]' \
-+  '(--print0 -0)'{-0,--print0}'[end filenames with NUL, for use with xargs (implies -p/--print)]'
-+}
-+
- _hg "$@"
 zsh_opts
 zsh_mq
 zsh_misc
-old_zsh_comp
 # HG changeset patch
-# Parent 7da2e84696aa2ecc8eb0453b894638351ff9b7c4
+# Parent a90fcf3d060dab14b48ffd56673fae6b862e8056
 zsh completion: add `forget`, `recover`, `rollback`, `root`, `tags`, `verify`
 
 diff --git a/contrib/zsh_completion b/contrib/zsh_completion
 # HG changeset patch
-# Parent 2e0028a2eec3e006e3d45fc67e938e7651f8252f
+# Parent 90d0c4e614e81daf5164ca2a0d9bd2e3108fb2a9
 zsh completion: add new option groups for options
 
 Add clone, date/user, git-style, merge tool, ignore space, log,
 # HG changeset patch
-# Parent de810b49925c8f4b655782c5896e38b67778d41c
+# Parent 503f1f43e456bf54bffbcda95f77e5f984493268
 zsh completion: add support for convert, graphlog, purge, record extensions
 
 diff --git a/contrib/zsh_completion b/contrib/zsh_completion
 # HG changeset patch
-# Parent d9a44ee4313be6f3756214b9a16a4a4bf5bd99bc
+# Parent c7403830ee89d49fb363ed8b243bd2ef2d6e68f1
 
 diff --git a/contrib/zsh_completion b/contrib/zsh_completion
 --- a/contrib/zsh_completion
 # HG changeset patch
-# Parent b45e29a2207dde718cb430603cac7574476bc8cd
+# Parent 308380089dbfb91c8333a3f08cbce4e1b504a76d
 zsh completion: update mq commands completion
 
  * add qclone command;
 # HG changeset patch
-# Parent dd0ed674981f3abeecc8e67718e0cb4dc263333d
+# Parent 38e4b979c3aa640d4035c3bacfa37ceb26a54b7d
 zsh completion: add new options for existing commands
 
  * backout: add --tool;
 # HG changeset patch
-# Parent 75a692875c665c9b53f59ec8f3fd4e0b72c31593
+# Parent 46981f310d86e2bfb05aee042310172f69426ef5
 zsh completion: add subrepos options for all supporting commands
 
 diff --git a/contrib/zsh_completion b/contrib/zsh_completion