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 # This program is licensed under the GNU GPL version 2 or later.
4 # (c) Richard "RichiH" Hartmann <richih@debian.org>, 2011-2013
5 # For details, see LICENSE. To submit patches, you have to agree to
6 # license your code under the GNU GPL version 2 or later.
8 # While the following is not legally binding, the author would like to
9 # explain the choice of GPLv2+ over GPLv3+.
10 # The author prefers GPLv3+ over GPLv2+ but feels it's better to maintain
11 # full compatibility's with Git. In case Git ever changes its licensing terms,
12 # which is admittedly extremely unlikely to the point of being impossible,
13 # this software will most likely follow suit.
15 # This should always be the first line of code to facilitate debugging
16 [ -n "$VCSH_DEBUG" ] && set -vx
19 # Implemented in shell to avoid spawning another process
22 [ -z "$2" ] || file="${file%$2}"
30 echo "$SELF: fatal: $1" >&2
34 # We need to run getops as soon as possible so we catch -d and other
35 # options that will modify our behaviour.
36 # Commands are handled at the end of this script.
37 while getopts "c:dv" flag; do
38 if [ "$1" = '-d' ] || [ "$1" = '--debug' ]; then
43 elif [ "$1" = '-v' ];then
45 echo "verbose mode on"
47 elif [ "$1" = '-c' ];then
48 VCSH_OPTION_CONFIG=$OPTARG
54 # Source file even if it's in $PWD and does not have any slashes in it
62 # Read configuration and set defaults if anything's not set
63 [ -n "$VCSH_DEBUG" ] && set -vx
64 [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
66 # Read configuration files if there are any
67 [ -r "/etc/vcsh/config" ] && . "/etc/vcsh/config"
68 [ -r "$XDG_CONFIG_HOME/vcsh/config" ] && . "$XDG_CONFIG_HOME/vcsh/config"
69 if [ -n "$VCSH_OPTION_CONFIG" ]; then
70 # Source $VCSH_OPTION_CONFIG if it can be read and is in $PWD of $PATH
71 if [ -r "$VCSH_OPTION_CONFIG" ]; then
72 source_all "$VCSH_OPTION_CONFIG"
74 fatal "Can not read configuration file '$VCSH_OPTION_CONFIG'" 1
77 [ -n "$VCSH_DEBUG" ] && set -vx
80 [ -z "$VCSH_REPO_D" ] && VCSH_REPO_D="$XDG_CONFIG_HOME/vcsh/repo.d"
81 [ -z "$VCSH_HOOK_D" ] && VCSH_HOOK_D="$XDG_CONFIG_HOME/vcsh/hooks-enabled"
82 [ -z "$VCSH_BASE" ] && VCSH_BASE="$HOME"
83 [ -z "$VCSH_GITIGNORE" ] && VCSH_GITIGNORE='exact'
87 echo "usage: $SELF <options> <command>
92 -v Enable verbose mode
96 [<repo>] Clone from an existing repository
97 commit Commit in all repositories
98 delete <repo> Delete an existing repository
99 enter <repo> Enter repository; spawn new instance of \$SHELL
100 help Display this help text
101 init <repo> Initialize a new repository
102 list List all repositories
103 list-tracked List all files tracked by vcsh
105 <repo> List files tracked by a repository
106 pull Pull from all vcsh remotes
107 push Push to vcsh remotes
109 <newname> Rename repository
111 <command> Use this repository
112 status [<repo>] Show statuses of all/one vcsh repositories
113 upgrade <repo> Upgrade repository to currently recommended settings
114 version Print version information
115 which <substring> Find substring in name of any tracked file
117 <repo> Write .gitignore.d/<repo> via git ls-files
119 <repo> <git command> Shortcut to run git commands directly
120 <repo> Shortcut to enter repository" >&2
124 [ -n "$VCSH_DEBUG" ] && echo "$SELF: debug: $@"
128 if [ -n "$VCSH_DEBUG" ] || [ -n "$VCSH_VERBOSE" ]; then echo "$SELF: verbose: $@"; fi
132 echo "$SELF: error: $1" >&2
136 echo "$SELF: info: $1"
142 git remote add origin "$GIT_REMOTE"
143 git config branch.master.remote origin
144 git config branch.master.merge refs/heads/master
145 if [ $(git ls-remote origin master 2> /dev/null | wc -l ) -lt 1 ]; then
146 info "remote is empty, not merging anything"
150 for object in $(git ls-tree -r origin/master | awk '{print $4}'); do
152 error "'$object' exists." &&
155 [ "$VCSH_CONFLICT" = '1' ] &&
156 fatal "will stop after fetching and not try to merge!
157 Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning.\n" 17
158 git merge origin/master
161 hook post-clone-retired
166 for VCSH_REPO_NAME in $(list); do
167 echo "$VCSH_REPO_NAME: "
168 export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
170 git commit --untracked-files=no --quiet
177 cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
179 info "This operation WILL DESTROY DATA!"
180 files=$(git ls-files)
181 echo "These files will be deleted:
185 AGAIN, THIS WILL DELETE YOUR DATA!
186 To continue, type 'Yes, do as I say'"
188 [ "x$answer" = 'xYes, do as I say' ] || exit 16
189 for file in $files; do
190 rm -f $file || info "could not delete '$file', continuing with deletion"
192 rm -rf "$GIT_DIR" || error "could not delete '$GIT_DIR'"
203 [ -d "$GIT_DIR" ] || fatal "no repository found for '$VCSH_REPO_NAME'" 12
207 for hook in $VCSH_HOOK_D/$1* $VCSH_HOOK_D/$VCSH_REPO_NAME.$1*; do
208 [ -x "$hook" ] || continue
209 verbose "executing '$hook'"
216 [ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
217 export GIT_WORK_TREE="$VCSH_BASE"
218 mkdir -p "$GIT_WORK_TREE" || fatal "could not create '$GIT_WORK_TREE'" 50
219 cd "$GIT_WORK_TREE" || fatal "could not enter '$GIT_WORK_TREE'" 11
226 for repo in "$VCSH_REPO_D"/*.git; do
227 [ -d "$repo" ] && [ -r "$repo" ] && echo $(basename "$repo" .git)
232 export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
237 for VCSH_REPO_NAME in $(list); do
244 git ls-files | sort -u
249 for VCSH_REPO_NAME in $(list); do
250 echo -n "$VCSH_REPO_NAME: "
251 export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
261 for VCSH_REPO_NAME in $(list); do
262 echo -n "$VCSH_REPO_NAME: "
263 export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
278 [ -d "$GIT_DIR_NEW" ] && fatal "'$GIT_DIR_NEW' exists" 54
279 mv -f "$GIT_DIR" "$GIT_DIR_NEW" || fatal "Could not mv '$GIT_DIR' '$GIT_DIR_NEW'" 52
281 # Now that the repository has been renamed, we need to fix up its configuration
282 # Overwrite old name..
283 GIT_DIR="$GIT_DIR_NEW"
284 $VCSH_REPO_NAME="$VCSH_REPO_NAME_NEW"
285 # ..and clobber all old configuration
297 if [ ! "x$VCSH_REPO_NAME" = "x" ]; then
298 export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
300 git status --short --untracked-files='no'
302 for VCSH_REPO_NAME in $(list); do
303 echo "$VCSH_REPO_NAME:"
304 export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
306 git status --short --untracked-files='no'
315 git config core.worktree "$GIT_WORK_TREE"
316 [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
317 git config vcsh.vcsh 'true'
318 [ -e "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME"
324 export GIT_WORK_TREE="$(git config --get core.worktree)"
325 export VCSH_DIRECTORY="$VCSH_REPO_NAME"
329 for VCSH_REPO_NAME in $(list); do
330 for VCSH_FILE in $(get_files); do
331 echo $VCSH_FILE | grep -q "$VCSH_COMMAND_PARAMETER" && echo "$VCSH_REPO_NAME: $VCSH_FILE"
337 # Don't do anything if the user does not want to write gitignore
338 if [ "x$VCSH_GITIGNORE" = 'xnone' ]; then
339 info "Not writing gitignore as '\$VCSH_GITIGNORE' is set to 'none'"
344 cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
345 gitignores=$(for file in $(git ls-files); do
347 echo $file; new="${file%/*}"
348 [ "$file" = "$new" ] && break
352 tempfile=$(mktemp) || fatal "could not create tempfile" 51
353 echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57
354 for gitignore in $gitignores; do
355 echo "$gitignore" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57
356 if [ "x$VCSH_GITIGNORE" = 'xrecursive' ] && [ -d "$gitignore" ]; then
357 { echo "$gitignore/*" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57; }
360 if diff -N "$tempfile" "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" > /dev/null; then
361 rm -f "$tempfile" || error "could not delete '$tempfile'"
364 if [ -e "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" ]; then
365 info "'$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME' differs from new data, moving it to '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME.bak'"
366 mv -f "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME.bak" ||
367 fatal "could not move '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME' to '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME.bak'" 53
369 mv -f "$tempfile" "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" ||
370 fatal "could not move '$tempfile' to '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME'" 53
373 if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ]; then
374 fatal "'\$VCSH_GITIGNORE' must equal 'exact', 'none', or 'recursive'" 1
377 export VCSH_COMMAND="$1"
379 [ "$VCSH_COMMAND" = 'clon' ] || [ "$VCSH_COMMAND" = 'clo' ] || [ "$VCSH_COMMAND" = 'cl' ] && VCSH_COMMAND='clone'
380 [ "$VCSH_COMMAND" = 'commi' ] || [ "$VCSH_COMMAND" = 'comm' ] || [ "$VCSH_COMMAND" = 'com' ] || [ "$VCSH_COMMAND" = 'co' ] && VCSH_COMMAND='commit'
381 [ "$VCSH_COMMAND" = 'delet' ] || [ "$VCSH_COMMAND" = 'dele' ] || [ "$VCSH_COMMAND" = 'del' ] || [ "$VCSH_COMMAND" = 'de' ] && VCSH_COMMAND='delete'
382 [ "$VCSH_COMMAND" = 'ente' ] || [ "$VCSH_COMMAND" = 'ent' ] || [ "$VCSH_COMMAND" = 'en' ] && VCSH_COMMAND='enter'
383 [ "$VCSH_COMMAND" = 'hel' ] || [ "$VCSH_COMMAND" = 'he' ] && VCSH_COMMAND='help'
384 [ "$VCSH_COMMAND" = 'ini' ] || [ "$VCSH_COMMAND" = 'in' ] && VCSH_COMMAND='init'
385 [ "$VCSH_COMMAND" = 'pul' ] && VCSH_COMMAND='pull'
386 [ "$VCSH_COMMAND" = 'pus' ] && VCSH_COMMAND='push'
387 [ "$VCSH_COMMAND" = 'renam' ] || [ "$VCSH_COMMAND" = 'rena' ] || [ "$VCSH_COMMAND" = 'ren' ] || [ "$VCSH_COMMAND" = 're' ] && VCSH_COMMAND='rename'
388 [ "$VCSH_COMMAND" = 'ru' ] && VCSH_COMMAND='run'
389 [ "$VCSH_COMMAND" = 'statu' ] || [ "$VCSH_COMMAND" = 'stat' ] || [ "$VCSH_COMMAND" = 'sta' ] || [ "$VCSH_COMMAND" = 'st' ] && VCSH_COMMAND='status'
390 [ "$VCSH_COMMAND" = 'upgrad' ] || [ "$VCSH_COMMAND" = 'upgra' ] || [ "$VCSH_COMMAND" = 'upgr' ] || [ "$VCSH_COMMAND" = 'upg' ] && VCSH_COMMAND='upgrade'
391 [ "$VCSH_COMMAND" = 'versio' ] || [ "$VCSH_COMMAND" = 'versi' ] || [ "$VCSH_COMMAND" = 'vers' ] || [ "$VCSH_COMMAND" = 'ver' ] || [ "$VCSH_COMMAND" = 've' ] && VCSH_COMMAND='version'
392 [ "$VCSH_COMMAND" = 'whic' ] || [ "$VCSH_COMMAND" = 'whi' ] || [ "$VCSH_COMMAND" = 'wh' ] && VCSH_COMMAND='which'
393 [ "$VCSH_COMMAND" = 'write' ] || [ "$VCSH_COMMAND" = 'writ' ] || [ "$VCSH_COMMAND" = 'wri' ] || [ "$VCSH_COMMAND" = 'wr' ] && VCSH_COMMAND='write-gitignore'
396 if [ "$VCSH_COMMAND" = 'clone' ]; then
397 [ -z "$2" ] && fatal "$VCSH_COMMAND: please specify a remote" 1
399 [ -n "$3" ] && VCSH_REPO_NAME="$3" || VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git)
400 export VCSH_REPO_NAME
401 export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
402 elif [ "$VCSH_COMMAND" = 'version' ]; then
403 echo "$SELF $VERSION"
405 elif [ "$VCSH_COMMAND" = 'which' ]; then
406 [ -z "$2" ] && fatal "$VCSH_COMMAND: please specify a filename" 1
407 [ -n "$3" ] && fatal "$VCSH_COMMAND: too many parameters" 1
408 export VCSH_COMMAND_PARAMETER="$2"
409 elif [ "$VCSH_COMMAND" = 'delete' ] ||
410 [ "$VCSH_COMMAND" = 'enter' ] ||
411 [ "$VCSH_COMMAND" = 'init' ] ||
412 [ "$VCSH_COMMAND" = 'list-tracked-by' ] ||
413 [ "$VCSH_COMMAND" = 'rename' ] ||
414 [ "$VCSH_COMMAND" = 'run' ] ||
415 [ "$VCSH_COMMAND" = 'upgrade' ] ||
416 [ "$VCSH_COMMAND" = 'write-gitignore' ]; then
417 [ -z $2 ] && fatal "$VCSH_COMMAND: please specify repository to work on" 1
418 [ "$VCSH_COMMAND" = 'rename' -a -z "$3" ] && fatal "$VCSH_COMMAND: please specify a target name" 1
419 [ "$VCSH_COMMAND" = 'run' -a -z "$3" ] && fatal "$VCSH_COMMAND: please specify a command" 1
420 export VCSH_REPO_NAME="$2"
421 export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
422 [ "$VCSH_COMMAND" = 'rename' ] && { export VCSH_REPO_NAME_NEW="$3";
423 export GIT_DIR_NEW="$VCSH_REPO_D/$VCSH_REPO_NAME_NEW.git"; }
424 [ "$VCSH_COMMAND" = 'run' ] && shift 2
425 elif [ "$VCSH_COMMAND" = 'commit' ] ||
426 [ "$VCSH_COMMAND" = 'list' ] ||
427 [ "$VCSH_COMMAND" = 'list-tracked' ] ||
428 [ "$VCSH_COMMAND" = 'pull' ] ||
429 [ "$VCSH_COMMAND" = 'push' ]; then
431 elif [ "$VCSH_COMMAND" = 'status' ]; then
432 export VCSH_REPO_NAME="$2"
433 elif [ -n "$2" ]; then
434 export VCSH_COMMAND='run'
435 export VCSH_REPO_NAME="$1"
436 export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
437 [ -d $GIT_DIR ] || { help; exit 1; }
440 elif [ -n "$VCSH_COMMAND" ]; then
441 export VCSH_COMMAND='enter'
442 export VCSH_REPO_NAME="$1"
443 export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
444 [ -d $GIT_DIR ] || { help; exit 1; }
446 # $1 is empty, or 'help'
450 # Did we receive a directory instead of a name?
451 # Mangle the input to fit normal operation.
452 if echo $VCSH_REPO_NAME | grep -q '/'; then
453 export GIT_DIR=$VCSH_REPO_NAME
454 export VCSH_REPO_NAME=$(basename "$VCSH_REPO_NAME" .git)
459 if [ ! -d "$check_directory" ]; then
460 if [ -e "$check_directory" ]; then
461 fatal "'$check_directory' exists but is not a directory" 13
463 verbose "attempting to create '$check_directory'"
464 mkdir -p "$check_directory" || fatal "could not create '$check_directory'" 50
469 check_dir "$VCSH_REPO_D"
470 [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && check_dir "$VCSH_BASE/.gitignore.d"
472 verbose "$VCSH_COMMAND begin"
473 export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g')
477 verbose "$VCSH_COMMAND end, exiting"