X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/84247591a3718d345e182780b9207f85b17e3999..65c7cdcd62055286a254bb0d3ce6cc4459673dc0:/_vcsh?ds=sidebyside

diff --git a/_vcsh b/_vcsh
index 59cdcfe..53eaada 100644
--- a/_vcsh
+++ b/_vcsh
@@ -43,17 +43,38 @@ function _vcsh-list-tracked-by () {
 	(( CURRENT == 2 )) && __vcsh_repositories
 }
 
+function _vcsh-list-untracked () {
+	_nothing
+}
+
+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
+	if (( CURRENT >= 3 )); then
+		words=( "${(@)words[3,-1]}" )
+		(( CURRENT -= 2 ))
+		_complete
+	fi
+}
+
+function _vcsh-status () {
+	(( CURRENT == 2 )) && __vcsh_repositories
 }
 
-function _vcsh-setup () {
+function _vcsh-upgrade () {
 	(( CURRENT == 2 )) && __vcsh_repositories
 }
 
@@ -76,6 +97,7 @@ function _vcsh () {
 
 	subcommands=(
 		"clone:clone an existing repository"
+		"commit:commit in all repositories"
 		"delete:delete an existing repository"
 		"enter:enter repository; spawn new <\$SHELL>"
 		"help:display help"
@@ -83,9 +105,13 @@ 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"
+		"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,8 +135,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}