Make `vcsh seed-gitignore` independent of $PWD

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 7f475fe22b0b2ec256311e11af3e48d0595ac80b..dd05f0ead3cc5aaff22318a9c962a7d9525a6caf 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -6,19 +6,19 @@ SELF=$(basename $0)
 
 [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
 [ -z "$VCSH_BASE" ]       && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
-for check_directory in "$VCSH_BASE"
+for check_directory in "$VCSH_BASE" "$HOME/.gitignore.d"
 do
        if [ ! -d "$check_directory" ]; then
                if [ -e "$check_directory" ]; then
                        echo "$SELF: error: $check_directory exists but is not a directory" >&2
                        exit 2
                else
+                       echo "$SELF: info: attempting to create $check_directory"
                        mkdir -p "$check_directory" || (echo "$SELF: error: could not create $check_directory" >&2; exit 2)
                fi
        fi
 done
 
-
 debug() {
        [ -n "$VCSH_DEBUG" ] && echo "$SELF: debug: $1"
 }
@@ -42,7 +42,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() {
@@ -73,7 +75,10 @@ init() {
                 exit 20) || exit 20
        cd "$GIT_WORK_TREE"
        git init
-       git config core.worktree "$GIT_WORK_TREE"
+       git config core.worktree     "$GIT_WORK_TREE"
+       git config core.excludesfile ".gitignore.d/$REPO_NAME"
+       touch   "$HOME/.gitignore.d/$REPO_NAME"
+       git add "$HOME/.gitignore.d/$REPO_NAME"
        verbose "init() end"
 }
 
@@ -136,6 +141,7 @@ elif [ "$1" = 'clone' ]; then
        git remote add origin "$GIT_REMOTE"
        git config branch.master.remote origin
        git config branch.master.merge  refs/heads/master
+       git config core.excludesfile    ".gitignore.d/$REPO_NAME"
        git fetch
        for object in $(git ls-tree -r origin/master | awk '{print $4}'); do
                [ -e "$object" ] &&
@@ -144,6 +150,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 +158,7 @@ elif [ "$1" = 'clone' ]; then
 
 elif [ "$1" = 'init' ]; then
        verbose "init begin"
-       [ -z $2 ] && help && return 0
+       [ -z $2 ] && help && echo && echo "$SELF $1: error: please specify repository to work on" && return 0
        export REPO_NAME="$2"
        export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
        init
@@ -169,6 +176,32 @@ 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: error: please specify repository to work on" && return 0
+       use "$2"
+       # Switching directory as this has to be executed from $HOME to be of any use.
+       # Going back into old directory at the end in case `vcsh use` is reactivated.
+       old_dir="$PWD"
+       cd "$HOME"
+       git config core.excludesfile ".gitignore.d/$REPO_NAME"
+       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 "$HOME/.gitignore.d/$2" ] &&
+       echo "$SELF: info: $HOME/.gitignore.d/$2 exists, moving it to $HOME/.gitignore.d/$2.bak" &&
+       mv -f "$HOME/.gitignore.d/$2" "$HOME/.gitignore.d/$2.bak"
+       echo '*' > "$HOME/.gitignore.d/$2"
+       for gitignore in $gitignores; do
+               echo "$gitignore" >> "$HOME/.gitignore.d/$2"
+       done
+       cd "$old_dir"
+
 else
        verbose "defaulting to calling help()"
        help