X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/db003b308f1a48a23ff60971045f956aa197c1d1..d3b04ac4495a6fe1676aa0f2f6b60a93fd6324e1:/vcsh?ds=sidebyside

diff --git a/vcsh b/vcsh
index f1c1017..e4f6f33 100755
--- a/vcsh
+++ b/vcsh
@@ -19,7 +19,7 @@
 # If '.git-HEAD' is appended to the version, you are seeing an unreleased
 # version of vcsh; the master branch is supposed to be clean at all times
 # so you can most likely just use it nonetheless
-VERSION='1.20140507'
+VERSION='1.20141009'
 SELF=$(basename $0)
 
 fatal() {
@@ -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
@@ -161,7 +163,7 @@ clone() {
 	done
 	[ x"$VCSH_CONFLICT" = x'1' ]) &&
 		fatal "will stop after fetching and not try to merge!
-  Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning." 17
+  Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17
 	git merge origin/master
 	hook post-merge
 	hook post-clone
@@ -244,12 +246,14 @@ get_files() {
 list_tracked() {
 	for VCSH_REPO_NAME in $(list); do
 		get_files
-	done | sort -u
+	done | sed "s,^,$(printf '%s\n' "$VCSH_BASE/" | \
+	    sed 's/[,\&]/\\&/g')," | sort -u
 }
 
 list_tracked_by() {
 	use
-	git ls-files | sort -u
+	git ls-files | sed "s,^,$(printf '%s\n' "$VCSH_BASE/" | \
+	    sed 's/[,\&]/\\&/g')," | sort -u
 }
 
 pull() {
@@ -282,6 +286,50 @@ retire() {
 	unset VCSH_DIRECTORY
 }
 
+command_exists() {
+	command -v "$1" >/dev/null 2>&1 || fatal "Could not find '$1' command"
+}
+
+list_untracked() {
+	command_exists comm
+
+	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) || fatal 'Could not create temp repo'
+
+	cd $temp_repo || fatal 'Could not cd into temp repo'
+	git init -q
+	mktemp -q -p $(pwd) > /dev/null || fatal 'Could not create dummy file'
+	git add .
+	git commit -q -m "dummy"
+	cd - > /dev/null 2>&1 || fatal 'Could not cd back'
+
+	[ -z "$VCSH_OPTION_RECURSIVE" ] && directory_opt="--directory"
+
+	export GIT_DIR=$temp_repo/.git
+	git ls-files --others "$directory_opt" | sort -u > $temp_file_untracked
+
+	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"
+				printf '%s/\n' "$(echo "$line" | cut -d'/' -f1)"
+			done
+			) | sort -u > $temp_file_others
+		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
+	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() {
 	git_dir_exists
 	[ -d "$GIT_DIR_NEW" ] && fatal "'$GIT_DIR_NEW' exists" 54
@@ -461,6 +509,7 @@ elif [ x"$VCSH_COMMAND" = x'delete' ]           ||
 elif [ x"$VCSH_COMMAND" = x'commit' ] ||
      [ x"$VCSH_COMMAND" = x'list'   ] ||
      [ x"$VCSH_COMMAND" = x'list-tracked' ] ||
+     [ x"$VCSH_COMMAND" = x'list-untracked' ] ||
      [ x"$VCSH_COMMAND" = x'pull'   ] ||
      [ x"$VCSH_COMMAND" = x'push'   ]; then
 	: