1 files changed, 19 insertions, 17 deletions
diff --git a/Completion/Unix/Command/_monotone b/Completion/Unix/Command/_monotone
index 83e18e306..bcaab87f0 100644
--- a/Completion/Unix/Command/_monotone
+++ b/Completion/Unix/Command/_monotone
@@ -1,8 +1,22 @@
 #compdef mtn
 
-local context state line ret
-typeset -a cmds
-typeset -A opt_args
+local -a cmds
+cmds=(
+  automate:automation db:database fdiff:debug fload:debug fmerge:debug
+  get_roster:debug identify:debug rcs_import:debug annotate:informative
+  cat:informative complete:informative diff:informative help:informative
+  list:informative log:informative ls:informative show_conflicts:informative
+  status:informative cert:key+cert chkeypass:key+cert dropkey:key+cert
+  genkey:key+cert trusted:key+cert pull:network push:network serve:network
+  sync:network privkey:packet\ i/o pubkey:packet\ i/o read:packet\ i/o
+  cvs_import:rcs approve:review comment:review disapprove:review tag:review
+  testresult:review checkout:tree co:tree explicit_merge:tree heads:tree
+  merge:tree merge_into_dir:tree migrate_workspace:tree propagate:tree
+  refresh_inodeprints:tree setup:tree set:vars unset:vars add:workspace
+  attr:workspace ci:workspace commit:workspace drop:workspace mv:workspace
+  pivot_root:workspace pluck:workspace rename:workspace revert:workspace
+  rm:workspace update:workspace
+)
 
 _arguments \
   '--brief[print a brief version of the normal output]' \
@@ -25,17 +39,5 @@ _arguments \
   '--ticker[set ticker style]:ticker style:(count dot none)' \
   '--version[print version number, then exit]' \
   '(-@ --xargs)'{-@,--xargs}'[insert command line arguments taken from the given file]:file:_files' \
-  '*:command:->cmd' && return 0
-
-case "$state" in
-  (cmd)
-  if (( CURRENT == 2 )); then
-    cmds=(automate:automation db:database fdiff:debug fload:debug fmerge:debug get_roster:debug identify:debug rcs_import:debug annotate:informative cat:informative complete:informative diff:informative help:informative list:informative log:informative ls:informative show_conflicts:informative status:informative cert:key+cert chkeypass:key+cert dropkey:key+cert genkey:key+cert trusted:key+cert pull:network push:network serve:network sync:network privkey:packet\ i/o pubkey:packet\ i/o read:packet\ i/o cvs_import:rcs approve:review comment:review disapprove:review tag:review testresult:review checkout:tree co:tree explicit_merge:tree heads:tree merge:tree merge_into_dir:tree migrate_workspace:tree propagate:tree refresh_inodeprints:tree setup:tree set:vars unset:vars add:workspace attr:workspace ci:workspace commit:workspace drop:workspace mv:workspace pivot_root:workspace pluck:workspace rename:workspace revert:workspace rm:workspace update:workspace)
-    _describe -t commands 'cmds' cmds && ret=0
-  else
-    _files
-  fi
-  ;;
-esac
-
-return ret
+  '1:command: _describe -t commands command cmds' \
+  '*:file:_files'