Replace temporary repository with copy based method

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 7004cdff6904a3068c9e6b842fe6b915d07a3ad9..3642ad5ec8b5ec15c7583a67b62a5b8e54537e8c 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -30,7 +30,7 @@ fatal() {
 # We need to run getops as soon as possible so we catch -d and other
 # options that will modify our behaviour.
 # Commands are handled at the end of this script.
 # We need to run getops as soon as possible so we catch -d and other
 # options that will modify our behaviour.
 # Commands are handled at the end of this script.

-while getopts "c:dv" flag; do
+while getopts "c:dvr" flag; do

        if [ x"$1" = x'-d' ] || [ x"$1" = x'--debug' ]; then
                set -vx
                VCSH_DEBUG=1
        if [ x"$1" = x'-d' ] || [ x"$1" = x'--debug' ]; then
                set -vx
                VCSH_DEBUG=1


@@ -40,6 +40,8 @@ while getopts "c:dv" flag; do
                VCSH_VERBOSE=1
                echo "verbose mode on"
                echo "$SELF $VERSION"
                VCSH_VERBOSE=1
                echo "verbose mode on"
                echo "$SELF $VERSION"

+       elif [ x"$1" = x'-r' ]; then
+               VCSH_OPTION_RECURSIVE=1

        elif [ x"$1" = x'-c' ]; then
                VCSH_OPTION_CONFIG=$OPTARG
        fi
        elif [ x"$1" = x'-c' ]; then
                VCSH_OPTION_CONFIG=$OPTARG
        fi


@@ -284,19 +286,39 @@ retire() {
        unset VCSH_DIRECTORY
 }
 
        unset VCSH_DIRECTORY
 }
 

+command_exists() {
+       command -v "$1" >/dev/null 2>&1 || fatal "Could not find '$1' command"
+}
+

 list_untracked() {
 list_untracked() {

+       command_exists comm
+

        temp_file_others=$(mktemp) || fatal 'Could not create temp file'
        temp_file_untracked=$(mktemp) || fatal 'Could not create temp file'
        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'
+
+       [ -z "$VCSH_OPTION_RECURSIVE" ] && directory_opt="--directory"
+

        for VCSH_REPO_NAME in $(list); do
        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"
                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; }
+               git ls-files --others "$directory_opt" | (
+                       while read line; do
+                               echo "$line"
+                               directory_component="$(echo "$line" | cut -d'/' -f1)"
+                               [ -d "$directory_component" ] && printf '%s/\n' "$directory_component"
+                       done
+                       ) | sort -u > $temp_file_others
+               if [ -z "$ran_once" ]; then
+                       ran_once=1
+                       cp $temp_file_others $temp_file_untracked || fatal 'Could not copy temp file'
+               fi
+               cp $temp_file_untracked $temp_file_untracked_copy || fatal 'Could not copy temp file'
+               comm -12 --nocheck-order $temp_file_others $temp_file_untracked_copy > $temp_file_untracked

        done
        cat $temp_file_untracked
        done
        cat $temp_file_untracked

-       rm $temp_file_others $temp_file_untracked || fatal 'Could not delete temp file'
+       
+       unset directory_opt directory_component
+       rm -f $temp_file_others $temp_file_untracked $temp_file_untracked_copy || fatal 'Could not delete temp files'

 }
 
 rename() {
 }
 
 rename() {