Merge branch 'feature--improve_clone_errors'

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 53bec40c10e63c63b6ca3f024481037c5a170035..a12bc4962f9f8b31cc14b03fe3739d9213e4606f 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
 # 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.20140313'
+VERSION='1.20141009'

 SELF=$(basename $0)
 
 fatal() {
        echo "$SELF: fatal: $1" >&2
 SELF=$(basename $0)
 
 fatal() {
        echo "$SELF: fatal: $1" >&2

+       [ -z $2] && exit 1

        exit $2
 }
 
        exit $2
 }
 


@@ -148,9 +149,10 @@ clone() {
        git remote add origin "$GIT_REMOTE"
        git config branch.master.remote origin
        git config branch.master.merge  refs/heads/master
        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
        fi
        git fetch
        hook pre-merge


@@ -161,7 +163,7 @@ clone() {
        done
        [ x"$VCSH_CONFLICT" = x'1' ]) &&
                fatal "will stop after fetching and not try to merge!
        done
        [ x"$VCSH_CONFLICT" = x'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." 17
+  Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17

        git merge origin/master
        hook post-merge
        hook post-clone
        git merge origin/master
        hook post-merge
        hook post-clone


@@ -244,12 +246,14 @@ get_files() {
 list_tracked() {
        for VCSH_REPO_NAME in $(list); do
                get_files
 list_tracked() {
        for VCSH_REPO_NAME in $(list); do
                get_files

-       done | sort -u
+       done | sed "s,^,$(printf '%s\n' "$VCSH_BASE/" | \
+           sed 's/[,\&]/\\&/g')," | sort -u

 }
 
 list_tracked_by() {
        use
 }
 
 list_tracked_by() {
        use

-       git ls-files | sort -u
+       git ls-files | sed "s,^,$(printf '%s\n' "$VCSH_BASE/" | \
+           sed 's/[,\&]/\\&/g')," | sort -u

 }
 
 pull() {
 }
 
 pull() {


@@ -349,6 +353,7 @@ use() {
 }
 
 which() {
 }
 
 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"
        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"