set -e
+# I use this in EVERY shell script ;)
+LF="
+"
+
d00=`pwd`
while ! [ -f ./all ]; do
if [ x"`pwd`" = x"/" ]; then
enter "$d0/$d" verbose
verbose git config remote.origin.url "$url"
verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
- # TODO remove this line later
-
- verbose git config core.autocrlf false
- verbose git config core.safecrlf false # we don't NEED that...
r=`git symbolic-ref HEAD`
r=${r#refs/heads/}
else
verbose git clone "$url" "$d0/$d"
enter "$d0/$d" verbose
- verbose git checkout "$branch"
+ if [ "$branch" != "master" ]; then
+ verbose git checkout --track -b "$branch" origin/"$branch"
+ fi
cd "$d0"
fi
done
exists=false
for d in $repos; do
enter "$d0/$d" verbose
- if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
+ if [ -z "$branch" ]; then
+ b=`repobranch "$d"`
+ else
+ b=$branch
+ fi
+ if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
exists=true
- verbose git checkout "$branch"
- elif git rev-parse "refs/remotes/$remote/$branch" >/dev/null 2>&1; then
+ verbose git checkout "$b"
+ elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
exists=true
- verbose git checkout --track -b "$branch" "$remote/$branch"
+ verbose git checkout --track -b "$b" "$remote/$b"
else
verbose git checkout "`repobranch "$d"`"
fi
if [ -n "$srcbranch" ]; then
b=$srcbranch
else
- b="`repobranch "$d"`"
+ b=origin/"`repobranch "$d"`"
+ verbose git fetch origin || true
fi
# TODO do this without pushing
- verbose git push "$remote" "$b":"$branch"
- verbose git checkout --track -b "$branch" "$remote/$branch"
+ verbose git checkout -b "$branch" "$b"
+ verbose git config "branch.$branch.remote" "$remote"
+ verbose git config "branch.$branch.merge" "refs/heads/$branch"
fi
fi
cd "$d0"
fi
fi
rem=`git config "branch.$r.remote" || echo origin`
- if { git log "$rem/$r".."$r" || git log origin/"`repobranch "$d"`".."$r"; } | grep .; then
+ bra=`git config "branch.$r.merge" || echo "$r"`
+ upstream="$rem/$bra"
+ if ! [ git rev-parse "$upstream" ]; then
+ upstream="`repobranch "$d"`"
+ fi
+ if git log "$upstream".."$r" | grep .; then
if yesno "Push \"$r\" in $dv?"; then
verbose git push "$rem" HEAD
fi
if [ x"$submit" = x"-s" ]; then
case "$r" in
*/*)
- verbose git push "$rem" HEAD:"${r%%/*}/finished/${r#*/}"
+ verbose git push "$rem" HEAD:"${bra%%/*}/finished/${bra#*/}"
;;
esac
fi
compile)
if [ -n "$WE_HATE_OUR_USERS" ]; then
TARGETS="sv-debug cl-debug"
+ if [ -z "$CC" ]; then
+ export CC=gcc
+ fi
+ elif [ x"`uname`" = x"Darwin" ] && ( [ -d /Library/Frameworks/SDL.framework ] || [ -d $(HOME)/Library/Frameworks/SDL.framework ] ); then
+ # AGL is broken in Snow Leopard, so let's default to SDL if it is available.
+ TARGETS="sv-debug sdl-debug"
else
TARGETS="sv-debug cl-debug sdl-debug"
fi
client=
export PATH="$d0/misc/buildfiles/w32:$PATH"
elif [ x"`uname`" = x"Darwin" ]; then
- export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Nexuiz.app/Contents/MacOS"
+ export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
client=-sdl
else
client=-sdl
set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
# if pulseaudio is running: USE IT
- if ps -C pulseaudio >/dev/null; then
- if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
- export SDL_AUDIODRIVER=pulse
+ if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
+ if ps -C pulseaudio >/dev/null; then
+ if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
+ export SDL_AUDIODRIVER=pulse
+ fi
fi
fi
;;
admin-merge-2)
t=`mktemp`
+ report=""
+ reportecho()
+ {
+ report=$report"$*$LF"
+ echo "$*"
+ }
+ reportecho4()
+ {
+ report=$report" $*$LF"
+ echo " $*"
+ }
+ reportdo4()
+ {
+ o=`"$@" | sed 's/^/ /' || true`
+ reportecho "$o"
+ }
for d in $repos; do
enter "$d0/$d" verbose
+ base="`repobranch "$d"`"
+ reportecho "In $d:"
for ref in `git for-each-ref --format='%(refname)' refs/remotes/origin/`; do
case "${ref#refs/remotes/origin/}" in
- "`repobranch "$d"`")
+ "$base")
continue
;;
HEAD|master)
continue
;;
esac
- echo "$ref"
- if git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null; then
- echo "Not merging, already had this one"
- elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log HEAD.."$ref"; git diff HEAD..."$ref"; } | less'; then
- git checkout master
+ reportecho " Branch $ref:"
+ note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
+ if [ -n "$note" ]; then
+ reportdo4 echo "$note"
+ reportecho4 "--> not merging, already had this one rejected before"
+ elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log --color "$base".."$ref"; git diff --color --find-copies-harder --ignore-space-change "$base"..."$ref"; } | less -r'; then
+ git checkout "$base"
org=`git rev-parse HEAD`
if ! git merge "$ref" 2>&1 | tee "$t"; then
git reset --hard "$org"
- git notes --ref "refs/notes/admin-merge" add -m "Merge failed:
-`cat "$t"`" "$ref"
+ GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
+ reportdo4 cat "$t"
+ reportecho4 "--> merge failed"
elif ! "$SELF" compile 2>&1 | tee "$t"; then
git reset --hard "$org"
- git notes --ref "refs/notes/admin-merge" add -m "Compile failed:
-`cat "$t"`" "$ref"
+ GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Compile failed:$LF`cat "$t"`" "$ref"
+ reportdo4 cat "$t"
+ reportecho4 "--> compile failed"
elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
git reset --hard "$org"
- git notes --ref "refs/notes/admin-merge" add "$ref"
+ git notes edit "$ref"
+ note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
+ reportdo4 echo "$note"
+ reportecho4 "--> test failed"
else
case ",`repoflags "$d"`," in
*,svn,*)
- git pull
- git rebase -i "$org"
+ # we do quite a mess here... luckily we know $org
+ git pull # svn needs to be current
+ git rebase -i --onto master "$org"
git svn dcommit --add-author-from
+ git reset --hard "$org"
;;
*)
git push origin HEAD
;;
esac
+ reportecho4 "--> MERGED"
if yesno "Delete original branch \"$ref\"?"; then
git push origin :"${ref#refs/remotes/origin/}"
+ reportecho4 "--> branch deleted"
fi
fi
else
git notes --ref "refs/notes/admin-merge" add "$ref"
+ note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
+ if [ -n "$note" ]; then
+ reportdo4 echo "$note"
+ reportecho4 "--> rejected"
+ else
+ reportecho4 "--> postponed"
+ fi
fi
+ reportecho ""
done
+ reportecho ""
done
rm -f "$t"
+ echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
;;
*)
echo "Usage:"
projects / xonotic / xonotic.git / blobdiff