about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2006-08-02 21:39:15 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2006-08-02 21:39:15 +0000
commit4a4fb9f77efb04c90ad8d9dfeb556842e22df013 (patch)
tree1d2e7d37578319226d569695b74252a5f058ddbc
parentc6bb5772412551598ebe274bae7471cb1ff1f851 (diff)
downloadzsh-4a4fb9f77efb04c90ad8d9dfeb556842e22df013.tar.gz
zsh-4a4fb9f77efb04c90ad8d9dfeb556842e22df013.tar.xz
zsh-4a4fb9f77efb04c90ad8d9dfeb556842e22df013.zip
users/10570: handle "svn import" better
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_subversion24
2 files changed, 20 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 3084c70fc..3b95ac157 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-02  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* 10570: Completion/Unix/Command/_subversion: handle "svn import"
+	better.
+
 2006-08-02  Peter Stephenson  <pws@csr.com>
 
 	* 22578: README, Doc/Zsh/params.yo, Src/params.c: ensure
diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion
index 7e30e6b6a..867c2bcf2 100644
--- a/Completion/Unix/Command/_subversion
+++ b/Completion/Unix/Command/_subversion
@@ -34,32 +34,38 @@ _svn () {
         )
 
         case $cmd in;
-          add)
+          (add)
             args+=(
               '*:file:_files -g "*(^e:_svn_controlled:)"'
             )
           ;;
-          commit)
+          (commit)
             args+=(
               '*:file:_files -g "*(e:_svn_status:)"'
             )
           ;;
-          delete)
+          (delete)
             args+=(
               '*:file:_files -g ".svn(/e:_svn_deletedfiles:)"'
             )
           ;;
-          diff)
+          (diff)
             args+=(
 	      '*: : _alternative "files:file:_files -g \*\(e:_svn_status:\)" "urls:URL:_svn_urls"'
 	    )
           ;;
-          help)
+          (help)
             args+=(
               '*::sub command:_svn_commands'
             )
+	  ;;
+	  (import)
+	    args+=(
+		'1:project directory:_files -/'
+		'2:import location: _alternative "files:file:_files" "urls:URL:_svn_urls"'
+	    )
           ;;
-          log)
+          (log)
             args+=(
               '1: : _alternative "files:file:_files -g \*\(e:_svn_controlled:\)" "urls:URL:_svn_urls"'
 	      '*:file:_files -g "*(e:_svn_controlled:)"'
@@ -72,17 +78,17 @@ _svn () {
 	    '*:path or url: _alternative "files:file:_files" "urls:URL:_svn_urls"'
 	    )
 	  ;;
-          resolved)
+          (resolved)
             args+=(
               '*:file:_files -g "*(e:_svn_conflicts:)"'
             )
           ;;
-          revert)
+          (revert)
             args+=(
               '*:file:_files -g "(.svn|*)(/e:_svn_deletedfiles:,e:_svn_status:)"'
             )
           ;;
-          *)
+          (*)
             case $usage in
               *(SRC|DST|TARGET|URL*PATH)*)
                 args+=(