Merge branch 'feature--shortnames'

[code/vcsh.git] / _vcsh

diff --git a/_vcsh b/_vcsh
index 2367fb44c9f513741ae9776fc62f3c3e0bf952e2..47dbd9e69a9582540c563cfc27c0362fc046d453 100644 (file)
--- a/_vcsh
+++ b/_vcsh
@@ -43,6 +43,14 @@ function _vcsh-list-tracked-by () {
        (( CURRENT == 2 )) && __vcsh_repositories
 }
 
        (( CURRENT == 2 )) && __vcsh_repositories
 }
 

+function _vcsh-pull () {
+       _nothing
+}
+
+function _vcsh-push () {
+       _nothing
+}
+

 function _vcsh-rename () {
        (( CURRENT == 2 )) && __vcsh_repositories
        (( CURRENT == 3 )) && _message "new repository name"
 function _vcsh-rename () {
        (( CURRENT == 2 )) && __vcsh_repositories
        (( CURRENT == 3 )) && _message "new repository name"


@@ -88,6 +96,7 @@ function _vcsh () {
                "list:list all local vcsh repositories"
                "list-tracked:list all files tracked by vcsh"
                "list-tracked-by:list files tracked by a repository"
                "list:list all local vcsh repositories"
                "list-tracked:list all files tracked by vcsh"
                "list-tracked-by:list files tracked by a repository"

+               "pull:pull from all vcsh remotes"

                "rename:rename a repository"
                "run:run command with <\$GIT_DIR> and <\$GIT_WORK_TREE> set"
                "upgrade:upgrade repository to currently recommended settings"
                "rename:rename a repository"
                "run:run command with <\$GIT_DIR> and <\$GIT_WORK_TREE> set"
                "upgrade:upgrade repository to currently recommended settings"


@@ -114,8 +123,7 @@ function _vcsh () {
                        if ! (( ${+functions[_vcsh-$vcshcommand]} )); then
                                # There is no handler function, so this is probably the name
                                # of a repository. Act accordingly.
                        if ! (( ${+functions[_vcsh-$vcshcommand]} )); then
                                # There is no handler function, so this is probably the name
                                # of a repository. Act accordingly.

-                               _message "git sub-command"
-                               #TODO and now we need to complete on git subcommands
+                               _dispatch git git

                        else
                                curcontext="${curcontext%:*:*}:vcsh-${vcshcommand}:"
                                _call_function ret _vcsh-${vcshcommand}
                        else
                                curcontext="${curcontext%:*:*}:vcsh-${vcshcommand}:"
                                _call_function ret _vcsh-${vcshcommand}