#!/bin/sh
+# vim: filetype=zsh
set -e
+d00=`pwd`
+while ! [ -f ./all ]; do
+ if [ x"`pwd`" = x"/" ]; then
+ echo "Cannot find myself."
+ echo "Please run this script with the working directory inside a Xonotic checkout."
+ exit 1
+ fi
+ cd ..
+done
+d0=`pwd`
+SELF="$d0/all"
+
+# If we are on WINDOWS:
+case "$0" in
+ all|*/all)
+ case "`uname`" in
+ MINGW*|Win*)
+ # Windows hates users. So this script has to copy itself elsewhere first...
+ tname=
+ cp "$SELF" ../all.xonotic.sh
+ exec ../all.xonotic.sh "$@"
+ ;;
+ esac
+ ;;
+esac
+
msg()
{
echo "\e[1m$*\e[m"
}
-self=`cksum "$0"`
+checksum()
+{
+ if [ -x /usr/bin/md5sum ]; then
+ /usr/bin/md5sum "$@"
+ elif [ -x /bin/md5sum ]; then
+ /bin/md5sum "$@"
+ elif [ -x /usr/bin/cksum ]; then
+ /usr/bin/cksum "$@"
+ else
+ echo "NOCHECKSUM"
+ fi
+}
+
+self=`checksum "$SELF"`
checkself()
{
- self_new=`cksum "$0"`
+ self_new=`checksum "$SELF"`
if [ x"$self" != x"$self_new" ]; then
msg "./all has changed."
if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
msg "Rerunning the requested operation to make sure."
export XONOTIC_FORBID_RERUN_ALL=1
- exec "$@"
+ exec "$SELF" "$@"
else
- msg "Please try $0 update, and then retry your requested operation."
+ msg "Please try $SELF update, and then retry your requested operation."
exit 1
fi
fi
"$@"
}
+visible_repo_name()
+{
+ case "$1" in
+ .)
+ echo "the root directory"
+ ;;
+ *)
+ echo "\"$1\""
+ ;;
+ esac
+}
+
+check_mergeconflict()
+{
+ if git ls-files -u | grep ' 1 '; then
+ echo
+ echo "MERGE CONFLICT."
+ echo "change into the \"$1\" project directory, and then:"
+ echo "- edit the files mentioned above with your favorite editor,"
+ echo " and fix the conflicts (marked with <<<<<<< blocks)"
+ echo "- for binary files, you can select the files using"
+ echo " git checkout --ours or git checkout --theirs"
+ echo "- when done with a file, 'git add' the file"
+ echo "- when done, 'git commit'"
+ echo
+ exit 1
+ fi
+}
+
+enter()
+{
+ $2 cd "$1"
+ check_mergeconflict "$1"
+}
+
repos_urls="
.
data/xonotic-data.pk3dir
data/xonotic-nexcompat.pk3dir
darkplaces
fteqcc@git://github.com/Blub/qclib.git
+ div0-gittools@git://git.icculus.org/divverent/div0-gittools.git
+ netradiant
"
repos=`for X in $repos_urls; do echo "${X%%@*}"; done`
cmd=$1
shift
-d0=`pwd`
case "$cmd" in
update|pull)
base=`git config remote.origin.url`
;;
esac
if [ -d "$d0/$d" ]; then
- verbose cd "$d0/$d"
+ enter "$d0/$d" verbose
case "$d" in
.)
;;
fi
;;
esac
- verbose git pull
- cd "$d0"
- checkself "$0" "$@"
+ verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
+ # TODO remove this line later
+
+ verbose git config core.autocrlf input
+ verbose git config core.safecrlf true
+
+ r=`git symbolic-ref HEAD`
+ r=${r#refs/heads/}
+ if git config branch.$r.remote >/dev/null 2>&1; then
+ if ! verbose git pull; then
+ check_mergeconflict "$d"
+ exit 1 # FATAL
+ fi
+ fi
+
+ cd "$d00"
+ checkself "$cmd" "$@"
cd "$d0/$d"
verbose git remote prune origin
cd "$d0"
fi
exists=false
for d in $repos; do
- verbose cd "$d0/$d"
+ enter "$d0/$d" verbose
if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
exists=true
verbose git checkout "$branch"
else
verbose git checkout master
fi
+ cd "$d00"
+ checkself "$cmd" "$@"
cd "$d0"
- checkself "$0" "$@"
done
if ! $exists; then
echo "The requested branch was not found in any repository."
fi
- "$0" branch
+ exec "$SELF" branch
;;
branch)
remote=$1
branch=$2
+ srcbranch=$3
if [ -z "$branch" ]; then
branch=$remote
remote=origin
fi
+ if [ -z "$srcbranch" ]; then
+ srcbranch=master
+ fi
if [ -z "$branch" ]; then
for d in $repos; do
- cd "$d0/$d"
+ enter "$d0/$d"
r=`git symbolic-ref HEAD`
r=${r#refs/heads/}
echo "$d is at $r"
done
else
for d in $repos; do
- cd "$d0/$d"
+ dv=`visible_repo_name "$d"`
+ enter "$d0/$d" verbose
a=
while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
- echo "Branch in $d?"
+ echo "Branch in $dv?"
read -r a
done
if [ x"$a" = x"y" ]; then
- verbose git push "$remote" HEAD:"$branch"
+ verbose git push "$remote" "$srcbranch":"$branch"
verbose git checkout --track -b "$branch" "$remote/$branch"
fi
cd "$d0"
done
- "$0" branch
+ "$SELF" branch
fi
;;
branches)
for d in $repos; do
- cd "$d0/$d"
+ enter "$d0/$d"
echo "In $d:"
- git branch -a | sed 's/^/ /; /->/d'
+ git branch -a -v -v | cut -c 3- | while read -r BRANCH REV UPSTREAM TEXT; do
+ case "$UPSTREAM" in
+ \[*)
+ UPSTREAM=${UPSTREAM#\[}
+ UPSTREAM=${UPSTREAM%\]}
+ UPSTREAM=${UPSTREAM%:*}
+ ;;
+ *)
+ TEXT="$UPSTREAM $TEXT"
+ UPSTREAM=
+ ;;
+ esac
+ if [ x"$REV" = x"->" ]; then
+ continue
+ fi
+ BRANCH=${BRANCH#remotes/}
+ echo -n " $BRANCH"
+ if [ -n "$UPSTREAM" ]; then
+ echo -n " (tracking $UPSTREAM)"
+ fi
+ #echo " $TEXT"
+ echo
+ done
+ done
+ ;;
+ merge)
+ for d in $repos; do
+ dv=`visible_repo_name "$d"`
+ enter "$d0/$d" verbose
+ r=`git symbolic-ref HEAD`
+ r=${r#refs/heads/}
+ if git log HEAD..origin/master | grep .; then
+ # we have uncommitted changes
+ a=
+ while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+ echo "Could merge from \"master\" into \"$r\" in $dv. Do it?"
+ read -r a
+ done
+ if [ x"$a" = x"y" ]; then
+ if ! verbose git merge origin/master; then
+ check_mergeconflict "$d"
+ exit 1 # this should ALWAYS be fatal
+ fi
+ fi
+ fi
cd "$d0"
done
;;
- push)
+ push|commit)
+ submit=$1
for d in $repos; do
- cd "$d0/$d"
+ dv=`visible_repo_name "$d"`
+ enter "$d0/$d" verbose
r=`git symbolic-ref HEAD`
r=${r#refs/heads/}
- a=
- if git log "origin/$r".."$r" | grep .; then
+ if git diff HEAD | grep .; then
+ # we have uncommitted changes
+ a=
while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
- echo "Push $r in $d?"
+ echo "Uncommitted changes in \"$r\" in $dv. Commit?"
read -r a
done
if [ x"$a" = x"y" ]; then
- verbose git push `git config "branch.$r.remote" || echo origin` HEAD
+ verbose git commit -a
fi
fi
+ rem=`git config "branch.$r.remote" || echo origin`
+ if git log "$rem/$r".."$r" | grep .; then
+ a=
+ while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+ echo "Push \"$r\" in $dv?"
+ read -r a
+ done
+ if [ x"$a" = x"y" ]; then
+ verbose git push "$rem" HEAD
+ fi
+ fi
+ if [ x"$submit" = x"-s" ]; then
+ case "$r" in
+ */*)
+ verbose git push "$rem" HEAD:"${r%%/*}/finished/${r#*/}"
+ ;;
+ esac
+ fi
cd "$d0"
done
;;
fi
fi
fi
- verbose cd "$d0/fteqcc"
+ enter "$d0/fteqcc" verbose
verbose make $MAKEFLAGS
- verbose cd "$d0/data/xonotic-data.pk3dir"
+ enter "$d0/data/xonotic-data.pk3dir" verbose
verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS
- verbose cd "$d0/darkplaces"
+ enter "$d0/darkplaces" verbose
verbose make $MAKEFLAGS sv-debug
verbose make $MAKEFLAGS cl-debug
verbose make $MAKEFLAGS sdl-debug
;;
each|foreach)
for d in $repos; do
- verbose cd "$d0/$d"
+ enter "$d0/$d" verbose
verbose "$@"
cd "$d0"
done
;;
+ save-patches)
+ outfile=$1
+ patchdir=`mktemp -d -t save-patches.XXXXXX`
+ for d in $repos; do
+ enter "$d0/$d" verbose
+ git branch -v -v | cut -c 3- | {
+ i=0
+ while read -r BRANCH REV UPSTREAM TEXT; do
+ case "$UPSTREAM" in
+ \[*)
+ UPSTREAM=${UPSTREAM#\[}
+ UPSTREAM=${UPSTREAM%\]}
+ UPSTREAM=${UPSTREAM%:*}
+ TRACK=true
+ ;;
+ *)
+ UPSTREAM=origin/master
+ TRACK=false
+ ;;
+ esac
+ if [ x"$REV" = x"->" ]; then
+ continue
+ fi
+ if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH"; then
+ echo "$d" > "$patchdir/$i/info.txt"
+ echo "$BRANCH" >> "$patchdir/$i/info.txt"
+ echo "$UPSTREAM" >> "$patchdir/$i/info.txt"
+ echo "$TRACK" >> "$patchdir/$i/info.txt"
+ i=$(($i+1))
+ else
+ rm -rf "$patchdir/$i"
+ fi
+ done
+ }
+ done
+ ( cd "$patchdir" && tar cvzf - . ) > "$outfile"
+ rm -rf "$patchdir"
+ ;;
+ restore-patches)
+ infile=$1
+ patchdir=`mktemp -d -t restore-patches.XXXXXX`
+ ( cd "$patchdir" && tar xvzf - ) < "$infile"
+ # detach the head
+ for P in "$patchdir"/*/info.txt; do
+ D=${P%/info.txt}
+ exec 3<"$P"
+ read -r d <&3
+ read -r BRANCH <&3
+ read -r UPSTREAM <&3
+ read -r TRACK <&3
+ verbose git checkout HEAD^0
+ verbose git branch -D "$BRANCH"
+ if [ x"$TRACK" = x"true" ]; then
+ verbose git checkout --track -b "$BRANCH" "$UPSTREAM"
+ else
+ verbose git branch -b "$BRANCH" "$UPSTREAM"
+ fi
+ verbose git am "$D"
+ done
+ rm -rf "$patchdir"
+ ;;
+ admin-merge)
+ for d in $repos; do
+ enter "$d0/$d" verbose
+ git rev-parse "$1/$2" || continue
+ # 1. review
+ {
+ git log HEAD.."$1/$2"
+ git diff HEAD..."$1/$2"
+ } | less
+ a=
+ while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+ echo "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"
+ read -r a
+ done
+ if [ x"$a" = x"y" ]; then
+ git merge "$1/$2"
+ cd "$d0"
+ a=
+ if ! "$SELF" compile; then
+ a=n
+ fi
+ cd "$d0/d"
+ while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+ echo "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."
+ read -r a
+ done
+ if [ x"$a" = x"y" ]; then
+ git push origin HEAD
+ git push "$1" :"$2"
+ else
+ git reset --hard HEAD@{1}
+ fi
+ fi
+ done
+ ;;
*)
echo "Usage:"
- echo " $0 pull"
- echo " $0 push"
- echo " $0 branches"
- echo " $0 branch <remote> <branchname>"
- echo " $0 checkout"
- echo " $0 compile"
- echo " $0 run <client> <options>"
- echo " $0 each <command>"
+ echo " $SELF pull"
+ echo " $SELF merge"
+ echo " $SELF push [-s]"
+ echo " $SELF branches"
+ echo " $SELF branch [<remote>] <branchname>"
+ echo " $SELF branch <remote> <branchname> <srcbranchname>"
+ echo " $SELF checkout [<remote>] <branchname>"
+ echo " $SELF compile"
+ echo " $SELF run <client> <options>"
+ echo " $SELF each <command>"
;;
esac
projects / xonotic / xonotic.git / blobdiff