Merge branch 'feature--overlay_functions'

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index e8513edbac9ce3bf7fea283e84185a7940ee5920..53ce905c3a7c62abfbbfcb71e89c38b3b143bc1b 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -19,11 +19,12 @@
 # If '.git-HEAD' is appended to the version, you are seeing an unreleased
 # version of vcsh; the master branch is supposed to be clean at all times
 # so you can most likely just use it nonetheless
-VERSION='1.20140508'
+VERSION='1.20141009'
 SELF=$(basename $0)
 
 fatal() {
        echo "$SELF: fatal: $1" >&2
+       [ -z $2] && exit 1
        exit $2
 }
 
@@ -75,6 +76,7 @@ fi
 # Read defaults
 : ${VCSH_REPO_D:="$XDG_CONFIG_HOME/vcsh/repo.d"}
 : ${VCSH_HOOK_D:="$XDG_CONFIG_HOME/vcsh/hooks-enabled"}
+: ${VCSH_OVERLAY_D:="$XDG_CONFIG_HOME/vcsh/overlays-enabled"}
 : ${VCSH_BASE:="$HOME"}
 : ${VCSH_GITIGNORE:=exact}
 : ${VCSH_GITATTRIBUTES:=none}
@@ -148,9 +150,10 @@ clone() {
        git remote add origin "$GIT_REMOTE"
        git config branch.master.remote origin
        git config branch.master.merge  refs/heads/master
-       if [ $(git ls-remote origin master 2> /dev/null | wc -l ) -lt 1 ]; then
-               info "remote is empty, not merging anything"
-               exit
+       VCSH_CLONE_ERROR=$(git ls-remote origin master 2>&1)
+       if [ -n "$VCSH_CLONE_ERROR" ]; then
+               rm -rf "$GIT_DIR"
+               fatal "$VCSH_CLONE_ERROR" 1
        fi
        git fetch
        hook pre-merge
@@ -351,6 +354,7 @@ use() {
 }
 
 which() {
+       [ -e "$VCSH_COMMAND_PARAMETER" ] || fatal "'$VCSH_COMMAND_PARAMETER' does not exist" 1
        for VCSH_REPO_NAME in $(list); do
                for VCSH_FILE in $(get_files); do
                        echo "$VCSH_FILE" | grep -q "$VCSH_COMMAND_PARAMETER" && echo "$VCSH_REPO_NAME: $VCSH_FILE"
@@ -510,6 +514,14 @@ check_dir "$VCSH_REPO_D"
 
 verbose "$VCSH_COMMAND begin"
 VCSH_COMMAND=$(echo "$VCSH_COMMAND" | sed 's/-/_/g'); export VCSH_COMMAND
+
+# source overlay functions
+for overlay in "$VCSH_OVERLAY_D/$VCSH_COMMAND"* "$VCSH_OVERLAY_D/$VCSH_REPO_NAME.$VCSH_COMMAND"*; do
+       [ -r "$overlay" ] || continue
+       info "sourcing '$overlay'"
+       . "$overlay"
+done
+
 hook pre-command
 $VCSH_COMMAND "$@"
 hook post-command