3rd try

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 18cd9e542097cbc006e9287e5730b130bc10e2a3..b10d80956395ea61a11f19c539349bcc95e46998 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -19,7 +19,7 @@
 # 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() {
@@ -161,7 +161,7 @@ clone() {
        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
@@ -244,18 +244,20 @@ 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
-       git ls-files | sort -u
+       git ls-files | sed "s,^,$(printf '%s\n' "$VCSH_BASE/" | \
+           sed 's/[,\&]/\\&/g')," | sort -u
 }
 
 pull() {
        hook pre-pull
        for VCSH_REPO_NAME in $(list); do
-               printf "$VCSH_REPO_NAME: "
+               printf '%s: ' "$VCSH_REPO_NAME"
                GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
                use
                git pull
@@ -268,7 +270,7 @@ pull() {
 push() {
        hook pre-push
        for VCSH_REPO_NAME in $(list); do
-               printf "$VCSH_REPO_NAME: "
+               printf '%s: ' "$VCSH_REPO_NAME"
                GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
                use
                git push
@@ -282,6 +284,39 @@ retire() {
        unset VCSH_DIRECTORY
 }
 
+list_untracked() {
+       temp_file_others=$(mktemp) || fatal 'Could not create temp file'
+       temp_file_untracked=$(mktemp) || fatal 'Could not create temp file'
+       temp_file_untracked_copy=$(mktemp) || fatal 'Could not create temp file'
+       
+       # create dummy git repo
+       temp_repo=$(mktemp -d)
+       (
+       cd $temp_repo
+       git init -q
+       mktemp -p $(pwd) > /dev/null
+       git add .
+       git commit -q -m "dummy"
+       )
+       
+       export GIT_DIR=$temp_repo/.git
+       git ls-files --others --directory | sort -u > $temp_file_untracked
+       
+       for VCSH_REPO_NAME in $(list); do
+               export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
+               git ls-files --others --directory | (
+                       while read line; do
+                               echo "$line"
+                               printf '%s/\n' "$(echo "$line" | cut -d'/' -f1)"
+                       done
+                       ) | sort -u > $temp_file_others
+               cp $temp_file_untracked $temp_file_untracked_copy
+               comm -12 --nocheck-order $temp_file_others $temp_file_untracked_copy > $temp_file_untracked
+       done
+       cat $temp_file_untracked
+       rm -r $temp_file_others $temp_file_untracked $temp_file_untracked_copy $temp_repo || fatal 'Could not delete temp file'
+}
+
 rename() {
        git_dir_exists
        [ -d "$GIT_DIR_NEW" ] && fatal "'$GIT_DIR_NEW' exists" 54
@@ -461,6 +496,7 @@ elif [ x"$VCSH_COMMAND" = x'delete' ]           ||
 elif [ x"$VCSH_COMMAND" = x'commit' ] ||
      [ x"$VCSH_COMMAND" = x'list'   ] ||
      [ x"$VCSH_COMMAND" = x'list-tracked' ] ||
+     [ x"$VCSH_COMMAND" = x'list-untracked' ] ||
      [ x"$VCSH_COMMAND" = x'pull'   ] ||
      [ x"$VCSH_COMMAND" = x'push'   ]; then
        :