]> git.madduck.net Git - code/vcsh.git/blobdiff - _vcsh

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Fix typo in Config section
[code/vcsh.git] / _vcsh
diff --git a/_vcsh b/_vcsh
index 6562dc525900ea7b36340a5f437c70989a720f30..9aca0f97095021e28777baffbcea58a1dbe1ef5f 100644 (file)
--- a/_vcsh
+++ b/_vcsh
@@ -24,7 +24,7 @@ function _vcsh-enter () {
 }
 
 function _vcsh-foreach () {
 }
 
 function _vcsh-foreach () {
-       _dispatch git git
+       _dispatch vcsh-foreach git
 }
 
 function _vcsh-help () {
 }
 
 function _vcsh-help () {
@@ -40,10 +40,6 @@ function _vcsh-list () {
 }
 
 function _vcsh-list-tracked () {
 }
 
 function _vcsh-list-tracked () {
-       _nothing
-}
-
-function _vcsh-list-tracked-by () {
        (( CURRENT == 2 )) && __vcsh_repositories
 }
 
        (( CURRENT == 2 )) && __vcsh_repositories
 }
 
@@ -67,10 +63,12 @@ function _vcsh-rename () {
 
 function _vcsh-run () {
        (( CURRENT == 2 )) && __vcsh_repositories
 
 function _vcsh-run () {
        (( CURRENT == 2 )) && __vcsh_repositories
-       if (( CURRENT >= 3 )); then
+       (( CURRENT == 3 )) && _command_names -e
+       if (( CURRENT >= 4 )); then
+               # see _precommand in zsh
                words=( "${(@)words[3,-1]}" )
                (( CURRENT -= 2 ))
                words=( "${(@)words[3,-1]}" )
                (( CURRENT -= 2 ))
-               _complete
+               _normal
        fi
 }
 
        fi
 }
 
@@ -99,6 +97,9 @@ 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"
                "commit:commit in all repositories"
        subcommands=(
                "clone:clone an existing repository"
                "commit:commit in all repositories"
@@ -109,7 +110,6 @@ function _vcsh () {
                "init:initialize an empty repository"
                "list:list all local vcsh repositories"
                "list-tracked:list all files tracked by vcsh"
                "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"
                "list-untracked:list all files not tracked by vcsh"
                "pull:pull from all vcsh remotes"
                "push:push to vcsh remotes"
@@ -140,10 +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.
-                               _dispatch git git
+                               # 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