PATCH: _baz fixes

PATCH: _baz fixes

[Clint Adams]

I'm told that baz 1.3 won't have the -A option to a bunch of commands.
The same alternatives can probably be used for _tla too.

Index: Completion/Unix/Command/_baz
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_baz,v
retrieving revision 1.3
diff -u -r1.3 _baz
--- Completion/Unix/Command/_baz	11 Mar 2005 01:11:48 -0000	1.3
+++ Completion/Unix/Command/_baz	31 Mar 2005 13:31:36 -0000
@@ -80,7 +80,7 @@
     compset -P '*/'
     archive=${IPREFIX%/*}
     _description -V categories expl "${library:-}categories in $archive"
-    compadd $suffix "$expl[@]" `$BAZ ${library:-}categories -A $archive`
+    compadd $suffix "$expl[@]" `$BAZ ${library:-}categories $archive`
   elif [ -z $IPREFIX ]; then
     local index=$(( words[(i)-A] + 1 ))
     (( index < CURRENT )) || index=$(( words[(i)--archive] + 1 ))
@@ -88,7 +88,7 @@
 
     if [ $archive ]; then
       _description -V categories expl "${library:-}categories in $archive"
-      compadd "$expl[@]" $suffix `$BAZ ${library:-}categories -A $archive`
+      compadd "$expl[@]" $suffix `$BAZ ${library:-}categories $archive`
     fi
 
     _baz_archives -S / ${library:+--library}
@@ -111,7 +111,7 @@
     local category=${IPREFIX%--}
     _description -V branches expl "${library:-}branches"
     compadd $suffix "$expl[@]" \
-      ${${(@)$($BAZ ${library:-}branches -A $archive $category)}##*--}
+      ${${(@)$($BAZ ${library:-}branches $archive/$category)}##*--}
   fi
   if [ $1 -gt 1 ] && [[ $IPREFIX = *-- ]] && [[ $PREFIX = *--* ]]; then
     _baz_namespace_versions $(($1 - 1))
@@ -129,7 +129,7 @@
     local branch=${IPREFIX%--}
     _description -V versions expl "${library:-}versions"
     compadd $suffix "$expl[@]" \
-      ${${(@)$($BAZ ${library:-}versions -A $archive $branch)}##*--}
+      ${${(@)$($BAZ ${library:-}versions $archive/$branch)}##*--}
   fi
   if [ $1 -gt 1 ] && [[ $IPREFIX = *--*-- ]] && ([[ $IPREFIX = */*--*-- ]] \
     || [[ $PREFIX != */* ]]) && [[ $PREFIX = *--* ]]; then
@@ -146,22 +146,16 @@
     _description -V revisions expl "${library:-}revisions"
     local completions c
     completions=(
-      ${${(@)$($BAZ ${library:-}revisions -A $archive $version)}##*--}
+      ${${(@)$($BAZ ${library:-}revisions $archive/$version)}##*--}
     )
     (( exclude_library_revisions )) && \
-        foreach c ($($BAZ library-revisions -A $archive $version)); do completions[(r)$c]=(); done
+        foreach c ($($BAZ library-revisions $archive/$version)); do completions[(r)$c]=(); done
     compadd "$expl[@]" -a completions
   fi
 }
 
 (( $+functions[_baz_config] )) ||
 _baz_config () {
-
-  # zsh 4.1.1+ is recommended; 4.0.6 gives the error below when doing
-  # baz build-config e<TAB>
-  # _path_files:322: no matches found: configs//e/.(/)
-  # whereas 4.1.1 completes correctly
-
   local configdir root ret=1 n expl
 
   n=$opt_args[(i)(-d|--dir)]
@@ -192,7 +186,7 @@
 
     if [[ $PREFIX != *--* ]]; then
       _description -V categories expl "categories in $archive"
-      compadd -q -S -- "$expl[@]" `$BAZ categories -A $archive`
+      compadd -q -S -- "$expl[@]" `$BAZ categories $archive`
     else
       _baz_namespace_branches 3
     fi

PATCH: _baz fixes

[Clint Adams]

Index: Completion/Unix/Command/_baz
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_baz,v
retrieving revision 1.1
diff -u -r1.1 _baz
--- Completion/Unix/Command/_baz	15 Dec 2004 17:34:02 -0000	1.1
+++ Completion/Unix/Command/_baz	9 Mar 2005 01:56:52 -0000
@@ -8,7 +8,7 @@
 # ask the user which version of baz this is
 if ! zstyle -s ":completion:${curcontext}" baz-version baz_version; then
   # ask baz instead
-  baz_version="${${$($BAZ --version)#baz baz-}%% from regexps.com*}"
+  baz_version="${${$($BAZ --version)#baz Bazaar version }%% \(thelove@canonical.com*}"
 fi
 
 # test whether to hide short options from completion
@@ -496,8 +496,8 @@
 local cmd_branch
 cmd_branch=(':SOURCE-REVISION:_baz_revisions' ':TAG-VERSION:_baz_versions')
 
-local cmd_star_merge
-cmd_star_merge=(':FROM:_baz_revisions')
+local cmd_merge
+cmd_merge=(':FROM:_baz_revisions')
 
 local cmd_missing cmd_whats_missing
 cmd_missing=('::revision:_baz_revisions')