# HG changeset patch # User Nikolaj Sjujskij # Date 2012-08-16 15:04:27 # Node ID 02ed64caddc4c0fca574e6a0f95642e4317d9e30 # Parent f6851cd942113f4d420bc0c021198cd2ab6ca170 zsh completion: tweak options for `incoming`, `outgoing` and `rebase` * `incoming --rev` completes _hg_labels, not jsut tags; * `outgoing --rev` completes revrange; * source/dest/base for `rebase` require argument. diff --git a/contrib/zsh_completion b/contrib/zsh_completion --- a/contrib/zsh_completion +++ b/contrib/zsh_completion @@ -689,7 +689,7 @@ typeset -A _hg_cmd_globals _arguments -s -w : $_hg_log_opts $_hg_branch_bmark_opts $_hg_remote_opts \ $_hg_subrepos_opts \ '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \ - '(--rev -r)'{-r+,--rev}'[a specific revision up to which you would like to pull]:revision:_hg_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' @@ -743,7 +743,7 @@ typeset -A _hg_cmd_globals _arguments -s -w : $_hg_log_opts $_hg_branch_bmark_opts $_hg_remote_opts \ $_hg_subrepos_opts \ '(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \ - '(--rev -r)'{-r+,--rev}'[a specific revision 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' } @@ -1169,9 +1169,9 @@ typeset -A _hg_cmd_globals _hg_cmd_rebase() { _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]' \ '--keep[keep original changeset]' \ '--keepbranches[keep original branch name]' \