]>
git.madduck.net Git - code/vcsh.git/blobdiff - vcsh
madduck's git repository
Every one of the projects in this repository is available at the canonical
URL git://git.madduck.net/madduck/pub/<projectpath> — see
each project's metadata for the exact URL.
All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@ git. madduck. net .
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
SSH access, as well as push access can be individually
arranged .
If you use my repositories frequently, consider adding the following
snippet to ~/.gitconfig and using the third clone URL listed for each
project:
[url "git://git.madduck.net/madduck/"]
insteadOf = madduck:
+[ "$VCSH_DEBUG" -gt 0 ] && set -x
-[ -z $XDG_CONFIG_HOME ] && XDG_CONFIG_HOME="$HOME/.config"
+
+[ -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
+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)
+ fi
+ fi
+done
+
VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
+debug() {
+ [ -n "$VCSH_DEBUG" ] && echo "$SELF: debug: $1"
+}
+
+verbose() {
+ if [ -n "$VCSH_DEBUG" ] || [ -n "$VCSH_VERBOSE" ]; then echo "$SELF: verbose: $1"; fi
+}
+
help() {
echo "usage: $SELF <args>
help() {
echo "usage: $SELF <args>
REPO_NAME="$1"
GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
REPO_NAME="$1"
GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
export GIT_DIR
export GIT_WORK_TREE="$(git config --get core.worktree)"
export VCSH_DIRECTORY="$REPO_NAME"
export GIT_DIR
export GIT_WORK_TREE="$(git config --get core.worktree)"
export VCSH_DIRECTORY="$REPO_NAME"
+ verbose "init() start"
+ [ -e "$GIT_DIR" ] &&
echo "$SELF: fatal: $GIT_DIR exists" &&
return 21
export GIT_WORK_TREE="$HOME"
echo "$SELF: fatal: $GIT_DIR exists" &&
return 21
export GIT_WORK_TREE="$HOME"
cd $GIT_WORK_TREE
git init
git config core.worktree $GIT_WORK_TREE
cd $GIT_WORK_TREE
git init
git config core.worktree $GIT_WORK_TREE
-if [ "$1" = 'help' ] || [ $# -eq 0 ]; then
+if [ "$1" = 'help' ] || [ "$#" -eq 0 ]; then
elif [ "$1" = 'list' ]; then
elif [ "$1" = 'list' ]; then
for i in $VCSH_BASE/*.git; do
echo $(basename $i .git)
done
for i in $VCSH_BASE/*.git; do
echo $(basename $i .git)
done
+ verbose "list stop"
+ exit 0
elif [ "$1" = 'run' ]; then
elif [ "$1" = 'run' ]; then
use $2
shift 2
"$@"
leave
use $2
shift 2
"$@"
leave
+ verbose "run start"
+ exit 0
elif [ "$1" = 'use' ]; then
elif [ "$1" = 'use' ]; then
- if [[ -o NO_IGNORE_EOF ]]; then
- export VCSH_NO_IGNORE_EOF=1
- setopt IGNORE_EOF
- vcsh_exit() {vcsh exit; zle reset-prompt;}
+ verbose "use start"
+ if [ -n "$ZSH_VERSION" ]; then
+ if [ -o NO_IGNORE_EOF ]; then
+ export VCSH_NO_IGNORE_EOF=1
+ setopt IGNORE_EOF
+ fi
+ vcsh_exit() {
+ vcsh exit;
+ zle reset-prompt;
+ }
zle -N vcsh_exit
bindkey '^d' 'vcsh_exit'
fi
use $2
zle -N vcsh_exit
bindkey '^d' 'vcsh_exit'
fi
use $2
+ [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
+ verbose "use stop"
+ exit 0
elif [ "$1" = 'clone' ]; then
elif [ "$1" = 'clone' ]; then
GIT_REMOTE="$2"
REPO_NAME="$3"
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
export REPO_NAME
export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
init
git config branch.master.remote origin
git config branch.master.merge refs/heads/master
git fetch
git config branch.master.remote origin
git config branch.master.merge refs/heads/master
git fetch
- for i in $(git ls-tree -r origin/master | awk '{print $4}'); do
- [[ -e $i ] ] &&
- echo "$SELF: error: $i exists." &&
- CONFLICT=1;
+ for object in $(git ls-tree -r origin/master | awk '{print $4}'); do
+ [ -e "$object" ] &&
+ echo "$SELF: error: $object exists." &&
+ VCSH_ CONFLICT=1;
+ [ -n "$VCSH_CONFLICT" ] &&
echo "$SELF: fatal: will stop after fetching and not try to merge!\n" &&
exit 3
git merge origin/master
vcsh use $REPO_NAME
echo "$SELF: fatal: will stop after fetching and not try to merge!\n" &&
exit 3
git merge origin/master
vcsh use $REPO_NAME
elif [ "$1" = 'init' ]; then
elif [ "$1" = 'init' ]; then
export REPO_NAME="$2"
export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
init
vcsh use $REPO_NAME
export REPO_NAME="$2"
export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
init
vcsh use $REPO_NAME
elif [ "$1" = 'exit' ]; then
elif [ "$1" = 'exit' ]; then
- if [[ $VCSH_NO_IGNORE_EOF -gt 0 ]]; then
+ verbose "exit start"
+ if [ -n "$ZSH_VERSION" ] && [ -n "$VCSH_NO_IGNORE_EOF" ]; then
unset VCSH_NO_IGNORE_EOF
setopt NO_IGNORE_EOF
fi
leave
unset VCSH_NO_IGNORE_EOF
setopt NO_IGNORE_EOF
fi
leave
+ [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
+ verbose "exit stop"
+ exit 0
+ verbose "defaulting to calling help()"