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

diff --git a/all b/all
index 6011b54e..44c03764 100755
--- a/all
+++ b/all
@@ -2,23 +2,62 @@
 
 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*)
+				# 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 "$*"
 }
 
-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 "$0" "$@"
+			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
@@ -51,13 +90,6 @@ fi
 cmd=$1
 shift
 
-case "$0" in
-	*/*)
-		cd "${0%/*}"
-		;;
-esac
-
-d0=`pwd`
 case "$cmd" in
 	update|pull)
 		base=`git config remote.origin.url`
@@ -86,9 +118,9 @@ case "$cmd" in
 						fi
 						;;
 				esac
-				verbose git pull
-				cd "$d0"
-				checkself "$0" "$@"
+				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"
@@ -116,13 +148,14 @@ case "$cmd" in
 			else
 				verbose git checkout master
 			fi
+			cd "$d00"
+			checkself "$SELF" "$@"
 			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
@@ -153,7 +186,7 @@ case "$cmd" in
 				fi
 				cd "$d0"
 			done
-			"$0" branch
+			"$SELF" branch
 		fi
 		;;
 	branches)
@@ -164,6 +197,34 @@ case "$cmd" in
 			cd "$d0"
 		done
 		;;
+	merge)
+		for d in $repos; do
+			cd "$d0/$d"
+			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 \"$d\". 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
+					fi
+				fi
+			fi
+			cd "$d0"
+		done
+		;;
 	push)
 		for d in $repos; do
 			cd "$d0/$d"
@@ -243,13 +304,14 @@ case "$cmd" in
 		;;
 	*)
 		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"
+		echo "  $SELF branches"
+		echo "  $SELF branch [<remote>] <branchname>"
+		echo "  $SELF checkout [<remote>] <branchname>"
+		echo "  $SELF compile"
+		echo "  $SELF run <client> <options>"
+		echo "  $SELF each <command>"
 		;;
 esac