#!/bin/sh
# This program is licensed under the GNU GPL version 2 or later.
-# (c) Richard "RichiH" Hartmann <richih@debian.org>, 2011-2014
+# (c) Richard "RichiH" Hartmann <richih@debian.org>, 2011-2015
# For details, see LICENSE. To submit patches, you have to agree to
# license your code under the GNU GPL version 2 or later.
commit Commit in all repositories
delete <repo> Delete an existing repository
enter <repo> Enter repository; spawn new instance of \$SHELL
+ foreach [<-g>]
+ <git command> Execute a command for every repository
help Display this help text
init <repo> Initialize a new repository
list List all repositories
list-tracked \\
[<repo>] List all files tracked all or one repositories
list-untracked \\
- [<-r>] [<repo>] List all files not tracked by all or one repositories
+ [<-a>] [<-r>]
+ [<repo>] List all files not tracked by all or one repositories
pull Pull from all vcsh remotes
push Push to vcsh remotes
rename <repo> \\
<newname> Rename repository
run <repo> \\
<command> Use this repository
- status [<repo>] Show statuses of all/one vcsh repositories
+ status \\
+ [--terse] [<repo>] Show statuses of all/one vcsh repositories
upgrade <repo> Upgrade repository to currently recommended settings
version Print version information
which <substring> Find substring in name of any tracked file
You should add files to your new repository."
exit
fi
- git fetch origin "$VCSH_BRANCH"
+ GIT_VERSION_MAJOR=$(git --version | sed -n 's/.* \([0-9]\)\..*/\1/p' )
+ if [ 1 -lt "$GIT_VERSION_MAJOR" ];then
+ git fetch origin "$VCSH_BRANCH"
+ else
+ git fetch origin
+ fi
hook pre-merge
git ls-tree -r --name-only origin/"$VCSH_BRANCH" | (while read object; do
[ -e "$object" ] &&
[ x"$VCSH_CONFLICT" = x'1' ]) &&
fatal "will stop after fetching and not try to merge!
Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17
- git merge origin/"$VCSH_BRANCH"
+ git -c merge.ff=true merge origin/"$VCSH_BRANCH"
hook post-merge
hook post-clone
retire
echo "$VCSH_REPO_NAME: "
GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
use
- git commit --untracked-files=no --quiet
+ git commit --untracked-files=no --quiet $@
VCSH_COMMAND_RETURN_CODE=$?
echo
done
foreach() {
hook pre-foreach
+
+ # We default to prefixing `git` to all commands passed to foreach, but
+ # allow running in general context with -g
+ command_prefix=git
+ while getopts "g" flag; do
+ if [ x"$1" = x'-g' ]; then
+ unset command_prefix
+ fi
+ shift 1
+ done
for VCSH_REPO_NAME in $(list); do
+ echo "$VCSH_REPO_NAME:"
GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
use
- "$@"
+ $command_prefix "$@"
done
hook post-foreach
}
}
list_tracked_by() {
- list_tracked $2
+ list_tracked '' $2
}
list_untracked() {
temp_file_untracked_copy=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file'
# Hack in support for `vcsh list-untracked -r`...
+ exclude_standard_opt='--exclude-standard'
directory_opt="--directory"
shift 1
- while getopts "r" flag; do
- if [ x"$1" = x'-r' ]; then
+ while getopts "ar" flag; do
+ if [ x"$1" = x'-a' ]; then
+ unset exclude_standard_opt
+ elif [ x"$1" = x'-r' ]; then
unset directory_opt
fi
shift 1
list_untracked_helper() {
export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
- git ls-files --others "$directory_opt" | (
+ git ls-files --others $exclude_standard_opt "$directory_opt" | (
while read line; do
echo "$line"
directory_component=${line%%/*}
cp $temp_file_others $temp_file_untracked || fatal 'Could not copy temp file'
fi
cp $temp_file_untracked $temp_file_untracked_copy || fatal 'Could not copy temp file'
- comm -12 --nocheck-order $temp_file_others $temp_file_untracked_copy > $temp_file_untracked
+ comm -12 $temp_file_others $temp_file_untracked_copy > $temp_file_untracked
}
pull() {
}
status() {
+ if [ -t 1 ]; then
+ COLORING="-c color.status=always"
+ fi
if [ -n "$VCSH_REPO_NAME" ]; then
status_helper $VCSH_REPO_NAME
else
for VCSH_REPO_NAME in $(list); do
- echo "$VCSH_REPO_NAME:"
- status_helper $VCSH_REPO_NAME
- echo
+ STATUS=$(status_helper $VCSH_REPO_NAME "$COLORING")
+ [ -n "$STATUS" -o -z "$VCSH_STATUS_TERSE" ] && echo "$VCSH_REPO_NAME:"
+ [ -n "$STATUS" ] && echo "$STATUS"
+ [ -z "$VCSH_STATUS_TERSE" ] && echo
done
fi
}
status_helper() {
- GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
+ GIT_DIR=$VCSH_REPO_D/$1.git; export GIT_DIR
+ VCSH_GIT_OPTIONS=$2
use
remote_tracking_branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2> /dev/null) && {
commits_behind=$(git log ..${remote_tracking_branch} --oneline | wc -l)
[ ${commits_behind} -ne 0 ] && echo "Behind $remote_tracking_branch by $commits_behind commits"
[ ${commits_ahead} -ne 0 ] && echo "Ahead of $remote_tracking_branch by $commits_ahead commits"
}
- git status --short --untracked-files='no'
+ git ${VCSH_GIT_OPTIONS} status --short --untracked-files='no'
VCSH_COMMAND_RETURN_CODE=$?
}
}
which() {
- [ -e "$VCSH_COMMAND_PARAMETER" ] || fatal "'$VCSH_COMMAND_PARAMETER' does not exist" 1
- for VCSH_REPO_NAME in $(list); do
- for VCSH_FILE in $(get_files); do
- echo "$VCSH_FILE" | grep -q "$VCSH_COMMAND_PARAMETER" && echo "$VCSH_REPO_NAME: $VCSH_FILE"
- done
- done | sort -u
+ output=$(for VCSH_REPO_NAME in $(list); do
+ get_files | grep -- "$VCSH_COMMAND_PARAMETER" | sed "s/^/$VCSH_REPO_NAME: /"
+ done | sort -u)
+ if [ -z "$output" ]; then
+ fatal "'$VCSH_COMMAND_PARAMETER' does not exist" 1
+ else
+ echo "$output"
+ fi
}
write_gitignore() {
use
cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
+ local GIT_VERSION="$(git --version)"
+ local GIT_VERSION_MAJOR=$(echo $GIT_VERSION | sed -n 's/.* \([0-9]\)\..*/\1/p')
+ local GIT_VERSION_MINOR=$(echo $GIT_VERSION | sed -n 's/.* \([0-9]\)\.\([0-9]\)\..*/\2/p')
OLDIFS=$IFS
IFS=$(printf '\n\t')
gitignores=$(for file in $(git ls-files); do
- while true; do
- echo "$file"; new=${file%/*}
- [ x"$file" = x"$new" ] && break
- file=$new
- done;
+ if [ $GIT_VERSION_MAJOR -ge 2 -a $GIT_VERSION_MINOR -ge 7 ]; then
+ echo "$file";
+ else
+ while true; do
+ echo "$file"; new=${file%/*}
+ [ x"$file" = x"$new" ] && break
+ file=$new
+ done;
+ fi
done | sort -u)
# Contrary to GNU mktemp, mktemp on BSD/OSX requires a template for temp files
[ x"$VCSH_COMMAND" = x'push' ]; then
:
elif [ x"$VCSH_COMMAND" = x'status' ]; then
+ if [ x"$2" = x'--terse' ]; then
+ VCSH_STATUS_TERSE=1; export VCSH_STATUS_TERSE
+ shift
+ fi
VCSH_REPO_NAME=$2; export VCSH_REPO_NAME
elif [ -n "$2" ]; then
VCSH_COMMAND='run'; export VCSH_COMMAND
projects / code / vcsh.git / blobdiff