Fix version processing on BSD systems.

[code/vcsh.git] / _vcsh

diff --git a/_vcsh b/_vcsh
index 783cf100ac19d75ec3b603177a90acfd051af03c..9aca0f97095021e28777baffbcea58a1dbe1ef5f 100644 (file)
--- a/_vcsh
+++ b/_vcsh
@@ -1,7 +1,6 @@
 #compdef vcsh
 
 function __vcsh_repositories () {
 #compdef vcsh
 
 function __vcsh_repositories () {

-       #TODO list only one repo and stop

        local expl
        local -a repos
        repos=( ${(f)"$(command vcsh list)"} )
        local expl
        local -a repos
        repos=( ${(f)"$(command vcsh list)"} )


@@ -17,11 +16,15 @@ function _vcsh-clone () {
 }
 
 function _vcsh-delete () {
 }
 
 function _vcsh-delete () {

-       __vcsh_repositories
+       (( CURRENT == 2 )) && __vcsh_repositories

 }
 
 function _vcsh-enter () {
 }
 
 function _vcsh-enter () {

-       __vcsh_repositories
+       (( CURRENT == 2 )) && __vcsh_repositories
+}
+
+function _vcsh-foreach () {
+       _dispatch vcsh-foreach git

 }
 
 function _vcsh-help () {
 }
 
 function _vcsh-help () {


@@ -37,37 +40,56 @@ function _vcsh-list () {
 }
 
 function _vcsh-list-tracked () {
 }
 
 function _vcsh-list-tracked () {

+       (( CURRENT == 2 )) && __vcsh_repositories
+}
+
+function _vcsh-list-untracked () {
+       _nothing
+}
+
+function _vcsh-pull () {

        _nothing
 }
 
        _nothing
 }
 

-function _vcsh-list-tracked-by () {
-       __vcsh_repositories
+function _vcsh-push () {
+       _nothing

 }
 
 function _vcsh-rename () {
 }
 
 function _vcsh-rename () {

-       __vcsh_repositories
-       #TODO tell the user to write new stuff
+       (( CURRENT == 2 )) && __vcsh_repositories
+       (( CURRENT == 3 )) && _message "new repository name"
+       (( CURRENT > 3 )) && _nothing

 }
 
 function _vcsh-run () {
 }
 
 function _vcsh-run () {

-       __vcsh_repositories
-       _commands
-       #TODO normal commands
+       (( CURRENT == 2 )) && __vcsh_repositories
+       (( CURRENT == 3 )) && _command_names -e
+       if (( CURRENT >= 4 )); then
+               # see _precommand in zsh
+               words=( "${(@)words[3,-1]}" )
+               (( CURRENT -= 2 ))
+               _normal
+       fi
+}
+
+function _vcsh-status () {
+       (( CURRENT == 2 )) && __vcsh_repositories

 }
 
 }
 

-function _vcsh-setup () {
-       __vcsh_repositories
+function _vcsh-upgrade () {
+       (( CURRENT == 2 )) && __vcsh_repositories

 }
 
 function _vcsh-version () {
 }
 
 function _vcsh-version () {

+       _nothing

 }
 
 function _vcsh-which () {
 }
 
 function _vcsh-which () {

-       __vcsh_not_implemented_yet "$0" #TODO
+       _files

 }
 
 function _vcsh-write-gitignore () {
 }
 
 function _vcsh-write-gitignore () {

-       __vcsh_repositories
+       (( CURRENT == 2 )) && __vcsh_repositories

 }
 
 function _vcsh () {
 }
 
 function _vcsh () {


@@ -75,18 +97,26 @@ function _vcsh () {
        local state vcshcommand
        local -a args subcommands
 
        local state vcshcommand
        local -a args subcommands
 

+       local VCSH_REPO_D
+        : ${VCSH_REPO_D:="${XDG_CONFIG_HOME:-"$HOME/.config"}/vcsh/repo.d"}
+

        subcommands=(
                "clone:clone an existing repository"
        subcommands=(
                "clone:clone an existing repository"

+               "commit:commit in all repositories"

                "delete:delete an existing repository"
                "enter:enter repository; spawn new <\$SHELL>"
                "delete:delete an existing repository"
                "enter:enter repository; spawn new <\$SHELL>"

+               "foreach:execute for all repos"

                "help:display help"
                "init:initialize an empty repository"
                "list:list all local vcsh repositories"
                "list-tracked:list all files tracked by vcsh"
                "help:display help"
                "init:initialize an empty repository"
                "list:list all local vcsh repositories"
                "list-tracked:list all files tracked by vcsh"

-               "list-tracked-by:list files tracked by a repository"
+               "list-untracked:list all files not tracked by vcsh"
+               "pull:pull from all vcsh remotes"
+               "push:push to 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"
+               "status:show statuses of all/one vcsh repositories"
+               "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"


@@ -110,11 +140,11 @@ 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
+                               # FIXME: this may want to use '_dispatch vcsh git'
+                               GIT_DIR=$VCSH_REPO_D/$words[1].git _dispatch git git

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

-                               _call_function ret _vcsh-${vcshcommand}
+                               _call_function ret _vcsh-${vcshcommand} && (( ret ))

                        fi
                fi
        fi
                        fi
                fi
        fi