X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/2cc7ffcd61352b55d7c010c7524a739b3fe13c80..eadb8df6aa71a76e5be36492edcadb118bd862ac:/_vcsh?ds=sidebyside

diff --git a/_vcsh b/_vcsh
index 6562dc5..9aca0f9 100644
--- a/_vcsh
+++ b/_vcsh
@@ -24,7 +24,7 @@ function _vcsh-enter () {
 }
 
 function _vcsh-foreach () {
-	_dispatch git git
+	_dispatch vcsh-foreach git
 }
 
 function _vcsh-help () {
@@ -40,10 +40,6 @@ function _vcsh-list () {
 }
 
 function _vcsh-list-tracked () {
-	_nothing
-}
-
-function _vcsh-list-tracked-by () {
 	(( CURRENT == 2 )) && __vcsh_repositories
 }
 
@@ -67,10 +63,12 @@ function _vcsh-rename () {
 
 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 ))
-		_complete
+		_normal
 	fi
 }
 
@@ -99,6 +97,9 @@ 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"
@@ -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"
-		"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"
@@ -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.
-				_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}:"
-				_call_function ret _vcsh-${vcshcommand}
+				_call_function ret _vcsh-${vcshcommand} && (( ret ))
 			fi
 		fi
 	fi