# 
# patch "contrib/monotone.bash_completion"
#  from [796f8dc91d99045363cb95c381fe39f27bf27b5f]
#    to [d942f24e3f430c7e12fceeb7a58e088e45211971]
# 
--- contrib/monotone.bash_completion
+++ contrib/monotone.bash_completion
@@ -98,7 +98,7 @@
           _monotone_keys pubkey
           ;;
         --ticker )
-          COMPREPLY=( $(compgen -W 'count dot' -- $cur ) )
+          COMPREPLY=( $(compgen -W 'count dot none' -- $cur ) )
           ;;
         --revision | -r )
           _monotone_complete revision
@@ -106,7 +106,7 @@
 	db )
 	  COMPREPLY=( $(compgen -W 'init info version dump load migrate execute check changesetify rebuild' -- $cur ) )
 	  ;;
-	cdiff | diff )
+	cdiff | diff | annotate )
           COMPREPLY=( $(compgen -W '--revision' -- $cur ) )
 	  _filedir
 	  ;;
@@ -114,14 +114,11 @@
 	  _monotone_complete revision
 	  ;;
 	ls | list )
-	  COMPREPLY=( $(compgen -W 'certs keys branches tags unknown ignored missing' -- $cur ) )
+	  COMPREPLY=( $(compgen -W 'certs keys branches epochs tags vars known unknown ignored missing' -- $cur ) )
 	  ;;
 	attr )
-	  COMPREPLY=( $(compgen -W 'get set' -- $cur ) )
+	  COMPREPLY=( $(compgen -W 'get set drop' -- $cur ) )
 	  ;;
-	setup )
-	  _filedir -d
-	  ;;
 	co | checkout )
 	  _filedir -d
 	  _monotone_complete revision
@@ -138,7 +135,7 @@
 	pubkey | privkey )
 	  _monotone_keys $prev
 	  ;;
-	chkeypass )
+	chkeypass | dropkey )
 	  _monotone_keys privkey
 	  ;;
 	propagate | reindex )
@@ -148,10 +145,10 @@
 	  if (( $COMP_CWORD >= 2 )) ; then
 	    local prev2=${COMP_WORDS[COMP_CWORD-2]}
 	    case $prev2 in
-	      diff | explicit_merge )
+	      cdiff | diff | explicit_merge )
 		_monotone_complete revision
 		;;
-	      co | checkout | rename )
+	      co | checkout | rename | annotate )
 		_filedir -d
 		;;
 	      cat )
@@ -190,13 +187,14 @@
 	  fi
 	  if [ -z "$prev2" ] ; then
 	    COMPREPLY=( $(compgen -W 'db agraph \
-                                      cat cdiff complete diff list log ls status \
-                                      cert chkeypass genkey trusted \
+                                      annotate cat cdiff complete diff list log ls status \
+                                      cert chkeypass dropkey genkey trusted \
                                       pull push reindex serve sync \
                                       privkey pubkey read \
                                       cvs_import \
                                       approve comment disapprove tag testresult \
-                                      checkout co explicit_merge heads merge propagate setup \
+                                      checkout co explicit_merge heads merge propagate refresh_inodeprints setup \
+                                      set unset \
                                       add attr commit drop identify rename revert update' -- $cur) )
 	  fi
 	  ;;