X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=9d48c58ba6d5c38c948aeac26b577f08678146d9;hp=38b65d5c062991b625271569c48fbe43ef624b8e;hb=a543153ec5024e471397ef0aeab6534c83469491;hpb=68454eab14a22ec7700f7da164e0dbdb9444b157

diff --git a/all b/all
index 38b65d5c..9d48c58b 100755
--- a/all
+++ b/all
@@ -213,10 +213,6 @@ case "$cmd" in
 					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/}
@@ -237,11 +233,16 @@ case "$cmd" in
 			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
 		;;
+	update-maps)
+		misc/tools/xonotic-map-compiler-autobuild download
+		;;
 	checkout|switch)
 		remote=$1
 		branch=$2
@@ -252,19 +253,25 @@ case "$cmd" in
 		exists=false
 		for d in $repos; do
 			enter "$d0/$d" verbose
-			if [ -z "$branch" ]; then
-				b=`repobranch "$d"`
-			else
-				b=$branch
-			fi
-			if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
+			b=$branch
+			if [ -n "$b" ] && git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
 				exists=true
 				verbose git checkout "$b"
-			elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
+			elif [ -n "$b" ] && git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
 				exists=true
 				verbose git checkout --track -b "$b" "$remote/$b"
 			else
-				verbose git checkout "`repobranch "$d"`"
+				b=`repobranch "$d"`
+				if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
+					exists=true
+					verbose git checkout "$b"
+				elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
+					exists=true
+					verbose git checkout --track -b "$b" "$remote/$b"
+				else
+					echo "WTF? Not even branch $b doesn't exist in $d"
+					exit 1
+				fi
 			fi
 			cd "$d00"
 			checkself "$cmd" "$@"
@@ -306,8 +313,9 @@ case "$cmd" in
 							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"
@@ -413,7 +421,12 @@ case "$cmd" in
 				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
@@ -421,7 +434,7 @@ case "$cmd" in
 			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
@@ -431,6 +444,12 @@ case "$cmd" in
 	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
@@ -491,13 +510,14 @@ case "$cmd" in
 		for T in $TARGETS; do
 			verbose make $MAKEFLAGS "$@" "$T"
 		done
+		verbose "$SELF" update-maps
 		;;
 	run)
 		if [ -n "$WE_HATE_OUR_USERS" ]; then
 			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
@@ -523,7 +543,7 @@ case "$cmd" in
 		set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
 
 		# if pulseaudio is running: USE IT
-		if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ]; then
+		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
@@ -648,10 +668,11 @@ case "$cmd" in
 		}
 		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)
@@ -659,35 +680,47 @@ case "$cmd" in
 						;;
 				esac
 				reportecho "  Branch $ref:"
-				note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
-				if [ -n "$note" ]; then
+				note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
+				logdata=`git log --color "$base".."$ref"`
+				diffdata=`git diff --color --find-copies-harder --ignore-space-change "$base"..."$ref"`
+				if [ -z "$logdata" ]; then
+					reportecho4 "--> not merging, no changes vs master"
+				elif [ -z "$diffdata" ]; then
+					reportecho4 "--> not merging, no changes vs master, branch contains redundant history"
+					if yesno "Branch \"$ref\" probably should get deleted. Do it?" '{ echo "$logdata"; } | less -r'; then
+						git push origin :"${ref#refs/remotes/origin/}"
+						reportecho4 "--> branch deleted"
+					fi
+				elif [ -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 HEAD.."$ref"; git diff --color --find-copies-harder --ignore-space-change HEAD..."$ref"; } | less -r'; then
-					git checkout master
+				elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ echo "$logdata"; echo "$diffdata"; } | 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:$LF`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:$LF`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"
-						note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
+						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
@@ -700,8 +733,8 @@ case "$cmd" in
 						fi
 					fi
 				else
-					git notes --ref "refs/notes/admin-merge" add "$ref"
-					note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
+					GIT_NOTES_REF=refs/notes/admin-merge git notes edit "$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"