]> 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:

Add support for `vcsh pull`
[code/vcsh.git] / _vcsh
diff --git a/_vcsh b/_vcsh
index 783cf100ac19d75ec3b603177a90acfd051af03c..c77f2afb082c0e1d1d595723ee011bde18972c6a 100644 (file)
--- a/_vcsh
+++ b/_vcsh
@@ -1,7 +1,6 @@
 #compdef vcsh
 
 function __vcsh_repositories () {
-       #TODO list only one repo and stop
        local expl
        local -a repos
        repos=( ${(f)"$(command vcsh list)"} )
@@ -17,11 +16,11 @@ function _vcsh-clone () {
 }
 
 function _vcsh-delete () {
-       __vcsh_repositories
+       (( CURRENT == 2 )) && __vcsh_repositories
 }
 
 function _vcsh-enter () {
-       __vcsh_repositories
+       (( CURRENT == 2 )) && __vcsh_repositories
 }
 
 function _vcsh-help () {
@@ -41,33 +40,42 @@ function _vcsh-list-tracked () {
 }
 
 function _vcsh-list-tracked-by () {
-       __vcsh_repositories
+       (( CURRENT == 2 )) && __vcsh_repositories
+}
+
+function _vcsh-pull () {
+       _nothing
 }
 
 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 () {
-       __vcsh_repositories
-       _commands
-       #TODO normal commands
+       (( CURRENT == 2 )) && __vcsh_repositories
+       if (( CURRENT >= 3 )); then
+               words=( "${(@)words[3,-1]}" )
+               (( CURRENT -= 2 ))
+               _complete
+       fi
 }
 
-function _vcsh-setup () {
-       __vcsh_repositories
+function _vcsh-upgrade () {
+       (( CURRENT == 2 )) && __vcsh_repositories
 }
 
 function _vcsh-version () {
+       _nothing
 }
 
 function _vcsh-which () {
-       __vcsh_not_implemented_yet "$0" #TODO
+       _files
 }
 
 function _vcsh-write-gitignore () {
-       __vcsh_repositories
+       (( CURRENT == 2 )) && __vcsh_repositories
 }
 
 function _vcsh () {
@@ -84,9 +92,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"
+               "pull:pull from all vcsh remotes"
                "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"
@@ -110,8 +119,7 @@ function _vcsh () {
                        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}