X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/4424028c0faa46b809fff726c8ec3d96a8e34d32..5c2fca9c11b587c2c34ca52f65872056aa9c1b74:/vcsh?ds=sidebyside

diff --git a/vcsh b/vcsh
index b5e703e..c05210d 100755
--- a/vcsh
+++ b/vcsh
@@ -30,6 +30,7 @@ help() {
 
    seed-gitignore \\
    <repo>               Seed .gitignore.d/<repo> from git ls-files
+   setup                Set up repository with recommended settings
    use <repo>           Use repository; set ENV
 
    <repo> <git command> Special command that allows you to run git commands
@@ -44,16 +45,12 @@ verbose() {
 	if [ -n "$VCSH_DEBUG" ] || [ -n "$VCSH_VERBOSE" ]; then echo "$SELF: verbose: $@"; fi
 }
 
-use() {
-	verbose "use() begin"
-	if [ ! -d "$GIT_DIR" ]; then
-		echo E: no repository found for "$VCSH_REPO_NAME" >&2
-		return 1
-	fi
-	export GIT_DIR
-	export GIT_WORK_TREE="$(git config --get core.worktree)"
-	export VCSH_DIRECTORY="$VCSH_REPO_NAME"
-	verbose "use() end"
+setup() {
+	git config core.worktree     "$GIT_WORK_TREE"
+	git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
+	git config vcsh.vcsh         'true'
+	touch   "$HOME/.gitignore.d/$VCSH_REPO_NAME"
+	git add "$HOME/.gitignore.d/$VCSH_REPO_NAME"
 }
 
 init() {
@@ -68,10 +65,7 @@ init() {
 		 return 1) || return $?
 	cd "$GIT_WORK_TREE"
 	git init
-	git config core.worktree     "$GIT_WORK_TREE"
-	git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
-	touch   "$HOME/.gitignore.d/$VCSH_REPO_NAME"
-	git add "$HOME/.gitignore.d/$VCSH_REPO_NAME"
+	setup
 	verbose "init() end"
 }
 
@@ -81,8 +75,21 @@ leave() {
 	unset VCSH_DIRECTORY
 }
 
+use() {
+	verbose "use() begin"
+	if [ ! -d "$GIT_DIR" ]; then
+		echo E: no repository found for "$VCSH_REPO_NAME" >&2
+		return 1
+	fi
+	export GIT_DIR
+	export GIT_WORK_TREE="$(git config --get core.worktree)"
+	export VCSH_DIRECTORY="$VCSH_REPO_NAME"
+	verbose "use() end"
+}
+
 
 if [ "$1" = 'clone' ]; then
+	export VCSH_COMMAND="$1"
 	GIT_REMOTE="$2"
 	export GIT_REMOTE
 	VCSH_REPO_NAME="$3"
@@ -94,6 +101,7 @@ elif [ "$1" = 'delete' ] ||
      [ "$1" = 'init' ] ||
      [ "$1" = 'run' ] ||
      [ "$1" = 'seed-gitignore' ] ||
+     [ "$1" = 'setup' ] ||
      [ "$1" = 'use' ]; then
 	[ -z $2 ] && echo "$SELF $1: error: please specify repository to work on" && return 1
 	export VCSH_COMMAND="$1"
@@ -225,7 +233,6 @@ elif [ "$VCSH_COMMAND" = 'seed-gitignore' ]; then
 	# Going back into old directory at the end in case `vcsh use` is reactivated.
 	old_dir="$PWD"
 	cd "$HOME"
-	git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
 	gitignores=$(for file in $(git ls-files); do
 		while true; do
 			echo $file; new="${file%/*}"
@@ -254,6 +261,13 @@ elif [ "$VCSH_COMMAND" = 'seed-gitignore' ]; then
 	cd "$old_dir"
 	verbose "seed-gitignore end"
 
+elif [ "$VCSH_COMMAND" = 'setup' ]; then
+	verbose "seed-gitignore begin"
+	use   || return $?
+	setup || return $?
+	leave
+	verbose "seed-gitignore end"
+
 elif [ "$VCSH_COMMAND" = 'use' ]; then
 	verbose "use begin"
 #	if [ -n "$ZSH_VERSION" ]; then