about summary refs log tree commit diff
path: root/Completion/Unix/Command
diff options
context:
space:
mode:
authorPaul Ackersviller <packersv@users.sourceforge.net>2007-03-18 21:47:31 +0000
committerPaul Ackersviller <packersv@users.sourceforge.net>2007-03-18 21:47:31 +0000
commit28e662ca001cd82ccd6910bd4d347acced0a8444 (patch)
treecd4480a5ebce3e756b9ee865768fe89ac8c506b6 /Completion/Unix/Command
parent1e3c7842ec0b9bda159c6601c1219bac3d2628bf (diff)
downloadzsh-28e662ca001cd82ccd6910bd4d347acced0a8444.tar.gz
zsh-28e662ca001cd82ccd6910bd4d347acced0a8444.tar.xz
zsh-28e662ca001cd82ccd6910bd4d347acced0a8444.zip
Merge of trunk updates 22796 and 23214.
Diffstat (limited to 'Completion/Unix/Command')
-rw-r--r--Completion/Unix/Command/_subversion7
1 files changed, 4 insertions, 3 deletions
diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion
index 867c2bcf2..84e63a343 100644
--- a/Completion/Unix/Command/_subversion
+++ b/Completion/Unix/Command/_subversion
@@ -40,7 +40,8 @@ _svn () {
             )
           ;;
           (commit)
-            args+=(
+            args=(
+	      ${args/(#b)(*--file*):arg:/$match[1]:file:_files}
               '*:file:_files -g "*(e:_svn_status:)"'
             )
           ;;
@@ -61,7 +62,7 @@ _svn () {
 	  ;;
 	  (import)
 	    args+=(
-		'1:project directory:_files -/'
+		'1:project directory or import location: _alternative "files:file:_files" "urls:URL:_svn_urls"'
 		'2:import location: _alternative "files:file:_files" "urls:URL:_svn_urls"'
 	    )
           ;;
@@ -200,7 +201,7 @@ _svn_urls() {
   if [[ -prefix *: ]] && ! _urls &&
       zstyle -T ":completion:${curcontext}:" remote-access
   then
-    remfiles=( ${(f)"$(svn list $IPRFIX${PREFIX%%[^./][^/]#} 2>/dev/null)"} )
+    remfiles=( ${(f)"$(svn list $IPREFIX${PREFIX%%[^./][^/]#} 2>/dev/null)"} )
     compset -P '*/'
     compset -S '/*' || suf=file
     remdispf=(${remfiles:#*/})