X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=af35bf358d3f85eeec029957834d1962a543a92e;hp=44c037646eb3e99b6b1d27b6445e3b5c94423cf0;hb=55bbcbfc9e7206ab6c531e652959f84ab2afe64e;hpb=a93d716530f59cce4f56cfc0fc5326998fee954d

diff --git a/all b/all
index 44c03764..af35bf35 100755
--- a/all
+++ b/all
@@ -1,4 +1,5 @@
 #!/bin/sh
+# vim: filetype=zsh
 
 set -e
 
@@ -18,10 +19,11 @@ SELF="$d0/all"
 case "$0" in
 	all|*/all)
 		case "`uname`" in
-			MINGW*)
+			MINGW*|Win*)
 				# Windows hates users. So this script has to copy itself elsewhere first...
 				tname=
 				cp "$SELF" ../all.xonotic.sh
+				export WE_HATE_OUR_USERS=1
 				exec ../all.xonotic.sh "$@"
 				;;
 		esac
@@ -70,19 +72,97 @@ verbose()
 	"$@"
 }
 
+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-maps.pk3dir
-	data/xonotic-music.pk3dir
-	data/xonotic-nexcompat.pk3dir
-	darkplaces
-	fteqcc@git://github.com/Blub/qclib.git
-	div0-gittools@git://git.icculus.org/divverent/div0-gittools.git
-	netradiant
+.                             |                                                   | master
+data/xonotic-data.pk3dir      |                                                   | master
+data/xonotic-maps.pk3dir      |                                                   | master
+data/xonotic-music.pk3dir     |                                                   | master
+data/xonotic-nexcompat.pk3dir |                                                   | master
+mediasource                   |                                                   | master
+darkplaces                    |                                                   | div0-stable
+fteqcc                        | git://github.com/Blub/qclib.git                   | master
+div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master
+netradiant                    |                                                   | master
 "
+# todo: in darkplaces, change repobranch to div0-stable
 
-repos=`for X in $repos_urls; do echo "${X%%@*}"; done`
+repos=`echo "$repos_urls" | grep . | cut -d '|' -f 1 | tr -d ' '`
+
+base=`git config remote.origin.url`
+base=${base%xonotic.git}
+
+repourl()
+{
+	t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
+	if [ -n "$t" ]; then
+		case "$t" in
+			*://*)
+				echo "$t"
+				;;
+			*)
+				echo "$base$t"
+				;;
+		esac
+	else
+		if [ x"$1" = x"." ]; then
+			echo "$base""xonotic.git"
+		else
+			echo "$base${1##*/}.git"
+		fi
+	fi
+}
+
+repobranch()
+{
+	t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
+	if [ -n "$t" ]; then
+		echo "$t"
+	else
+		echo "master"
+	fi
+}
+
+repos=`for d in $repos; do
+	p="${d%dir}"
+	if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! [ -f "$p" ]; then
+		echo "$d"
+	fi
+done`
 
 if [ "$#" = 0 ]; then
 	set -- help
@@ -92,40 +172,44 @@ shift
 
 case "$cmd" in
 	update|pull)
-		base=`git config remote.origin.url`
-		base=${base%xonotic.git}
-		for dcomplete in $repos_urls; do
-			case "$dcomplete" in
-				*@*)
-					d=${dcomplete%%@*}
-					url=${dcomplete#*@}
-					switch=false
-					;;
-				*)
-					d=${dcomplete%%@*}
-					url=$base${d##*/}.git
-					switch=true
-					;;
-			esac
+		allow_pull=true
+		if [ x"$1" = x"-N" ]; then
+			allow_pull=false
+		fi
+		for d in $repos; do
+			url=`repourl "$d"`
+			branch=`repobranch "$d"`
 			if [ -d "$d0/$d" ]; then
-				verbose cd "$d0/$d"
-				case "$d" in
-					.)
-						;;
-					*)
-						if $switch; then
-							verbose git config remote.origin.url "$url"
+				if $allow_pull; 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/}
+					if git config branch.$r.remote >/dev/null 2>&1; then
+						if ! verbose git pull; then
+							check_mergeconflict "$d"
+							echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
+							read -r DUMMY
 						fi
