Merge branch 'merge--madduck/relative_worktree'

[code/vcsh.git] / _vcsh

diff --git a/_vcsh b/_vcsh
index 59cdcfe49dff30fa1b9ef6bbf773b600429c734c..47dbd9e69a9582540c563cfc27c0362fc046d453 100644 (file)
--- a/_vcsh
+++ b/_vcsh
@@ -43,17 +43,30 @@ 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
 function _vcsh-rename () {
        (( CURRENT == 2 )) && __vcsh_repositories

-       #TODO tell the user to add a new name
+       (( CURRENT == 3 )) && _message "new repository name"
+       (( CURRENT > 3 )) && _nothing

 }
 
 function _vcsh-run () {
        (( CURRENT == 2 )) && __vcsh_repositories
 }
 
 function _vcsh-run () {
        (( CURRENT == 2 )) && __vcsh_repositories

-       #TODO normal commands
+       if (( CURRENT >= 3 )); then
+               words=( "${(@)words[3,-1]}" )
+               (( CURRENT -= 2 ))
+               _complete
+       fi

 }
 
 }
 

-function _vcsh-setup () {
+function _vcsh-upgrade () {

        (( CURRENT == 2 )) && __vcsh_repositories
 }
 
        (( CURRENT == 2 )) && __vcsh_repositories
 }
 


@@ -83,9 +96,10 @@ 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"
                "rename:rename a repository"
                "run:run command with <\$GIT_DIR> and <\$GIT_WORK_TREE> set"

-               "setup:set up repository with recommended settings"
+               "upgrade:upgrade repository to currently recommended settings"

                "version:print version information"
                "which:find <substring> in name of any tracked file"
                "write-gitignore:write .gitignore.d/<repo> via git ls-files"
                "version:print version information"
                "which:find <substring> in name of any tracked file"
                "write-gitignore:write .gitignore.d/<repo> via git ls-files"


@@ -109,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}