Introduce seed-gitignore to, well, seed gitignore..

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 7f475fe22b0b2ec256311e11af3e48d0595ac80b..18288805d4e7c94b99d1bee21d095556d75d034e 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -18,7 +18,6 @@ do
        fi
 done
 
-
 debug() {
        [ -n "$VCSH_DEBUG" ] && echo "$SELF: debug: $1"
 }
@@ -42,7 +41,9 @@ help() {
 
    init <repo>       Initialize a new repository
    clone <remote> \\
-         [<repo>]    Clone from an existing repository" >&2
+         [<repo>]    Clone from an existing repository
+   seed-gitignore \\
+   <repo>            Seed .gitignore.d/<repo> from git ls-files" >&2
 }
 
 use() {
@@ -144,6 +145,7 @@ elif [ "$1" = 'clone' ]; then
        done
        [ "$VCSH_CONFLICT" = '1' ] &&
                echo "$SELF: fatal: will stop after fetching and not try to merge!\n" &&
+               echo "  Once this situation has been resolved, run 'vcsh run <foo> git pull' to finish cloning.\n" &&
                exit 3
        git merge origin/master
 #      vcsh use $REPO_NAME
@@ -151,7 +153,7 @@ elif [ "$1" = 'clone' ]; then
 
 elif [ "$1" = 'init' ]; then
        verbose "init begin"
-       [ -z $2 ] && help && return 0
+       [ -z $2 ] && help && echo && echo "$SELF $1: please specify repository to work on" && return 0
        export REPO_NAME="$2"
        export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
        init
@@ -169,6 +171,26 @@ elif [ "$1" = 'init' ]; then
 #      verbose "exit end"
 #      exit 0
 
+elif [ "$1" = 'seed-gitignore' ]; then
+       verbose "seed-gitignore begin"
+       [ -z $2 ] && help && echo && echo "$SELF $1: please specify repository to work on" && return 0
+       use "$2"
+       files=$(git ls-files)
+       gitignores=$(for file in $(git ls-files); do
+               while true; do
+                       echo $file; new="${file%/*}"
+                       [ "$file" = "$new" ] && break
+                       file="$new"
+               done;
+       done | sort -u | sed 's/^/!/')
+       [ -e .gitignore.d/$2 ] &&
+       echo "$SELF: .gitignore.d/$2 exists, moving it to .gitignore.d/$2.bak" &&
+       mv -f .gitignore.d/$2 .gitignore.d/$2.bak
+       echo '*' > .gitignore.d/$2
+       for gitignore in $gitignores; do
+               echo $gitignore >> .gitignore.d/$2
+       done
+
 else
        verbose "defaulting to calling help()"
        help