X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/f0b495419c6525676fb852053381f191ce3b2d9b..cb335460e6a9463cd83afaab42ffce670ecb5f22:/_vcsh

diff --git a/_vcsh b/_vcsh
index 59cdcfe..9aca0f9 100644
--- a/_vcsh
+++ b/_vcsh
@@ -23,6 +23,10 @@ function _vcsh-enter () {
 	(( CURRENT == 2 )) && __vcsh_repositories
 }
 
+function _vcsh-foreach () {
+	_dispatch vcsh-foreach git
+}
+
 function _vcsh-help () {
 	_nothing
 }
@@ -36,24 +40,43 @@ function _vcsh-list () {
 }
 
 function _vcsh-list-tracked () {
+	(( CURRENT == 2 )) && __vcsh_repositories
+}
+
+function _vcsh-list-untracked () {
 	_nothing
 }
 
-function _vcsh-list-tracked-by () {
-	(( CURRENT == 2 )) && __vcsh_repositories
+function _vcsh-pull () {
+	_nothing
+}
+
+function _vcsh-push () {
+	_nothing
 }
 
 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
-	#TODO normal commands
+	(( CURRENT == 3 )) && _command_names -e
+	if (( CURRENT >= 4 )); then
+		# see _precommand in zsh
+		words=( "${(@)words[3,-1]}" )
+		(( CURRENT -= 2 ))
+		_normal
+	fi
 }
 
-function _vcsh-setup () {
+function _vcsh-status () {
+	(( CURRENT == 2 )) && __vcsh_repositories
+}
+
+function _vcsh-upgrade () {
 	(( CURRENT == 2 )) && __vcsh_repositories
 }
 
@@ -74,18 +97,26 @@ function _vcsh () {
 	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"
 		"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"
-		"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"
-		"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"
@@ -109,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.
-				_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}:"
-				_call_function ret _vcsh-${vcshcommand}
+				_call_function ret _vcsh-${vcshcommand} && (( ret ))
 			fi
 		fi
 	fi