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.
3 [ -n "$VCSH_DEBUG" ] && set -x
4 [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
5 [ -z "$VCSH_BASE" ] && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
10 echo "usage: $SELF <args>
13 [<repo>] Clone from an existing repository
14 help Display this help text
15 delete Delete an existing repository
16 enter Enter repository; spawn new $SHELL
17 init <repo> Initialize a new repository
18 list List all repositories
20 <newname> Rename repository
22 <command> Use this repository
25 <repo> Seed .gitignore.d/<repo> from git ls-files
26 setup Set up repository with recommended settings
28 <repo> <git command> Special command that allows you to run git commands
29 directly without having to type so much ;)" >&2
33 [ -n "$VCSH_DEBUG" ] && echo "$SELF: debug: $@"
37 if [ -n "$VCSH_DEBUG" ] || [ -n "$VCSH_VERBOSE" ]; then echo "$SELF: verbose: $@"; fi
41 echo "$SELF: fatal: $1" >&2
46 echo "$SELF: error: $1" >&2
50 echo "$SELF: info: $1"
55 git remote add origin "$GIT_REMOTE"
56 git config branch.master.remote origin
57 git config branch.master.merge refs/heads/master
59 for object in $(git ls-tree -r origin/master | awk '{print $4}'); do
61 error "'$object' exists." &&
64 [ "$VCSH_CONFLICT" = '1' ] &&
65 fatal "will stop after fetching and not try to merge!
66 Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning.\n" 17
67 git merge origin/master
74 info "This operation WILL DETROY DATA!"
76 echo "These files will be deleted:
80 AGAIN, THIS WILL DELETE YOUR DATA!
81 To continue, type \"Yes, do as I say\""
83 [ "x$answer" = "xYes, do as I say" ] || exit 16
84 for file in $files; do
85 rm -f $file || info "could not delete '$file', continuing with deletion"
87 rmdir "$GIT_DIR" || info "could not delete '$GIT_DIR'"
97 [ -d "$GIT_DIR" ] || fatal "no repository found for '$VCSH_REPO_NAME'" 12
101 [ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
102 export GIT_WORK_TREE="$HOME"
103 mkdir -p "$GIT_WORK_TREE"
104 cd "$GIT_WORK_TREE" || fatal "could not enter '$GIT_WORK_TREE'" 11
110 for i in "$VCSH_BASE"/*.git; do
111 echo $(basename "$i" .git)
117 [ -d "$GIT_DIR_NEW" ] && fatal "'$GIT_DIR_NEW' exists" 54
118 mv -f "$GIT_DIR" "$GIT_DIR_NEW" || fatal "Could not mv '$GIT_DIR' '$GIT_DIR_NEW'" 52
124 $VCSH_EXTERNAL_COMMAND
130 gitignores=$(for file in $(git ls-files); do
132 echo $file; new="${file%/*}"
133 [ "$file" = "$new" ] && break
137 tempfile=$(mktemp) || fatal "could not create tempfile" 51
138 echo '*' > "$tempfile"
139 for gitignore in $gitignores; do
140 echo "$gitignore" | sed 's/^/!/' >> "$tempfile"
141 [ -d "$gitignore" ] && echo "$gitignore/*" | sed 's/^/!/'>> "$tempfile"
143 diff -N "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" > /dev/null &&
146 if [ -e "$HOME/.gitignore.d/$VCSH_REPO_NAME" ]; then
147 info "'$HOME/.gitignore.d/$VCSH_REPO_NAME' differs from new data, moving it to '$HOME/.gitignore.d/$VCSH_REPO_NAME.bak'"
148 mv -f "$HOME/.gitignore.d/$VCSH_REPO_NAME" "$HOME/.gitignore.d/$VCSH_REPO_NAME.bak" ||
149 fatal "could not move '$HOME/.gitignore.d/$VCSH_REPO_NAME' to '$HOME/.gitignore.d/$VCSH_REPO_NAME.bak'" 53
151 mv -f "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" ||
152 fatal "could not move '$tempfile' to '$HOME/.gitignore.d/$VCSH_REPO_NAME'" 53
157 git config core.worktree "$GIT_WORK_TREE"
158 git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
159 git config vcsh.vcsh 'true'
160 touch "$HOME/.gitignore.d/$VCSH_REPO_NAME"
161 git add "$HOME/.gitignore.d/$VCSH_REPO_NAME"
166 export GIT_WORK_TREE="$(git config --get core.worktree)"
167 export VCSH_DIRECTORY="$VCSH_REPO_NAME"
170 if [ "$1" = 'clone' ]; then
171 [ -z $2 ] && fatal "$1: please specify a remote" 1
172 export VCSH_COMMAND="$1"
174 [ -n "$3" ] && VCSH_REPO_NAME="$3" || VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git)
175 export VCSH_REPO_NAME
176 export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git"
177 elif [ "$1" = 'delete' ] ||
178 [ "$1" = 'enter' ] ||
180 [ "$1" = 'rename' ] ||
182 [ "$1" = 'seed-gitignore' ] ||
183 [ "$1" = 'setup' ]; then
184 [ -z $2 ] && fatal "$1: please specify repository to work on" 1
185 [ "$1" = 'rename' -a -z "$3" ] && fatal "$1: please specify a target name" 1
186 [ "$1" = 'run' -a -z "$3" ] && fatal "$1: please specify a command" 1
187 export VCSH_COMMAND="$1"
188 export VCSH_REPO_NAME="$2"
189 export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git"
190 [ "$VCSH_COMMAND" = 'rename' ] && export GIT_DIR_NEW="$VCSH_BASE/$3.git"
191 [ "$VCSH_COMMAND" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$@"
192 [ "$VCSH_COMMAND" = 'seed-gitignore' ] && export VCSH_COMMAND='seed_gitignore'
193 elif [ "$1" = 'list' ]; then
194 export VCSH_COMMAND="$1"
195 elif [ -n "$1" ]; then
196 export VCSH_COMMAND=run
197 export VCSH_REPO_NAME="$1"
198 export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git"
199 [ -d $GIT_DIR ] || { help; exit 1; }
201 export VCSH_EXTERNAL_COMMAND="git $*"
203 # $1 is empty, or 'help'
207 for check_directory in "$VCSH_BASE" "$HOME/.gitignore.d"
209 if [ ! -d "$check_directory" ]; then
210 if [ -e "$check_directory" ]; then
211 fatal "'$check_directory' exists but is not a directory" 13
213 info "attempting to create '$check_directory'"
214 mkdir -p "$check_directory" || fatal "could not create '$check_directory'" 50
219 verbose "$VCSH_COMMAND begin"
221 verbose "$VCSH_COMMAND end, exiting"