# 
# 
# patch "ChangeLog"
#  from [4b2fdaadbd5e8baab57afd79ad67726ba9f67d76]
#    to [44f955b2e193b1006d9870e65df8e354138f1a3e]
# 
# patch "contrib/monotone.bash_completion"
#  from [5cf3e7ac59d74eece94912922a840d4c905908f6]
#    to [ce1e3c2c7f1ddb5f545ad77ddf80eadfb6415d92]
# 
============================================================
--- ChangeLog	4b2fdaadbd5e8baab57afd79ad67726ba9f67d76
+++ ChangeLog	44f955b2e193b1006d9870e65df8e354138f1a3e
@@ -1,3 +1,8 @@
+2006-03-28  Matthew Nicholson  <address@hidden>
+
+	* contrib/monotone.bash_completion: Convert to use mtn instead of
+	monotone.
+
 2006-03-28  Lapo Luchini  <address@hidden>
 
 	* AUTHORS: Added myself as translator.
============================================================
--- contrib/monotone.bash_completion	5cf3e7ac59d74eece94912922a840d4c905908f6
+++ contrib/monotone.bash_completion	ce1e3c2c7f1ddb5f545ad77ddf80eadfb6415d92
@@ -24,7 +24,7 @@
 # Call monotone to complete IDs
 _monotone_complete() {
   if (( "${#cur}" >=2 )) ; then
-    COMPREPLY=( address@hidden:-} $(monotone $mono_db complete $1 $cur 2> /dev/null) )
+    COMPREPLY=( address@hidden:-} $(mtn $mono_db complete $1 $cur 2> /dev/null) )
   fi
 }
 
@@ -36,16 +36,16 @@
   else
     range='1,/\[private/'
   fi
-  COMPREPLY=( $(compgen -W "$(monotone $mono_db list keys 2> /dev/null |\
+  COMPREPLY=( $(compgen -W "$(mtn $mono_db list keys 2> /dev/null |\
                               sed -n ${range}'{/^[0-9a-f]/s/[0-9a-f]* //p}')" -- ${cur#*=} ) )
 }
 
 _monotone_branches() {
-  COMPREPLY=( $(compgen -W "$(monotone $mono_db list branches 2> /dev/null)" -- ${cur#*=} ) )
+  COMPREPLY=( $(compgen -W "$(mtn $mono_db list branches 2> /dev/null)" -- ${cur#*=} ) )
 }
 
 _monotone_tags() {
-  COMPREPLY=( $(compgen -W "$(monotone $mono_db list tags 2> /dev/null | awk '{print $1}')" -- ${cur#*=} ) )
+  COMPREPLY=( $(compgen -W "$(mtn $mono_db list tags 2> /dev/null | awk '{print $1}')" -- ${cur#*=} ) )
 }
 
 _monotone() {
@@ -194,6 +194,7 @@
                         *)
                             unset prev2
                             unset prev3
+                            _filedir
                     esac
                 else
                     unset prev2
@@ -214,8 +215,6 @@
                                       merge propagate refresh_inodeprints setup
                                       set unset add attr ci commit drop
                                       identify mv rename revert rm update' -- $cur) )
-          else
-              _filedir
           fi
           ;;
       esac
@@ -224,5 +223,4 @@
   return 0
 }
 
-complete -F _monotone -o filenames monotone
 complete -F _monotone -o filenames mtn