X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/15081fe001484b3337b60d0874d7ff4f608c1cc8..a0a5e21206fb737a14ed7e37616bbfede1a64df8:/vcsh?ds=inline diff --git a/vcsh b/vcsh index e3612b7..550c36f 100755 --- a/vcsh +++ b/vcsh @@ -1,152 +1,243 @@ #!/bin/sh -#set -x +[ -n "$VCSH_DEBUG" ] && set -x +[ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config" +[ -z "$VCSH_BASE" ] && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d" 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 -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 - -VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d" - help() { echo "usage: $SELF - help Display this help + clone \\ + [] 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 repositories + rename \\ + Rename repository + 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 +} - list List all repos +debug() { + [ -n "$VCSH_DEBUG" ] && echo "$SELF: debug: $@" +} - use Use this repository - run - Use this repository +verbose() { + if [ -n "$VCSH_DEBUG" ] || [ -n "$VCSH_VERBOSE" ]; then echo "$SELF: verbose: $@"; fi +} - init Initialize a new repository - clone - [] Clone from an existing repository +fatal() { + echo "$SELF: fatal: $1" >&2 + exit $2 +} - exit Exit vcsh mode" >&2 +error() { + echo "$SELF: error: $1" >&2 } -use() { - REPO_NAME="$1" - GIT_DIR="$VCSH_BASE/$REPO_NAME.git" +info() { + echo "$SELF: info: $1" +} - if [ ! -d "$GIT_DIR" ]; then - echo E: no repository found for "$REPO_NAME" >&2 - return 2 - fi +clone() { + init + git remote add origin "$GIT_REMOTE" + git config branch.master.remote origin + git config branch.master.merge refs/heads/master + git fetch + for object in $(git ls-tree -r origin/master | awk '{print $4}'); do + [ -e "$object" ] && + error "'$object' exists." && + VCSH_CONFLICT=1; + done + [ "$VCSH_CONFLICT" = '1' ] && + fatal "will stop after fetching and not try to merge! + Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning.\n" 17 + git merge origin/master +} - export GIT_DIR - export GIT_WORK_TREE="$(git config --get core.worktree)" - export VCSH_DIRECTORY="$REPO_NAME" +delete() { + cd "$HOME" || fatal "could not enter '$HOME'" 11 + use + 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" ] || exit 16 + for file in $files; do + rm -f $file || info "could not delete '$file', continuing with deletion" + done + rmdir "$GIT_DIR" || error "could not delete '$GIT_DIR'" +} + +enter() { + use + $SHELL +} + +git_dir_exists() { + [ -d "$GIT_DIR" ] || fatal "no repository found for '$VCSH_REPO_NAME'" 12 } init() { - [[ -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 + mkdir -p "$GIT_WORK_TREE" || fatal "could not create '$GIT_WORK_TREE'" 50 + cd "$GIT_WORK_TREE" || fatal "could not enter '$GIT_WORK_TREE'" 11 git init - git config core.worktree $GIT_WORK_TREE + setup } -leave() { - unset GIT_DIR - unset GIT_WORK_TREE - unset VCSH_DIRECTORY +list() { + for i in "$VCSH_BASE"/*.git; do + echo $(basename "$i" .git) + done } -if [ "$1" = 'help' ] || [ $# -eq 0 ]; then - help - [ "$1" = 'help' ] - return $? +#get_files() { +# return $(git ls-files) +#} +# +#list_tracked_all() { +# use +# for repo in $(list); do +# files="$files $(get_files $repo)" +# done +# echo $files | sort -u +#} + +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 -elif [ "$1" = 'list' ]; then - for i in $VCSH_BASE/*.git; do - echo $(basename $i .git) - done - return 0 - -elif [ "$1" = 'run' ]; then - use $2 - shift 2 - "$@" - leave - return 0 - -elif [ "$1" = 'use' ]; then - if [[ -o NO_IGNORE_EOF ]]; then - export VCSH_NO_IGNORE_EOF=1 - setopt IGNORE_EOF - if [[ -n $ZSH_VERSION ]]; then - vcsh_exit() { - vcsh exit; - zle reset-prompt; - } - fi - zle -N vcsh_exit - bindkey '^d' 'vcsh_exit' - fi - use $2 - buildPS1 - return 0 +} -elif [ "$1" = 'clone' ]; then - 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 +run() { + use + $VCSH_EXTERNAL_COMMAND +} - git remote add origin $GIT_REMOTE - git config branch.master.remote origin - git config branch.master.merge refs/heads/master - git fetch - for i in $(git ls-tree -r origin/master | awk '{print $4}'); do - [[ -e $i ]] && - echo "$SELF: error: $i exists." && - CONFLICT=1; +seed_gitignore() { + use + cd "$HOME" || fatal "could not enter '$HOME'" 11 + 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) || fatal "could not create tempfile" 51 + echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57 + for gitignore in $gitignores; do + echo "$gitignore" | sed 's/^/!/' >> "$tempfile" || fatal "could not write to '$tempfile'" 57 + [ -d "$gitignore" ] && { echo "$gitignore/*" | sed 's/^/!/' >> "$tempfile" || fatal "could not write to '$tempfile'" 57; } done - [[ -n $CONFLICT ]] && - echo "$SELF: fatal: will stop after fetching and not try to merge!\n" && - exit 3 - git merge origin/master - vcsh use $REPO_NAME + if diff -N "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" > /dev/null; then + rm -f "$tempfile" || error "could not delete '$tempfile'" + exit + fi + if [ -e "$HOME/.gitignore.d/$VCSH_REPO_NAME" ]; then + 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" || + 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" || + fatal "could not move '$tempfile' to '$HOME/.gitignore.d/$VCSH_REPO_NAME'" 53 +} -elif [ "$1" = 'init' ]; then - export REPO_NAME="$2" - export GIT_DIR="$VCSH_BASE/$REPO_NAME.git" - init - vcsh use $REPO_NAME +setup() { + use + 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" || error "could not touch '$HOME/.gitignore.d/$VCSH_REPO_NAME'" + git add "$HOME/.gitignore.d/$VCSH_REPO_NAME" +} -elif [ "$1" = 'exit' ]; then - if [[ $VCSH_NO_IGNORE_EOF -gt 0 ]]; then - unset VCSH_NO_IGNORE_EOF - setopt NO_IGNORE_EOF - fi - leave - buildPS1 - return 0 +use() { + git_dir_exists + export GIT_WORK_TREE="$(git config --get core.worktree)" + export VCSH_DIRECTORY="$VCSH_REPO_NAME" +} +if [ "$1" = 'clone' ]; then + [ -z $2 ] && fatal "$1: please specify a remote" 1 + export VCSH_COMMAND="$1" + GIT_REMOTE="$2" + [ -n "$3" ] && VCSH_REPO_NAME="$3" || VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git) + export VCSH_REPO_NAME + export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git" +elif [ "$1" = 'delete' ] || + [ "$1" = 'enter' ] || + [ "$1" = 'init' ] || + [ "$1" = 'list-tracked-all' ] || + [ "$1" = 'rename' ] || + [ "$1" = 'run' ] || + [ "$1" = 'seed-gitignore' ] || + [ "$1" = 'setup' ]; then + [ -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" + [ "$VCSH_COMMAND" = 'rename' ] && export GIT_DIR_NEW="$VCSH_BASE/$3.git" + [ "$VCSH_COMMAND" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$*" + [ "$VCSH_COMMAND" = 'seed-gitignore' ] +# [ "$VCSH_COMMAND" = 'seed-gitignore' ] && export VCSH_COMMAND='seed_gitignore' +elif [ "$1" = 'list' ]; then + export VCSH_COMMAND="$1" +elif [ -n "$1" ]; then + export VCSH_COMMAND=run + export VCSH_REPO_NAME="$1" + export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git" + [ -d $GIT_DIR ] || { help; exit 1; } + shift 1 + export VCSH_EXTERNAL_COMMAND="git $*" else - help - return 3 + # $1 is empty, or 'help' + help && exit +fi +# Did we receive a directory instead of a name? +# Mangle the input to fit normal operation. +if echo $VCSH_REPO_NAME | grep -q '/'; then + export GIT_DIR=$VCSH_REPO_NAME + export VCSH_REPO_NAME=$(basename $VCSH_REPO_NAME .git) fi + +for check_directory in "$VCSH_BASE" "$HOME/.gitignore.d" +do + if [ ! -d "$check_directory" ]; then + if [ -e "$check_directory" ]; then + fatal "'$check_directory' exists but is not a directory" 13 + else + info "attempting to create '$check_directory'" + mkdir -p "$check_directory" || fatal "could not create '$check_directory'" 50 + fi + fi +done + +verbose "$VCSH_COMMAND begin" +export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g') +$VCSH_COMMAND +verbose "$VCSH_COMMAND end, exiting"