X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/099b25a8a6b0950a6694672094ac2c0f89b0d1cb..09eef208e8d62408b0b7a1fd5d4cb04715b49358:/vcsh?ds=inline diff --git a/vcsh b/vcsh index 83bb267..a19aceb 100755 --- 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:dvr" flag; do +while getopts "c:dv" flag; do 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" - elif [ x"$1" = x'-r' ]; then - VCSH_OPTION_RECURSIVE=1 elif [ x"$1" = x'-c' ]; then VCSH_OPTION_CONFIG=$OPTARG fi @@ -111,6 +109,7 @@ help() { list-tracked List all files tracked by vcsh list-tracked-by \\ List files tracked by a repository + list-untracked List all files not tracked by vcsh pull Pull from all vcsh remotes push Push to vcsh remotes rename \\ @@ -293,14 +292,22 @@ list_untracked() { 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" - directory_component="$(echo "$line" | cut -d'/' -f1)" + directory_component=${line%%/*} [ -d "$directory_component" ] && printf '%s/\n' "$directory_component" done ) | sort -u > $temp_file_others