X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/e278038b91dd5933c0f6592cbef2108c205b65d0..7e910058201d7d617f3e62367d4d53281ac28a4e:/vcsh diff --git a/vcsh b/vcsh index 0df962b..6fa6644 100755 --- a/vcsh +++ b/vcsh @@ -1,63 +1,50 @@ #!/bin/sh -[ -n "$VCSH_DEBUG" ] && set -x - -SELF=$(basename $0) - +[ -n "$VCSH_DEBUG" ] && set -x [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config" -for check_directory in "$XDG_CONFIG_HOME" "$XDG_CONFIG_HOME/vcsh" "$XDG_CONFIG_HOME/vcsh/repo.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 - else - mkdir "$check_directory" || (echo "$SELF: error: could not create $check_directory" >&2; exit 2) - fi - fi -done +[ -z "$VCSH_BASE" ] && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d" -VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d" - -debug() { - [ -n "$VCSH_DEBUG" ] && echo "$SELF: debug: $1" -} +SELF=$(basename $0) -verbose() { - if [ -n "$VCSH_DEBUG" ] || [ -n "$VCSH_VERBOSE" ]; then echo "$SELF: verbose: $1"; fi -} -# use Use this repository -# -# exit Exit vcsh mode" >&2 help() { echo "usage: $SELF - help Display this help + clone \\ + [] Clone from an existing repository + help Display this help text + delete Delete an existing repository + exit Exit repository; unset ENV + init Initialize a new repository + list List all repositories + run \\ + Use this repository - list List all repos + seed-gitignore \\ + Seed .gitignore.d/ from git ls-files + use Use repository; set ENV - run \\ - Use this repository + Special command that allows you to run git commands + directly without having to type so much ;)" >&2 +} - init Initialize a new repository - clone \\ - [] Clone from an existing repository" >&2 +debug() { + [ -n "$VCSH_DEBUG" ] && echo "$SELF: debug: $@" +} + +verbose() { + if [ -n "$VCSH_DEBUG" ] || [ -n "$VCSH_VERBOSE" ]; then echo "$SELF: verbose: $@"; fi } use() { verbose "use() begin" - REPO_NAME="$1" - GIT_DIR="$VCSH_BASE/$REPO_NAME.git" - if [ ! -d "$GIT_DIR" ]; then - echo E: no repository found for "$REPO_NAME" >&2 - return 2 + 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="$REPO_NAME" + export VCSH_DIRECTORY="$VCSH_REPO_NAME" verbose "use() end" } @@ -70,10 +57,13 @@ init() { mkdir -p "$GIT_WORK_TREE" cd "$GIT_WORK_TREE" || (echo "$SELF: fatal: could not enter $GIT_WORK_TREE" && - exit 20) || exit 20 + return 1) || return $? cd "$GIT_WORK_TREE" git init - git config core.worktree "$GIT_WORK_TREE" + 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" verbose "init() end" } @@ -83,56 +73,60 @@ leave() { unset VCSH_DIRECTORY } -if [ "$1" = 'help' ] || [ "$#" -eq 0 ]; then - help - [ "$1" = 'help' ] - exit $? - -elif [ "$1" = 'list' ]; then - verbose "list begin" - for i in "$VCSH_BASE"/*.git; do - echo $(basename "$i" .git) - done - verbose "list end" - exit 0 -elif [ "$1" = 'run' ]; then - verbose "run begin" - use "$2" +if [ "$1" = 'clone' ]; then + GIT_REMOTE="$2" + export GIT_REMOTE + VCSH_REPO_NAME="$3" + [ -z "$VCSH_REPO_NAME" ] && VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git) + export VCSH_REPO_NAME + export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git" +elif [ "$1" = 'delete' ] || + [ "$1" = 'init' ] || + [ "$1" = 'run' ] || + [ "$1" = 'seed-gitignore' ] || + [ "$1" = 'use' ]; then + [ -z $2 ] && echo "$SELF $1: error: please specify repository to work on" && return 1 + export VCSH_COMMAND="$1" + export VCSH_REPO_NAME="$2" + export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git" shift 2 - "$@" - leave - verbose "run end" - exit 0 + export VCSH_EXTERNAL_COMMAND="$*" + if [ "$VCSH_COMMAND" = 'run' ]; then + [ -z "$VCSH_EXTERNAL_COMMAND" ] && echo "$SELF $1 $2: error: please specify a command" && return 1 + fi +elif [ "$1" = 'exit' ] || + [ "$1" = 'help' ] || + [ "$1" = 'list' ]; then + export VCSH_COMMAND="$1" +else + [ -z $1 ] && help && return 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 + shift 1 + export VCSH_EXTERNAL_COMMAND="git $*" +fi + + +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 + return 2 + else + echo "$SELF: info: attempting to create $check_directory" + mkdir -p "$check_directory" || (echo "$SELF: error: could not create $check_directory" >&2; return 2) || return $? + fi + fi +done -#elif [ "$1" = '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 $2 -# [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1 -# verbose "use end" -# exit 0 -elif [ "$1" = 'clone' ]; then +if [ "$VCSH_COMMAND" = 'clone' ]; then verbose "clone begin" - GIT_REMOTE="$2" - REPO_NAME="$3" - [ -z "$REPO_NAME" ] && REPO_NAME=$(basename "$GIT_REMOTE" .git) - export REPO_NAME - export GIT_DIR="$VCSH_BASE/$REPO_NAME.git" init - git remote add origin "$GIT_REMOTE" git config branch.master.remote origin git config branch.master.merge refs/heads/master @@ -144,35 +138,127 @@ elif [ "$1" = 'clone' ]; then done [ "$VCSH_CONFLICT" = '1' ] && echo "$SELF: fatal: will stop after fetching and not try to merge!\n" && - exit 3 + echo " Once this situation has been resolved, run 'vcsh run git pull' to finish cloning.\n" && + return 3 git merge origin/master -# vcsh use $REPO_NAME +# use || return $? verbose "clone end" -elif [ "$1" = 'init' ]; then - verbose "init begin" - [ -z $2 ] && help && return 0 - export REPO_NAME="$2" - export GIT_DIR="$VCSH_BASE/$REPO_NAME.git" - init -# vcsh use "$REPO_NAME" - verbose "init end" +#elif [ "$VCSH_COMMAND" = 'help' ] || [ "$#" -eq 0 ]; then +elif [ "$VCSH_COMMAND" = 'help' ]; then + help + +elif [ "$VCSH_COMMAND" = 'delete' ]; then + verbose "delete begin" + old_dir="$PWD" + cd "$HOME" + use || return $? + echo "$SELF: info: This operation WILL DETROY DATA!" + files=$(git ls-files) + echo "These files will be deleted: + +$files + +AGAIN, THIS WILL DELETE YOUR DATA! +To continue, type \"Yes, do as I say\"" + read answer + [ "x$answer" = "xYes, do as I say" ] || return 1 + for file in $files; do + rm -f $file || echo "$SELF: info: could not delete '$file', continuing with deletion" + done + rm -rf "$GIT_DIR" || echo "$SELF: info: could not delete '$GIT_DIR'" + cd "$old_dir" + verbose "delete end" -#elif [ "$1" = 'exit' ]; then -# verbose "exit begin" +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 + leave +# [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1 + verbose "exit end" + return 0 + +elif [ "$VCSH_COMMAND" = 'init' ]; then + verbose "init begin" + init +# use || return $? + verbose "init end" + +elif [ "$VCSH_COMMAND" = 'list' ]; then + verbose "list begin" + for i in "$VCSH_BASE"/*.git; do + echo $(basename "$i" .git) + done + verbose "list end" + +elif [ "$VCSH_COMMAND" = 'run' ]; then + verbose "run begin" + use || return $? + $VCSH_EXTERNAL_COMMAND + leave + verbose "run end" + +elif [ "$VCSH_COMMAND" = 'seed-gitignore' ]; then + verbose "seed-gitignore begin" + use || return $? + # 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) + tempfile=$(mktemp) || + (echo "$SELF: fatal: could not create tempfile" && return 1) || return $? + echo '*' > "$tempfile" + for gitignore in $gitignores; do + 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 + 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" + 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" && + return 1) || return $? + fi + mv -f "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" || + (echo "$SELF: fatal: could not move $tempfile to $HOME/.gitignore.d/$VCSH_REPO_NAME" && return 1) || return $? + 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 $? # [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1 -# verbose "exit end" -# exit 0 + verbose "use end" else verbose "defaulting to calling help()" help - exit 3 + echo "$SELF: fatal: You should never reach this code. File a bug, please." + return 99 fi -