X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/2f7b006ff5df72cff63f8d7cb40d8c68cac07196..32150700f045d937d0362f690b01303aa7ea2131:/vcsh diff --git a/vcsh b/vcsh index a6d0106..67565b4 100755 --- a/vcsh +++ b/vcsh @@ -1,6 +1,12 @@ #!/bin/sh -[ -n "$VCSH_DEBUG" ] && set -x +# This program is licensed under the GNU GPL version 2 or later. +# (c) Richard "RichiH" Hartmann, 2011 +# For details, see LICENSE. To submit patches, you have to agree to +# license your code under the GNU GPL version 2 or later. + + +[ -n "$VCSH_DEBUG" ] && set -vx [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config" [ -z "$VCSH_BASE" ] && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d" @@ -13,18 +19,22 @@ help() { [] Clone from an existing repository help Display this help text delete Delete an existing repository - enter Enter repository; spawn new $SHELL + enter Enter repository; spawn new instance of \$SHELL init Initialize a new repository list List all repositories + list-tracked List all files tracked by vcsh + list-tracked-by \\ + List files tracked by a repository + rename \\ + Rename repository run \\ Use this repository - - seed-gitignore \\ - Seed .gitignore.d/ from git ls-files setup Set up repository with recommended settings + write-gitignore \\ + Write .gitignore.d/ via git ls-files - Special command that allows you to run git commands - directly without having to type so much ;)" >&2 + Shortcut to run git commands directly + Shortcut to enter repository" >&2 } debug() { @@ -66,8 +76,7 @@ clone() { } delete() { - old_dir="$PWD" - cd "$HOME" + cd "$HOME" || fatal "could not enter '$HOME'" 11 use info "This operation WILL DETROY DATA!" files=$(git ls-files) @@ -82,8 +91,7 @@ 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'" - cd "$old_dir" + rmdir "$GIT_DIR" || error "could not delete '$GIT_DIR'" } enter() { @@ -91,12 +99,15 @@ enter() { $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" + 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 - cd "$GIT_WORK_TREE" git init setup } @@ -107,17 +118,51 @@ list() { done } +get_files() { + export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git" + git ls-files +} + +list_tracked() { + for VCSH_REPO_NAME in $(list); do + get_files + done | sort -u +} + +list_tracked_by() { + use + git ls-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 + +} + run() { use $VCSH_EXTERNAL_COMMAND } -seed_gitignore() { +setup() { + use + git config core.worktree "$GIT_WORK_TREE" + git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME" + git config vcsh.vcsh 'true' + [ -e "$HOME/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$HOME/.gitignore.d/$VCSH_REPO_NAME" +} + +use() { + git_dir_exists + export GIT_WORK_TREE="$(git config --get core.worktree)" + export VCSH_DIRECTORY="$VCSH_REPO_NAME" +} + +write_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" - cd "$HOME" + cd "$HOME" || fatal "could not enter '$HOME'" 11 gitignores=$(for file in $(git ls-files); do while true; do echo $file; new="${file%/*}" @@ -126,14 +171,15 @@ seed_gitignore() { done; done | sort -u) tempfile=$(mktemp) || fatal "could not create tempfile" 51 - echo '*' > "$tempfile" + echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57 for gitignore in $gitignores; do - echo "$gitignore" | sed 's/^/!/' >> "$tempfile" - [ -d "$gitignore" ] && echo "$gitignore/*" | sed 's/^/!/'>> "$tempfile" + 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 - diff -N "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" > /dev/null && - rm -f "$tempfile" && + 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" || @@ -141,24 +187,6 @@ seed_gitignore() { fi mv -f "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" || fatal "could not move '$tempfile' to '$HOME/.gitignore.d/$VCSH_REPO_NAME'" 53 - cd "$old_dir" -} - -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" - git add "$HOME/.gitignore.d/$VCSH_REPO_NAME" -} - -use() { - if [ ! -d "$GIT_DIR" ]; then - fatal "no repository found for '$VCSH_REPO_NAME'" 12 - fi - export GIT_WORK_TREE="$(git config --get core.worktree)" - export VCSH_DIRECTORY="$VCSH_REPO_NAME" } if [ "$1" = 'clone' ]; then @@ -171,30 +199,48 @@ if [ "$1" = 'clone' ]; then elif [ "$1" = 'delete' ] || [ "$1" = 'enter' ] || [ "$1" = 'init' ] || + [ "$1" = 'list-tracked-by' ] || + [ "$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 + [ "$1" = 'setup' ] || + [ "$1" = 'write-gitignore' ]; 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" - [ "$1" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$@" - [ "$1" = 'seed-gitignore' ] && export VCSH_COMMAND=seed_gitignore -elif [ "$1" = 'list' ]; then + [ "$VCSH_COMMAND" = 'rename' ] && export GIT_DIR_NEW="$VCSH_BASE/$3.git" + [ "$VCSH_COMMAND" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$*" + [ "$VCSH_COMMAND" = 'write-gitignore' ] +elif [ "$1" = 'list' ] || + [ "$1" = 'list-tracked' ]; then export VCSH_COMMAND="$1" -elif [ -n "$1" ]; then - export VCSH_COMMAND=run +elif [ -n "$2" ]; 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 $*" +elif [ -n "$1" ]; then + export VCSH_COMMAND='enter' + export VCSH_REPO_NAME="$1" + export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git" + [ -d $GIT_DIR ] || { help; exit 1; } else # $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 @@ -208,5 +254,6 @@ do done verbose "$VCSH_COMMAND begin" +export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g') $VCSH_COMMAND verbose "$VCSH_COMMAND end, exiting"