vcsh: list_untracked(): Avoid `cut`; speed up `-r`

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 965f83dd00b7fe0bde3c8a77b1876fba06d9a4d7..1d947d1ae920db1a81e76be3a86bf5a700ff4e25 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:dvr" flag; do
+while getopts "c:dv" 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,8 +40,6 @@ while getopts "c:dvr" 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


@@ -286,25 +284,29 @@ 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
+       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'
 
 
        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"
+       # Hack in support for `vcsh list-untracked -r`
+       directory_opt="--directory"
+       shift 1
+       while getopts "r" flag; do
+               if [ x"$1" = x'-r' ]; then
+                       unset directory_opt
+               fi
+               shift 1
+       done

 
        for VCSH_REPO_NAME in $(list); do
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                git ls-files --others "$directory_opt" | (
                        while read line; do
                                echo "$line"
 
        for VCSH_REPO_NAME in $(list); do
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                git ls-files --others "$directory_opt" | (
                        while read line; do
                                echo "$line"

-                               directory_component="$(echo "$line" | cut -d'/' -f1)"
+                               directory_component=${line%%/*}

                                [ -d "$directory_component" ] && printf '%s/\n' "$directory_component"
                        done
                        ) | sort -u > $temp_file_others
                                [ -d "$directory_component" ] && printf '%s/\n' "$directory_component"
                        done
                        ) | sort -u > $temp_file_others