#!/bin/sh
-[ "$VCSH_DEBUG" = '1' ] && set -x
+[ -n "$VCSH_DEBUG" ] && set -x
SELF=$(basename $0)
[ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
-for check_directory in $XDG_CONFIG_HOME $XDG_CONFIG_HOME/vcsh $XDG_CONFIG_HOME/vcsh/repo.d
+[ -z "$VCSH_BASE" ] && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
+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
- mkdir $check_directory || (echo "$SELF: error: could not create $check_directory" >&2; exit 2)
+ 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
-VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
-
debug() {
- [ "$VCSH_DEBUG" = '1' ] && echo "$SELF: debug: $1"
+ [ -n "$VCSH_DEBUG" ] && echo "$SELF: debug: $1"
}
verbose() {
- if [ "$VCSH_DEBUG" = '1' ] || [ "$VCSH_VERBOSE" = '1' ]; then echo "$SELF: verbose: $1"; fi
+ if [ -n "$VCSH_DEBUG" ] || [ -n "$VCSH_VERBOSE" ]; then echo "$SELF: verbose: $1"; fi
}
# use <repo> Use this repository
+#
+# exit Exit vcsh mode" >&2
help() {
echo "usage: $SELF <args>
init <repo> Initialize a new repository
clone <remote> \\
[<repo>] Clone from an existing repository
-
- exit Exit vcsh mode" >&2
+ seed-gitignore \\
+ <repo> Seed .gitignore.d/<repo> from git ls-files" >&2
}
use() {
if [ ! -d "$GIT_DIR" ]; then
echo E: no repository found for "$REPO_NAME" >&2
- return 2
+ return 1
fi
export GIT_DIR
echo "$SELF: fatal: $GIT_DIR exists" &&
return 21
export GIT_WORK_TREE="$HOME"
- mkdir -p $GIT_WORK_TREE
- cd $GIT_WORK_TREE ||
+ mkdir -p "$GIT_WORK_TREE"
+ cd "$GIT_WORK_TREE" ||
(echo "$SELF: fatal: could not enter $GIT_WORK_TREE" &&
exit 20) || exit 20
- cd $GIT_WORK_TREE
+ 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"
}
elif [ "$1" = 'list' ]; then
verbose "list begin"
- for i in $VCSH_BASE/*.git; do
- echo $(basename $i .git)
+ for i in "$VCSH_BASE"/*.git; do
+ echo $(basename "$i" .git)
done
verbose "list end"
exit 0
elif [ "$1" = 'run' ]; then
verbose "run begin"
- use $2
+ use "$2" || return 1
shift 2
"$@"
leave
# zle -N vcsh_exit
# bindkey '^d' 'vcsh_exit'
# fi
-# use $2
+# use "$2" || return 1
# [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
# verbose "use end"
# exit 0
verbose "clone begin"
GIT_REMOTE="$2"
REPO_NAME="$3"
- [ -z "$REPO_NAME" ] && REPO_NAME=$(basename $GIT_REMOTE .git)
+ [ -z "$REPO_NAME" ] && REPO_NAME=$(basename "$GIT_REMOTE" .git)
export REPO_NAME
export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
init
- git remote add origin $GIT_REMOTE
+ 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" ] &&
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
+# use $REPO_NAME || return 1
verbose "clone end"
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
-# vcsh use $REPO_NAME
+# use "$REPO_NAME" || return 1
verbose "init end"
-elif [ "$1" = 'exit' ]; then
- verbose "exit begin"
- if [ -n "$ZSH_VERSION" ] && [ "$VCSH_NO_IGNORE_EOF" = '1' ]; then
- unset VCSH_NO_IGNORE_EOF
- setopt NO_IGNORE_EOF
+#elif [ "$1" = 'exit' ]; then
+# verbose "exit begin"
+# if [ -n "$ZSH_VERSION" ] && [ "$VCSH_NO_IGNORE_EOF" = '1' ]; then
+# unset VCSH_NO_IGNORE_EOF
+# setopt NO_IGNORE_EOF
+# fi
+# leave
+# [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
+# 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 || return 1
+ # 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"
+ 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/^/!/')
+ tempfile=$(mktemp) ||
+ (echo "$SELF: fatal: could not create tempfile" && exit 1)
+ echo '*' > "$tempfile"
+ for gitignore in $gitignores; do
+ echo "$gitignore" >> "$tempfile"
+ done
+ diff -N "$tempfile" "$HOME/.gitignore.d/$2" > /dev/null &&
+ rm -f "$tempfile" &&
+ return
+ if [ -e "$HOME/.gitignore.d/$2" ]; then
+ echo "$SELF: info: $HOME/.gitignore.d/$2 differs from new data, moving it to $HOME/.gitignore.d/$2.bak"
+ mv -f "$HOME/.gitignore.d/$2" "$HOME/.gitignore.d/$2.bak" ||
+ (echo "$SELF: fatal: could not move $HOME/.gitignore.d/$2 to $HOME/.gitignore.d/$2.bak" && exit 1)
fi
- leave
- [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
- verbose "exit end"
- exit 0
+ mv -f "$tempfile" "$HOME/.gitignore.d/$2" ||
+ (echo "$SELF: fatal: could not move $tempfile to $HOME/.gitignore.d/$2" && exit 1)
+ cd "$old_dir"
+ verbose "seed-gitignore end"
else
verbose "defaulting to calling help()"
projects / code / vcsh.git / blobdiff