X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/45d958ca5f802a6ca99b910186b82608af82e8c9..492f2eef5c2421ae1c05cde8119c7a46511a93a8:/vcsh?ds=sidebyside diff --git a/vcsh b/vcsh index 1d4233d..ae0fa68 100755 --- a/vcsh +++ b/vcsh @@ -6,7 +6,6 @@ SELF=$(basename $0) - help() { echo "usage: $SELF @@ -14,19 +13,18 @@ help() { [] Clone from an existing repository help Display this help text delete Delete an existing repository + enter Enter repository; spawn new $SHELL init Initialize a new repository - list List all repos + list List all repositories run \\ Use this repository seed-gitignore \\ Seed .gitignore.d/ from git ls-files + setup Set up repository with recommended settings Special command that allows you to run git commands directly without having to type so much ;)" >&2 -# use Use this repository -# -# exit Exit vcsh mode" >&2 } debug() { @@ -37,45 +35,54 @@ 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" +error () { + echo "$SELF: error: $1" >&2 +} + +fatal () { + echo "$SELF: fatal error: $1" >&2 + exit $2 +} + +info () { + echo "$SELF: info: $1" +} + +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() { verbose "init() begin" - [ -e "$GIT_DIR" ] && - echo "$SELF: fatal: $GIT_DIR exists" && - return 21 + [ ! -e "$GIT_DIR" ] || fatal "$GIT_DIR exists" 10 export GIT_WORK_TREE="$HOME" mkdir -p "$GIT_WORK_TREE" - cd "$GIT_WORK_TREE" || - (echo "$SELF: fatal: could not enter $GIT_WORK_TREE" && - exit 20) || exit 20 + cd "$GIT_WORK_TREE" || fatal "could not enter $GIT_WORK_TREE" 11 cd "$GIT_WORK_TREE" git init - git config core.worktree "$GIT_WORK_TREE" - git config core.excludesfile ".gitignore.d/$REPO_NAME" - touch "$HOME/.gitignore.d/$REPO_NAME" - git add "$HOME/.gitignore.d/$REPO_NAME" + setup verbose "init() end" } -leave() { - unset GIT_DIR - unset GIT_WORK_TREE - unset VCSH_DIRECTORY +use() { + verbose "use() begin" + if [ ! -d "$GIT_DIR" ]; then + error "no repository found for '$VCSH_REPO_NAME'" + return 12 + 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" @@ -83,27 +90,29 @@ if [ "$1" = 'clone' ]; then export VCSH_REPO_NAME export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git" elif [ "$1" = 'delete' ] || + [ "$1" = 'enter' ] || [ "$1" = 'init' ] || [ "$1" = 'run' ] || - [ "$1" = 'seed-gitignore' ]; then - [ -z $2 ] && echo "$SELF $1: error: please specify repository to work on" && return 1 + [ "$1" = 'seed-gitignore' ] || + [ "$1" = 'setup' ]; then + [ -z $2 ] && fatal "$1: please specify repository to work on" 1 export VCSH_COMMAND="$1" export VCSH_REPO_NAME="$2" export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git" shift 2 export VCSH_EXTERNAL_COMMAND="$*" if [ "$VCSH_COMMAND" = 'run' ]; then - [ -z "$VCSH_EXTERNAL_COMMAND" ] && echo "$SELF $1 $2: error: please specify a command" && return 1 + [ -z "$VCSH_EXTERNAL_COMMAND" ] && fatal "$1 $2: please specify a command" 1 fi elif [ "$1" = 'help' ] || [ "$1" = 'list' ]; then export VCSH_COMMAND="$1" else - [ -z $1 ] && help && return 0 + [ -z $1 ] && help && exit 0 export VCSH_COMMAND='run' export VCSH_REPO_NAME="$1" export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git" - [ -d $GIT_DIR ] || (help && return 1) || return 0 + [ -d $GIT_DIR ] || { help; exit 1; } shift 1 export VCSH_EXTERNAL_COMMAND="git $*" fi @@ -113,11 +122,10 @@ for check_directory in "$VCSH_BASE" "$HOME/.gitignore.d" do if [ ! -d "$check_directory" ]; then if [ -e "$check_directory" ]; then - echo "$SELF: error: $check_directory exists but is not a directory" >&2 - exit 2 + fatal "$check_directory exists but is not a directory" 13 else - echo "$SELF: info: attempting to create $check_directory" - mkdir -p "$check_directory" || (echo "$SELF: error: could not create $check_directory" >&2; exit 2) + info "attempting to create $check_directory" + mkdir -p "$check_directory" || fatal "could not create $check_directory" 50 fi fi done @@ -132,15 +140,13 @@ if [ "$VCSH_COMMAND" = 'clone' ]; then git fetch for object in $(git ls-tree -r origin/master | awk '{print $4}'); do [ -e "$object" ] && - echo "$SELF: error: $object exists." && + error "$object exists." && VCSH_CONFLICT=1; done [ "$VCSH_CONFLICT" = '1' ] && - echo "$SELF: fatal: will stop after fetching and not try to merge!\n" && - echo " Once this situation has been resolved, run 'vcsh run git pull' to finish cloning.\n" && - exit 3 + fatal "will stop after fetching and not try to merge! + Once this situation has been resolved, run 'vcsh run git pull' to finish cloning.\n" 17 git merge origin/master -# use || return 1 verbose "clone end" #elif [ "$VCSH_COMMAND" = 'help' ] || [ "$#" -eq 0 ]; then @@ -151,8 +157,8 @@ elif [ "$VCSH_COMMAND" = 'delete' ]; then verbose "delete begin" old_dir="$PWD" cd "$HOME" - use || return 1 - echo "$SELF: info: This operation WILL DETROY DATA!" + use || exit $? + info "This operation WILL DETROY DATA!" files=$(git ls-files) echo "These files will be deleted: @@ -161,29 +167,23 @@ $files AGAIN, THIS WILL DELETE YOUR DATA! To continue, type \"Yes, do as I say\"" read answer - [ "x$answer" = "xYes, do as I say" ] || exit + [ "x$answer" = "xYes, do as I say" ] || exit 16 for file in $files; do - rm -f $file || echo "$SELF: info: could not delete '$file', continuing with deletion" + rm -f $file || info "could not delete '$file', continuing with deletion" done - rm -rf "$GIT_DIR" || echo "$SELF: info: could not delete '$GIT_DIR'" + rm -rf "$GIT_DIR" || info "could not delete '$GIT_DIR'" cd "$old_dir" verbose "delete end" -#elif [ "$VCSH_COMMAND" = 'exit' ]; then -# verbose "exit begin" -# if [ -n "$ZSH_VERSION" ] && [ "$VCSH_NO_IGNORE_EOF" = '1' ]; then -# unset VCSH_NO_IGNORE_EOF -# setopt NO_IGNORE_EOF -# fi -# leave -# [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1 -# verbose "exit end" -# exit 0 +elif [ "$VCSH_COMMAND" = 'enter' ]; then + verbose "enter begin" + use || exit $? + $SHELL + verbose "enter end" elif [ "$VCSH_COMMAND" = 'init' ]; then verbose "init begin" init -# use || return 1 verbose "init end" elif [ "$VCSH_COMMAND" = 'list' ]; then @@ -195,67 +195,52 @@ elif [ "$VCSH_COMMAND" = 'list' ]; then elif [ "$VCSH_COMMAND" = 'run' ]; then verbose "run begin" - use || return 1 + use || exit $? $VCSH_EXTERNAL_COMMAND - leave verbose "run end" elif [ "$VCSH_COMMAND" = 'seed-gitignore' ]; then verbose "seed-gitignore begin" - use || return 1 + use || exit $? # 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" 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%/*}" [ "$file" = "$new" ] && break file="$new" done; - done | sort -u | sed 's/^/!/') - tempfile=$(mktemp) || - (echo "$SELF: fatal: could not create tempfile" && exit 1) + done | sort -u) + tempfile=$(mktemp) || fatal "could not create tempfile" 51 echo '*' > "$tempfile" for gitignore in $gitignores; do - echo "$gitignore" >> "$tempfile" + echo "$gitignore" | sed 's/^/!/' >> "$tempfile" + [ -d "$gitignore" ] && echo "$gitignore/*" | sed 's/^/!/'>> "$tempfile" done diff -N "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" > /dev/null && rm -f "$tempfile" && - return + exit if [ -e "$HOME/.gitignore.d/$VCSH_REPO_NAME" ]; then - echo "$SELF: info: $HOME/.gitignore.d/$VCSH_REPO_NAME differs from new data, moving it to $HOME/.gitignore.d/$VCSH_REPO_NAME.bak" + info "$HOME/.gitignore.d/$VCSH_REPO_NAME differs from new data, moving it to $HOME/.gitignore.d/$VCSH_REPO_NAME.bak" mv -f "$HOME/.gitignore.d/$VCSH_REPO_NAME" "$HOME/.gitignore.d/$VCSH_REPO_NAME.bak" || - (echo "$SELF: fatal: could not move $HOME/.gitignore.d/$VCSH_REPO_NAME to $HOME/.gitignore.d/$VCSH_REPO_NAME.bak" && exit 1) + fatal "could not move $HOME/.gitignore.d/$VCSH_REPO_NAME to $HOME/.gitignore.d/$VCSH_REPO_NAME.bak" 53 fi mv -f "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" || - (echo "$SELF: fatal: could not move $tempfile to $HOME/.gitignore.d/$VCSH_REPO_NAME" && exit 1) + fatal "could not move $tempfile to $HOME/.gitignore.d/$VCSH_REPO_NAME" 53 cd "$old_dir" verbose "seed-gitignore end" -#elif [ "$VCSH_COMMAND" = 'use' ]; then -# verbose "use begin" -# if [ -n "$ZSH_VERSION" ]; then -# if [ -o NO_IGNORE_EOF ]; then -# export VCSH_NO_IGNORE_EOF=1 -# setopt IGNORE_EOF -# fi -# vcsh_exit() { -# vcsh exit; -# zle reset-prompt; -# } -# zle -N vcsh_exit -# bindkey '^d' 'vcsh_exit' -# fi -# use || return 1 -# [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1 -# verbose "use end" +elif [ "$VCSH_COMMAND" = 'setup' ]; then + verbose "seed-gitignore begin" + use || exit $? + setup || exit $? + verbose "seed-gitignore end" else verbose "defaulting to calling help()" help - echo "$SELF: fatal: You should never reach this code. File a bug, please." - exit 99 + fatal "You should never reach this code. File a bug, please." 99 fi