# 
# 
# patch "ChangeLog"
#  from [deec0be655e1c2e529a2a54734ef82fa3ef10e53]
#    to [efd55e5a53bbfeeeae9616c0b3f795b1ea3e239d]
# 
# patch "contrib/monotone.zsh_completion"
#  from [97ec2bd0e321e3e30e039ee9764d921278f3b09c]
#    to [87e133da9523605ec493a1a09bc7ef4ea59a519e]
# 
============================================================
--- ChangeLog	deec0be655e1c2e529a2a54734ef82fa3ef10e53
+++ ChangeLog	efd55e5a53bbfeeeae9616c0b3f795b1ea3e239d
@@ -1,3 +1,10 @@
+2006-06-29  Thomas Moschny  <address@hidden>
+
+	* contrib/monotone.zsh_completion: Bugfix: completion for 'mtn ci'
+	used _mtn_checkout(). Directory completion for --keydir and
+	--confdir. Revised _mtn_commit(). Redirecting stderr to /dev/null
+	while completing branches or known files.
+
 2006-06-28  Matthew Gregan  <address@hidden>
 
 	* hash_map.hh: %s/_T/T/g; _T is reserved for the implementation,
============================================================
--- contrib/monotone.zsh_completion	97ec2bd0e321e3e30e039ee9764d921278f3b09c
+++ contrib/monotone.zsh_completion	87e133da9523605ec493a1a09bc7ef4ea59a519e
@@ -31,12 +31,12 @@
     '--nostd[do not load standard lua hooks]'\
     '--norc[do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files]'\
     '--rcfile=[load extra rc file]:file:_files'\
-    {'-k+','--key='}'[set key for signatures]:keys keys:_mtn_keys'\
-    {'-d+','--db='}'[set name of database]:file:_files'\
+    {'(--key)-k+','(-k)--key='}'[set key for signatures]:keys keys:_mtn_keys'\
+    {'(--db)-d+','(-d)--db='}'[set name of database]:file:_files'\
     '--root=[limit search for working copy to specified root]:dir:_files -/'\
     '--verbose[verbose completion output]'\
-    '--keydir=[set location of key store]'\
-    '--confdir=[set location of configuration directory]'\
+    '--keydir=[set location of key store]:dir:_files -/'\
+    '--confdir=[set location of configuration directory]:dir:_files -/'\
     '*::monotone command:_mtn_command'
 }
 
@@ -53,7 +53,7 @@
     local curcontext="$curcontext"
 
     if (( $#cmd )); then
-      curcontext="${curcontext%:*:*}:monotone-${cmd}:"
+      curcontext="${curcontext%:*:*}:mtn-${cmd}:"
       _call_function ret _mtn_$cmd || _message 'no more arguments'
     else
       _message "unknown monotone command: $cmd"
@@ -148,7 +148,7 @@
 }
 
 (( $+functions[_mtn_co] )) ||
-_mtn_ci() {
+_mtn_co() {
   _mtn_checkout
 }
 
@@ -159,9 +159,14 @@
 
 (( $+functions[_mtn_commit] )) ||
 _mtn_commit() {
-  _arguments -s \
-    '(-)--message=[logmsg]' \
-    '*:modified file:_mtn_existing_entries'
+    _arguments -s : \
+	{'(--branch)-b+','(-b)--branch='}'[select branch cert for operation]:branch:_mtn_branches'\
+	{'(--message)-m+','(-m)--message='}'[set commit changelog message]:message'\
+	'--message-file=[set filename containing commit changelog message]:file:_files'\
+	'--date=[override date/time for commit]:date'\
+	'--author=[override author for commit]:author'\
+	'--depth=[limit the number of levels of directories to descend]:depth'\
+	'*:modified files:_mtn_existing_entries'
 }
 
 (( $+functions[_mtn_complete] )) ||
@@ -316,12 +321,14 @@
 
 (( $+functions[_mtn_existing_entries] )) ||
 _mtn_existing_entries() {
-	for i in $(mtn ls known --depth=0 .); do compadd -- $i:t; done
+    for i in $(mtn ls known --depth=0 . 2>/dev/null)
+      do compadd -- $i:t
+    done
 }
 
 (( $+functions[_mtn_branches] )) ||
 _mtn_branches() {
-	compadd -- $(mtn ls branches)
+	compadd -- $(mtn ls branches 2>/dev/null)
 }
 
 (( $+functions[_mtn_keys] )) ||