-						;;
-				esac
-				verbose git pull || true # errors if the branch is not tracking anything
-				cd "$d00"
-				checkself "$SELF" "$@"
-				cd "$d0/$d"
-				verbose git remote prune origin
-				cd "$d0"
+					fi
+
+					cd "$d00"
+					checkself "$cmd" "$@"
+					cd "$d0/$d"
+					verbose git remote prune origin
+					cd "$d0"
+				fi
 			else
 				verbose git clone "$url" "$d0/$d"
+				enter "$d0/$d" verbose
+				verbose git checkout "$branch"
+				cd "$d0"
 			fi
 		done
 		;;
@@ -138,7 +222,7 @@ case "$cmd" in
 		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"
@@ -146,10 +230,10 @@ case "$cmd" in
 				exists=true
 				verbose git checkout --track -b "$branch" "$remote/$branch"
 			else
-				verbose git checkout master
+				verbose git checkout "`repobranch "$d"`"
 			fi
 			cd "$d00"
-			checkself "$SELF" "$@"
+			checkself "$cmd" "$@"
 			cd "$d0"
 		done
 		if ! $exists; then
@@ -160,13 +244,14 @@ case "$cmd" in
 	branch)
 		remote=$1
 		branch=$2
+		srcbranch=$3
 		if [ -z "$branch" ]; then
 			branch=$remote
 			remote=origin
 		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"
@@ -174,15 +259,26 @@ case "$cmd" in
 			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\"?"
-					read -r a
-				done
-				if [ x"$a" = x"y" ]; then
-					verbose git push "$remote" HEAD:"$branch"
-					verbose git checkout --track -b "$branch" "$remote/$branch"
+				if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
+					echo "Already having this branch in $dv."
+				else
+					while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+						echo "Branch in $dv?"
+						read -r a
+					done
+					if [ x"$a" = x"y" ]; then
+						if [ -n "$srcbranch" ]; then
+							b=$srcbranch
+						else
+							b="`repobranch "$d"`"
+						fi
+						# TODO do this without pushing
+						verbose git push "$remote" "$b":"$branch"
+						verbose git checkout --track -b "$branch" "$remote/$branch"
+					fi
 				fi
 				cd "$d0"
 			done
@@ -191,70 +287,161 @@ case "$cmd" in
 		;;
 	branches)
 		for d in $repos; do
-			cd "$d0/$d"
+			enter "$d0/$d"
 			echo "In $d:"
-			git branch -a | sed 's/^/  /; /->/d'
-			cd "$d0"
+			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
 		;;
+	branches_short)
+		for d in $repos; do
+			cd "$d0/$d" # am in a pipe, shouldn't use enter
+			git branch -a -v -v | cut -c 3- | sed "s,^,$d ,"
+			cd "$d0"
+		done | {
+			branches_list=
+			# branches_repos_*=
+			while read -r d 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/}
+				ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
+				branches_list="$branches_list $BRANCH" # TEH SORT MAKEZ IT UNIEQ
+				eval "r=\$branches_repos_$ID"
+				r="$r $d:$UPSTREAM"
+				eval "branches_repos_$ID=\$r"
+			done
+			echo -n "$branches_list" | xargs -n 1 echo | sort -u | while IFS= read -r BRANCH; do
+				ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
+				eval "r=\$branches_repos_$ID"
+				echo "$BRANCH: $r"
+			done
+		}
+		;;
 	merge)
 		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/}
-			if git log HEAD..origin/master | grep .; then
+			if git log HEAD..origin/"`repobranch "$d"`" | 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 \"$d\". Do it?"
+					echo "Could merge from \"`repobranch "$d"`\" into \"$r\" in $dv. Do it?"
 					read -r a
 				done
 				if [ x"$a" = x"y" ]; then
-					if ! verbose git merge origin/master; then
-						echo
-						echo "MERGE CONFLICT."
-						echo "change into the \"$d\" project directory, and then:"
-						echo "- edit the files mentioned above with your favorite editor,"
-						echo "  and fix the conflicts (marked with <<<<<<< blocks)"
-						echo "- when done with a file, 'git add' the file"
-						echo "- when done, 'git commit'"
-						exit 1
+					if ! verbose git merge origin/"`repobranch "$d"`"; 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/}
 			if git diff HEAD | grep .; then
 				# we have uncommitted changes
 				a=
 				while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-					echo "Uncommitted changes in \"$r\" in \"$d\". Commit?"
