test commit; rewrite to use comm and two temp files to get around argument too long...

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index f1c101745a70e1cbcc62604453b2b6faa6a27e86..7004cdff6904a3068c9e6b842fe6b915d07a3ad9 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
 # 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.20140507'
+VERSION='1.20141009'

 SELF=$(basename $0)
 
 fatal() {
 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!
        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 +244,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() {


@@ -282,6 +284,21 @@ retire() {
        unset VCSH_DIRECTORY
 }
 
        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'
+       for VCSH_REPO_NAME in $(list); do
+               [ -n $ran_once ] && foo="$(comm -12 --nocheck-order $temp_file_others $temp_file_untracked)"
+               echo "$foo" > $temp_file_untracked
+#              [ -n $ran_once ] && files_untracked=$(printf '%s\n' "$files_untracked" | grep -Fx "$files_other")
+               export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
+               git ls-files --others | sort -u > $temp_file_others
+               [ -z "$ran_once" ] && { ran_once=1; cp $temp_file_others $temp_file_untracked; }
+       done
+       cat $temp_file_untracked
+       rm $temp_file_others $temp_file_untracked || fatal 'Could not delete temp file'
+}
+

 rename() {
        git_dir_exists
        [ -d "$GIT_DIR_NEW" ] && fatal "'$GIT_DIR_NEW' exists" 54
 rename() {
        git_dir_exists
        [ -d "$GIT_DIR_NEW" ] && fatal "'$GIT_DIR_NEW' exists" 54


@@ -461,6 +478,7 @@ elif [ x"$VCSH_COMMAND" = x'delete' ]           ||
 elif [ x"$VCSH_COMMAND" = x'commit' ] ||
      [ x"$VCSH_COMMAND" = x'list'   ] ||
      [ x"$VCSH_COMMAND" = x'list-tracked' ] ||
 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
        :
      [ x"$VCSH_COMMAND" = x'pull'   ] ||
      [ x"$VCSH_COMMAND" = x'push'   ]; then
        :