X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/a0a5e21206fb737a14ed7e37616bbfede1a64df8..93afbd50ff6dc47b9a36d0ddf87d0aaa60084f5a:/vcsh

diff --git a/vcsh b/vcsh
index 550c36f..b0ffb64 100755
--- a/vcsh
+++ b/vcsh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ -n "$VCSH_DEBUG" ]      && set -x
+[ -n "$VCSH_DEBUG" ]      && set -vx
 [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
 [ -z "$VCSH_BASE" ]       && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
 
@@ -110,17 +110,21 @@ list() {
 	done
 }
 
-#get_files() {
-#	return $(git ls-files)
-#}
-#
-#list_tracked_all() {
-#	use
-#	for repo in $(list); do
-#		files="$files $(get_files $repo)"
-#	done
-#	echo $files | sort -u
-#}
+get_files() {
+	export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git"
+	git ls-files
+}
+
+list_tracked() {
+	for VCSH_REPO_NAME in $(list); do
+		get_files
+	done | sort -u
+}
+
+list_tracked_by() {
+	use
+	git ls-files | sort -u
+}
 
 rename() {
 	git_dir_exists
@@ -168,8 +172,7 @@ setup() {
 	git config core.worktree     "$GIT_WORK_TREE"
 	git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
 	git config vcsh.vcsh         'true'
-	touch   "$HOME/.gitignore.d/$VCSH_REPO_NAME" || error "could not touch '$HOME/.gitignore.d/$VCSH_REPO_NAME'"
-	git add "$HOME/.gitignore.d/$VCSH_REPO_NAME"
+	[ -e "$HOME/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$HOME/.gitignore.d/$VCSH_REPO_NAME"
 }
 
 use() {
@@ -188,7 +191,7 @@ if [ "$1" = 'clone' ]; then
 elif [ "$1" = 'delete' ] ||
      [ "$1" = 'enter' ] ||
      [ "$1" = 'init' ] ||
-     [ "$1" = 'list-tracked-all' ] ||
+     [ "$1" = 'list-tracked-by' ] ||
      [ "$1" = 'rename' ] ||
      [ "$1" = 'run' ] ||
      [ "$1" = 'seed-gitignore' ] ||
@@ -202,8 +205,8 @@ elif [ "$1" = 'delete' ] ||
 	[ "$VCSH_COMMAND" = 'rename' ]         && export GIT_DIR_NEW="$VCSH_BASE/$3.git"
 	[ "$VCSH_COMMAND" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$*"
 	[ "$VCSH_COMMAND" = 'seed-gitignore' ]
-#	[ "$VCSH_COMMAND" = 'seed-gitignore' ] && export VCSH_COMMAND='seed_gitignore'
-elif [ "$1" = 'list' ]; then
+elif [ "$1" = 'list' ] ||
+     [ "$1" = 'list-tracked' ]; then
 	export VCSH_COMMAND="$1"
 elif [ -n "$1" ]; then
 	export VCSH_COMMAND=run