X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/b4078210a72a210c5a505b8d34ad4eb249fe735e..09eef208e8d62408b0b7a1fd5d4cb04715b49358:/vcsh?ds=sidebyside

diff --git a/vcsh b/vcsh
index fb1c091..a19aceb 100755
--- a/vcsh
+++ b/vcsh
@@ -109,6 +109,7 @@ help() {
    list-tracked         List all files tracked by vcsh
    list-tracked-by \\
         <repo>          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 <repo> \\
@@ -285,37 +286,42 @@ 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'
+
+	# 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 | (
+		git ls-files --others "$directory_opt" | (
 			while read line; do
 				echo "$line"
-				printf '%s/\n' "$(echo "$line" | cut -d'/' -f1)"
+				directory_component=${line%%/*}
+				[ -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() {