X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/bb6411ce8f1774ac4200c772b59feb64584baa4f..d71f32cb391997d7fe0509fa0dfbf83fc3762eb9:/vcsh diff --git a/vcsh b/vcsh index c12ee74..23f8453 100755 --- a/vcsh +++ b/vcsh @@ -1,30 +1,30 @@ #!/bin/sh -[ "$VCSH_DEBUG" = '1' ] && set -x +[ -n "$VCSH_DEBUG" ] && set -x SELF=$(basename $0) [ -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" +[ -z "$VCSH_BASE" ] && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d" +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 else - mkdir "$check_directory" || (echo "$SELF: error: could not create $check_directory" >&2; exit 2) + echo "$SELF: info: attempting to create $check_directory" + mkdir -p "$check_directory" || (echo "$SELF: error: could not create $check_directory" >&2; exit 2) fi fi done -VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d" - debug() { - [ "$VCSH_DEBUG" = '1' ] && echo "$SELF: debug: $1" + [ -n "$VCSH_DEBUG" ] && echo "$SELF: debug: $1" } verbose() { - if [ "$VCSH_DEBUG" = '1' ] || [ "$VCSH_VERBOSE" = '1' ]; then echo "$SELF: verbose: $1"; fi + if [ -n "$VCSH_DEBUG" ] || [ -n "$VCSH_VERBOSE" ]; then echo "$SELF: verbose: $1"; fi } # use Use this repository @@ -43,6 +43,8 @@ help() { init Initialize a new repository clone \\ [] Clone from an existing repository + seed-gitignore \\ + Seed .gitignore.d/ from git ls-files" >&2 } use() { @@ -52,7 +54,7 @@ use() { if [ ! -d "$GIT_DIR" ]; then echo E: no repository found for "$REPO_NAME" >&2 - return 2 + return 1 fi export GIT_DIR @@ -73,7 +75,10 @@ init() { exit 20) || exit 20 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/$REPO_NAME" + touch "$HOME/.gitignore.d/$REPO_NAME" + git add "$HOME/.gitignore.d/$REPO_NAME" verbose "init() end" } @@ -98,7 +103,7 @@ elif [ "$1" = 'list' ]; then elif [ "$1" = 'run' ]; then verbose "run begin" - use "$2" + use "$2" || return 1 shift 2 "$@" leave @@ -119,7 +124,7 @@ elif [ "$1" = 'run' ]; then # zle -N vcsh_exit # bindkey '^d' 'vcsh_exit' # fi -# use $2 +# use "$2" || return 1 # [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1 # verbose "use end" # exit 0 @@ -136,6 +141,7 @@ elif [ "$1" = 'clone' ]; then git remote add origin "$GIT_REMOTE" git config branch.master.remote origin git config branch.master.merge refs/heads/master + git config core.excludesfile ".gitignore.d/$REPO_NAME" git fetch for object in $(git ls-tree -r origin/master | awk '{print $4}'); do [ -e "$object" ] && @@ -144,18 +150,19 @@ elif [ "$1" = 'clone' ]; then 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 git merge origin/master -# vcsh use $REPO_NAME +# use $REPO_NAME || return 1 verbose "clone end" elif [ "$1" = 'init' ]; then verbose "init begin" - [ -z $2 ] && help; return 0 + [ -z $2 ] && help && echo && echo "$SELF $1: error: please specify repository to work on" && return 0 export REPO_NAME="$2" export GIT_DIR="$VCSH_BASE/$REPO_NAME.git" init -# vcsh use "$REPO_NAME" +# use "$REPO_NAME" || return 1 verbose "init end" #elif [ "$1" = 'exit' ]; then @@ -169,6 +176,66 @@ elif [ "$1" = 'init' ]; then # verbose "exit end" # exit 0 +elif [ "$1" = 'seed-gitignore' ]; then + verbose "seed-gitignore begin" + [ -z $2 ] && help && echo && echo "$SELF $1: error: please specify repository to work on" && return 0 + use $2 || return 1 + # 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/$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) + echo '*' > "$tempfile" + for gitignore in $gitignores; do + echo "$gitignore" >> "$tempfile" + done + diff -N "$tempfile" "$HOME/.gitignore.d/$2" > /dev/null && + rm -f "$tempfile" && + return + if [ -e "$HOME/.gitignore.d/$2" ]; then + echo "$SELF: info: $HOME/.gitignore.d/$2 differs from new data, moving it to $HOME/.gitignore.d/$2.bak" + mv -f "$HOME/.gitignore.d/$2" "$HOME/.gitignore.d/$2.bak" || + (echo "$SELF: fatal: could not move $HOME/.gitignore.d/$2 to $HOME/.gitignore.d/$2.bak" && exit 1) + fi + mv -f "$tempfile" "$HOME/.gitignore.d/$2" || + (echo "$SELF: fatal: could not move $tempfile to $HOME/.gitignore.d/$2" && exit 1) + cd "$old_dir" + verbose "seed-gitignore end" + +elif [ "$1" = 'delete' ]; then + verbose "delete begin" + REPO_NAME=$2 + [ -z $REPO_NAME ] && help && echo && echo "$SELF $1: error: please specify repository to work on" && return 0 + use $REPO_NAME || return 1 + echo "$SELF: info: This operation WILL DETROY DATA!" + echo -n "Continue? Anything other than 'y' will abort. " + read answer + [ x$answer = x"y" ] || exit + files=$(git ls-files) + echo "These files would 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" ] || exit + for file in $files; do + rm -f $file || echo "$SELF: info: could not delete '$file', continuing with deletion" + done + rm -rf "$VCSH_BASE/$REPO_NAME.git" || echo "$SELF: info: could not delete '$VCSH_BASE/$REPO_NAME.git'" + verbose "delete end" + + else verbose "defaulting to calling help()" help