Mercurial > hg
changeset 8986:7f349588665f
zsh completion: update bisect for builtin syntax
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Tue, 30 Jun 2009 19:23:50 -0700 |
| parents | a04c1ab282fe |
| children | c68ccda3451b |
| files | contrib/zsh_completion |
| diffstat | 1 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/zsh_completion Tue Jun 30 18:47:16 2009 -0700 +++ b/contrib/zsh_completion Tue Jun 30 19:23:50 2009 -0700 @@ -424,6 +424,16 @@ '(--logfile -l)'{-l+,--logfile}'[read commit message from <file>]:log file:_files -g \*.txt' } +_hg_cmd_bisect() { + _arguments -s -w : $_hg_global_opts \ + '(-)'{-r,--reset}'[reset bisect state]' \ + '(--good -g --bad -b --skip -s --reset -r)'{-g,--good}'[mark changeset good]'::revision:_hg_tags \ + '(--good -g --bad -b --skip -s --reset -r)'{-b,--bad}'[mark changeset bad]'::revision:_hg_tags \ + '(--good -g --bad -b --skip -s --reset -r)'{-s,--skip}'[skip testing changeset]' \ + '(--command -c --noupdate -U)'{-c+,--command}'[use command to check changeset state]':commands:_command_names \ + '(--command -c --noupdate -U)'{-U,--noupdate}'[do not update to target]' +} + _hg_cmd_branch() { _arguments -s -w : $_hg_global_opts \ '(--force -f)'{-f,--force}'[set branch name even if it shadows an existing branch]' \ @@ -592,7 +602,7 @@ _hg_cmd_merge() { _arguments -s -w : $_hg_global_opts \ '(--force -f)'{-f,--force}'[force a merge with outstanding changes]' \ - '(--rev -r)'{-r,--rev}'[revision to merge]:revision:_hg_tags' \ + '(--rev -r 1)'{-r,--rev}'[revision to merge]:revision:_hg_mergerevs' \ '(--preview -P)'{-P,--preview}'[review revisions to merge (no merge is performed)]' \ ':revision:_hg_mergerevs' } @@ -752,11 +762,6 @@ ':revision:_hg_tags' } -# bisect extension -_hg_cmd_bisect() { - _arguments -s -w : $_hg_global_opts ':evaluation:(help init reset next good bad)' -} - # HGK _hg_cmd_view() { _arguments -s -w : $_hg_global_opts \