+					echo "Uncommitted changes in \"$r\" in $dv. Commit?"
 					read -r a
 				done
 				if [ x"$a" = x"y" ]; then
 					verbose git commit -a
 				fi
 			fi
-			if git log "origin/$r".."$r" | grep .; then
+			rem=`git config "branch.$r.remote" || echo origin`
+			if { git log "$rem/$r".."$r" || git log origin/"`repobranch "$d"`".."$r"; } | grep .; then
 				a=
 				while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-					echo "Push \"$r\" in \"$d\"?"
+					echo "Push \"$r\" in $dv?"
 					read -r a
 				done
 				if [ x"$a" = x"y" ]; then
-					verbose git push `git config "branch.$r.remote" || echo origin` HEAD
+					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
 		;;
 	compile)
+		if [ -n "$WE_HATE_OUR_USERS" ]; then
+			TARGETS="sv-debug cl-debug"
+		else
+			TARGETS="sv-debug cl-debug sdl-debug"
+		fi
+		case "$1" in
+			-c)
+				clean=true
+				shift
+				;;
+			*)
+				clean=false
+				;;
+		esac
+		case "$1" in
+			sdl)
+				TARGETS="sdl-debug"
+				shift
+				;;
+			glx|agl|wgl)
+				TARGETS="cl-debug"
+				shift
+				;;
+			dedicated)
+				TARGETS="sv-debug"
+				shift
+				;;
+		esac
 		if [ -z "$MAKEFLAGS" ]; then
 			if [ -f /proc/cpuinfo ]; then
 				ncpus=$((`grep -c '^processor	:' /proc/cpuinfo`+0))
@@ -262,18 +449,43 @@ case "$cmd" in
 					MAKEFLAGS=-j$ncpus
 				fi
 			fi
+			case "`uname`" in
+				Linux|*BSD)
+					MAKEFLAGS="$MAKEFLAGS DP_LINK_TO_LIBJPEG=1"
+					;;
+			esac
+			if [ -n "$WE_HATE_OUR_USERS" ]; then
+				MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw"
+			fi
+		fi
+		enter "$d0/fteqcc" verbose
+		if $clean; then
+			verbose make $MAKEFLAGS clean
 		fi
-		verbose cd "$d0/fteqcc"
 		verbose make $MAKEFLAGS
-		verbose cd "$d0/data/xonotic-data.pk3dir"
-		verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS
-		verbose cd "$d0/darkplaces"
-		verbose make $MAKEFLAGS sv-debug
-		verbose make $MAKEFLAGS cl-debug
-		verbose make $MAKEFLAGS sdl-debug
+		enter "$d0/data/xonotic-data.pk3dir" verbose
+		if $clean; then
+			verbose make $MAKEFLAGS clean
+		fi
+		verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
+		enter "$d0/darkplaces" verbose
+		if $clean; then
+			verbose make $MAKEFLAGS clean
+		fi
+		for T in $TARGETS; do
+			verbose make $MAKEFLAGS "$@" "$T"
+		done
 		;;
 	run)
-		client=-sdl
+		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"
+			client=-sdl
+		else
+			client=-sdl
+		fi
 		case "$1" in
 			sdl|glx|agl|dedicated)
 				client=-$1
@@ -292,26 +504,130 @@ case "$cmd" in
 				exit 1
 			fi
 		fi
-		#verbose "darkplaces/darkplaces$client" -xonotic "$@"
-		verbose "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
+		set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
+		if [ -n "$USE_GDB" ]; then
+			set -- gdb --args "$@"
+		fi
+		"$@"
 		;;
 	each|foreach)
 		for d in $repos; do
-			verbose cd "$d0/$d"
-			verbose "$@"
-			cd "$d0"
+			if verbose cd "$d0/$d"; then
+				verbose "$@"
+				cd "$d0"
+			fi
+		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/"`repobranch "$d"`"
+							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)
+		if [ "$#" = 1 ]; then
+			set -- "${1%%/*}" "${1#*/}"
+		fi
+		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 "  $SELF pull"
 		echo "  $SELF merge"
-		echo "  $SELF push"
+		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 compile [-c] [<client>] <options>"
+		echo "  $SELF run [<client>] <options>"
 		echo "  $SELF each <command>"
 		;;
 esac