vcsh: Remove extra function

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index fb1c091879fbb3e05ccac0e597ac06046e617fd2..83bb2676c92809550e228a1975f5e529cb9847c1 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.
-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
@@ -40,6 +40,8 @@ while getopts "c:dv" flag; do
                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
@@ -285,37 +287,34 @@ retire() {
 }
 
 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
-       
+       command -v 'comm' >/dev/null 2>&1 || fatal "Could not find 'comm'"
+
+       temp_file_others=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file'
+       temp_file_untracked=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file'
+       temp_file_untracked_copy=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file'
+
+       [ -z "$VCSH_OPTION_RECURSIVE" ] && directory_opt="--directory"
+
        for VCSH_REPO_NAME in $(list); do
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
-               git ls-files --others --directory | (
+               git ls-files --others "$directory_opt" | (
                        while read line; do
                                echo "$line"
-                               printf '%s/\n' "$(echo "$line" | cut -d'/' -f1)"
+                               directory_component="$(echo "$line" | cut -d'/' -f1)"
+                               [ -d "$directory_component" ] && printf '%s/\n' "$directory_component"
                        done
                        ) | sort -u > $temp_file_others
-               cp $temp_file_untracked $temp_file_untracked_copy
+               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
+
+       unset directory_opt directory_component
        rm -f $temp_file_others $temp_file_untracked $temp_file_untracked_copy || fatal 'Could not delete temp files'
-       rm -rf $temp_repo || fatal 'Could not delete temp repo'
 }
 
 rename() {