X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/d4326c2c1c2d5e9626f8d9e2ba0e5e3848772238..9a079178dc7f7dbde519f6f261513ac541c61491:/vcsh?ds=inline

diff --git a/vcsh b/vcsh
index 50c1c31..896cda8 100755
--- a/vcsh
+++ b/vcsh
@@ -16,6 +16,8 @@ help() {
    enter                Enter repository; spawn new $SHELL
    init <repo>          Initialize a new repository
    list                 List all repositories
+   rename <repo> \\
+          <newname>     Rename repository
    run <repo> \\
        <command>        Use this repository
 
@@ -48,7 +50,7 @@ info() {
 	echo "$SELF: info: $1"
 }
 
-clone () {
+clone() {
 	init
 	git remote add origin "$GIT_REMOTE"
 	git config branch.master.remote origin
@@ -65,10 +67,10 @@ clone () {
 	git merge origin/master
 }
 
-delete () {
+delete() {
 	old_dir="$PWD"
 	cd "$HOME"
-	use || exit $?
+	use
 	info "This operation WILL DETROY DATA!"
 	files=$(git ls-files)
 	echo "These files will be deleted:
@@ -82,38 +84,48 @@ To continue, type \"Yes, do as I say\""
 	for file in $files; do
 		rm -f $file || info "could not delete '$file', continuing with deletion"
 	done
-	rm -rf "$GIT_DIR" || info "could not delete '$GIT_DIR'"
+	rmdir "$GIT_DIR" || info "could not delete '$GIT_DIR'"
 	cd "$old_dir"
 }
 
-enter () {
-	use || exit $?
+enter() {
+	use
 	$SHELL
 }
 
+git_dir_exists() {
+	[ -d "$GIT_DIR" ] || fatal "no repository found for '$VCSH_REPO_NAME'" 12
+}
+
 init() {
 	[ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
 	export GIT_WORK_TREE="$HOME"
 	mkdir -p "$GIT_WORK_TREE"
 	cd "$GIT_WORK_TREE" || fatal "could not enter '$GIT_WORK_TREE'" 11
-	cd "$GIT_WORK_TREE"
 	git init
 	setup
 }
 
-list () {
+list() {
 	for i in "$VCSH_BASE"/*.git; do
 		echo $(basename "$i" .git)
 	done
 }
 
-run () {
-	use || exit $?
+rename() {
+	git_dir_exists
+	[ -d "$GIT_DIR_NEW" ] && fatal "'$GIT_DIR_NEW' exists" 54
+	mv -f "$GIT_DIR" "$GIT_DIR_NEW" || fatal "Could not mv '$GIT_DIR' '$GIT_DIR_NEW'" 52
+
+}
+
+run() {
+	use
 	$VCSH_EXTERNAL_COMMAND
 }
 
-seed_gitignore () {
-	use || exit $?
+seed_gitignore() {
+	use
 	# Switching directory as this has to be executed from $HOME to be of any use.
 	# Going back into old directory at the end in case `vcsh use` is reactivated.
 	old_dir="$PWD"
@@ -154,10 +166,7 @@ setup() {
 }
 
 use() {
-	if [ ! -d "$GIT_DIR" ]; then
-		error "no repository found for '$VCSH_REPO_NAME'"
-		return 12
-	fi
+	git_dir_exists
 	export GIT_WORK_TREE="$(git config --get core.worktree)"
 	export VCSH_DIRECTORY="$VCSH_REPO_NAME"
 }
@@ -172,16 +181,19 @@ if [ "$1" = 'clone' ]; then
 elif [ "$1" = 'delete' ] ||
      [ "$1" = 'enter' ] ||
      [ "$1" = 'init' ] ||
+     [ "$1" = 'rename' ] ||
      [ "$1" = 'run' ] ||
      [ "$1" = 'seed-gitignore' ] ||
      [ "$1" = 'setup' ]; then
-	[ -z $2 ] && fatal "$1: please specify repository to work on" 1
-	[ "$1" = 'run' -a -z "$3" ] && fatal "$1: please specify a command" 1
+	[ -z $2 ]                      && fatal "$1: please specify repository to work on" 1
+	[ "$1" = 'rename' -a -z "$3" ] && fatal "$1: please specify a target name" 1
+	[ "$1" = 'run' -a -z "$3" ]    && fatal "$1: please specify a command" 1
 	export VCSH_COMMAND="$1"
 	export VCSH_REPO_NAME="$2"
 	export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git"
-	[ "$1" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$@"
-	[ "$1" = 'seed-gitignore' ] && export VCSH_COMMAND=seed_gitignore
+	[ "$VCSH_COMMAND" = 'rename' ]         && export GIT_DIR_NEW="$VCSH_BASE/$3.git"
+	[ "$VCSH_COMMAND" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$@"
+	[ "$VCSH_COMMAND" = 'seed-gitignore' ] && export VCSH_COMMAND='seed_gitignore'
 elif [ "$1" = 'list' ]; then
 	export VCSH_COMMAND="$1"
 elif [ -n "$1" ]; then