vcsh: Default to `git ls-files --exclude-standard`

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 2f5026199476026554e6a44bca551d36551863b1..4da3547da71727fd0085e2f2004c437c44003a34 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # This program is licensed under the GNU GPL version 2 or later.
-# (c) Richard "RichiH" Hartmann <richih@debian.org>, 2011-2014
+# (c) Richard "RichiH" Hartmann <richih@debian.org>, 2011-2015
 # For details, see LICENSE. To submit patches, you have to agree to
 # license your code under the GNU GPL version 2 or later.
 
@@ -112,7 +112,8 @@ help() {
    list-tracked \\
         [<repo>]        List all files tracked all or one repositories
    list-untracked \\
-        [<-r>] [<repo>] List all files not tracked by all or one repositories
+        [<-a>] [<-r>]
+        [<repo>]        List all files not tracked by all or one repositories
    pull                 Pull from all vcsh remotes
    push                 Push to vcsh remotes
    rename <repo> \\
@@ -275,10 +276,13 @@ list_untracked() {
        temp_file_untracked_copy=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file'
 
        # Hack in support for `vcsh list-untracked -r`...
+       exclude_standard_opt='--exclude-standard'
        directory_opt="--directory"
        shift 1
-       while getopts "r" flag; do
-               if [ x"$1" = x'-r' ]; then
+       while getopts "ar" flag; do
+               if [ x"$1" = x'-a' ]; then
+                       unset exclude_standard_opt
+               elif [ x"$1" = x'-r' ]; then
                        unset directory_opt
                fi
                shift 1
@@ -301,7 +305,7 @@ list_untracked() {
 
 list_untracked_helper() {
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
-       git ls-files --others "$directory_opt" | (
+       git ls-files --others $exclude_standard_opt "$directory_opt" | (
                while read line; do
                        echo "$line"
                        directory_component=${line%%/*}
@@ -313,7 +317,7 @@ list_untracked_helper() {
                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
+       comm -12 $temp_file_others $temp_file_untracked_copy > $temp_file_untracked
 }
 
 pull() {
@@ -377,7 +381,7 @@ status() {
                for VCSH_REPO_NAME in $(list); do
                        STATUS=$(status_helper $VCSH_REPO_NAME "$COLORING")
                        [ -n "$STATUS" -o -z "$VCSH_STATUS_TERSE" ] && echo "$VCSH_REPO_NAME:"
-                       [ -n "$STATUS" ] && echo "$STATUS"
+                       [ -n "$STATUS" ]            && echo "$STATUS"
                        [ -z "$VCSH_STATUS_TERSE" ] && echo
                done
        fi
@@ -385,6 +389,7 @@ status() {
 
 status_helper() {
        GIT_DIR=$VCSH_REPO_D/$1.git; export GIT_DIR
+       VCSH_GIT_OPTIONS=$2
        use
        remote_tracking_branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2> /dev/null) && {
                commits_behind=$(git log ..${remote_tracking_branch} --oneline | wc -l)
@@ -392,7 +397,7 @@ status_helper() {
                [ ${commits_behind} -ne 0 ] && echo "Behind $remote_tracking_branch by $commits_behind commits"
                [ ${commits_ahead} -ne 0 ] && echo "Ahead of $remote_tracking_branch by $commits_ahead commits"
        }
-       git $2 status --short --untracked-files='no'
+       git ${VCSH_GIT_OPTIONS} status --short --untracked-files='no'
        VCSH_COMMAND_RETURN_CODE=$?
 }
 
@@ -560,8 +565,7 @@ elif [ x"$VCSH_COMMAND" = x'commit' ] ||
        :
 elif [ x"$VCSH_COMMAND" = x'status' ]; then
        if [ x"$2" = x'--terse' ]; then
-               VCSH_STATUS_TERSE=1
-               export VCSH_STATUS_TERSE
+               VCSH_STATUS_TERSE=1; export VCSH_STATUS_TERSE
                shift
        fi
        VCSH_REPO_NAME=$2; export VCSH_REPO_NAME