]>
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
+[ -n "$VCSH_DEBUG" ] && set -x
SELF=$(basename $0)
[ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
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
+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
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)
+ mkdir "$check_directory" || (echo "$SELF: error: could not create $check_directory" >&2; exit 2)
if [ -n "$VCSH_DEBUG" ] || [ -n "$VCSH_VERBOSE" ]; 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>
help() {
echo "usage: $SELF <args>
- use <repo> Use this repository
- run <repo>
- <command> Use this repository
+ run <repo> \\
+ <command> Use this repository
- init Initialize a new repository
- clone <remote>
- [<repo>] Clone from an existing repository
-
- exit Exit vcsh mode" >&2
+ init <repo> Initialize a new repository
+ clone <remote> \\
+ [<repo>] Clone from an existing repository" >&2
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"
[ -e "$GIT_DIR" ] &&
echo "$SELF: fatal: $GIT_DIR exists" &&
return 21
export GIT_WORK_TREE="$HOME"
[ -e "$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
(echo "$SELF: fatal: could not enter $GIT_WORK_TREE" &&
exit 20) || exit 20
- git config core.worktree $GIT_WORK_TREE
- verbose "init() stop "
+ git config core.worktree "$GIT_WORK_TREE"
+ verbose "init() end "
exit $?
elif [ "$1" = 'list' ]; then
exit $?
elif [ "$1" = 'list' ]; then
- verbose "list start "
- for i in $VCSH_BASE /*.git; do
- echo $(basename $i .git)
+ verbose "list begin "
+ for i in "$VCSH_BASE" /*.git; do
+ echo $(basename "$i" .git)
exit 0
elif [ "$1" = 'run' ]; then
exit 0
elif [ "$1" = 'run' ]; then
- verbose "run start "
- use $2
+ verbose "run begin "
+ use "$2"
-elif [ "$1" = 'use' ]; then
- 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
- [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
- verbose "use stop "
- exit 0
+# elif [ "$1" = 'use' ]; then
+# verbose "use begin "
+# 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
+# [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
+# verbose "use end "
+# 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 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 fetch
git config branch.master.remote origin
git config branch.master.merge refs/heads/master
git fetch
echo "$SELF: error: $object exists." &&
VCSH_CONFLICT=1;
done
echo "$SELF: error: $object exists." &&
VCSH_CONFLICT=1;
done
- [ -n "$VCSH_CONFLICT" ] &&
+ [ "$VCSH_CONFLICT" = '1' ] &&
echo "$SELF: fatal: will stop after fetching and not try to merge!\n" &&
exit 3
git merge origin/master
echo "$SELF: fatal: will stop after fetching and not try to merge!\n" &&
exit 3
git merge origin/master
verbose "clone end"
elif [ "$1" = 'init' ]; then
verbose "clone end"
elif [ "$1" = 'init' ]; then
+ verbose "init begin"
+ [ -z $2 ] && help; return 0
export REPO_NAME="$2"
export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
init
export REPO_NAME="$2"
export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
init
- vcsh use $REPO_NAME
- verbose "init stop "
-
-elif [ "$1" = 'exit' ]; 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
- [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
- verbose "exit stop "
- exit 0
+# vcsh use "$REPO_NAME"
+ 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
+# fi
+# leave
+# [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
+# verbose "exit end "
+# exit 0
else
verbose "defaulting to calling help()"
else
verbose "defaulting to calling help()"