X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=72601766d029ec3c37dd8126ec4300721ec6a2a6;hp=e5260071168ef9e79bd7cf6e8db36a37f9f458a0;hb=3db1a9351091e06b89427f5d4f7c6dc408ae80c1;hpb=a6f630181878fcbee62cbfa2b253ac317ff15d6e

diff --git a/all b/all
index e5260071..72601766 100755
--- a/all
+++ b/all
@@ -21,7 +21,7 @@ case "$0" in
 			MINGW*)
 				# Windows hates users. So this script has to copy itself elsewhere first...
 				tname=
-				cp "$0" ../all.xonotic.sh
+				cp "$SELF" ../all.xonotic.sh
 				exec ../all.xonotic.sh "$@"
 				;;
 		esac
@@ -33,10 +33,23 @@ msg()
 	echo "$*"
 }
 
-self=`cksum "$SELF"`
+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 "$SELF"`
+	self_new=`checksum "$SELF"`
 	if [ x"$self" != x"$self_new" ]; then
 		msg "./all has changed."
 		if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
@@ -57,6 +70,41 @@ 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()
+{
+	verbose cd "$1"
+	check_mergeconflict "$1"
+}
+
 repos_urls="
 	.
 	data/xonotic-data.pk3dir
@@ -95,7 +143,7 @@ case "$cmd" in
 					;;
 			esac
 			if [ -d "$d0/$d" ]; then
-				verbose cd "$d0/$d"
+				enter "$d0/$d"
 				case "$d" in
 					.)
 						;;
@@ -105,9 +153,12 @@ case "$cmd" in
 						fi
 						;;
 				esac
-				verbose git pull
+				if ! verbose git pull; then
+					check_mergeconflict "$d"
+					# do not exit, as this may also mean we are tracking something else
+				fi
 				cd "$d00"
-				checkself "$SELF" "$@"
+				checkself "$cmd" "$@"
 				cd "$d0/$d"
 				verbose git remote prune origin
 				cd "$d0"
@@ -125,7 +176,7 @@ case "$cmd" in
 		fi
 		exists=false
 		for d in $repos; do
-			verbose cd "$d0/$d"
+			enter "$d0/$d"
 			if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
 				exists=true
 				verbose git checkout "$branch"
@@ -136,7 +187,7 @@ case "$cmd" in
 				verbose git checkout master
 			fi
 			cd "$d00"
-			checkself "$SELF" "$@"
+			checkself "$cmd" "$@"
 			cd "$d0"
 		done
 		if ! $exists; then
@@ -153,7 +204,7 @@ case "$cmd" in
 		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"
@@ -161,10 +212,11 @@ case "$cmd" in
 			done
 		else
 			for d in $repos; do
-				cd "$d0/$d"
+				dv=`visible_repo_name "$d"`
+				enter "$d0/$d"
 				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
@@ -178,22 +230,46 @@ 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"
 		done
 		;;
+	merge)
+		for d in $repos; do
+			dv=`visible_repo_name "$d"`
+			enter "$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 $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)
 		for d in $repos; do
-			cd "$d0/$d"
+			dv=`visible_repo_name "$d"`
+			enter "$d0/$d"
 			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
@@ -203,7 +279,7 @@ case "$cmd" in
 			if git log "origin/$r".."$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
@@ -222,11 +298,11 @@ case "$cmd" in
 				fi
 			fi
 		fi
-		verbose cd "$d0/fteqcc"
+		enter "$d0/fteqcc"
 		verbose make $MAKEFLAGS
-		verbose cd "$d0/data/xonotic-data.pk3dir"
+		enter "$d0/data/xonotic-data.pk3dir"
 		verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS
-		verbose cd "$d0/darkplaces"
+		enter "$d0/darkplaces"
 		verbose make $MAKEFLAGS sv-debug
 		verbose make $MAKEFLAGS cl-debug
 		verbose make $MAKEFLAGS sdl-debug
@@ -256,7 +332,7 @@ case "$cmd" in
 		;;
 	each|foreach)
 		for d in $repos; do
-			verbose cd "$d0/$d"
+			enter "$d0/$d"
 			verbose "$@"
 			cd "$d0"
 		done
@@ -264,10 +340,11 @@ case "$cmd" in
 	*)
 		echo "Usage:"
 		echo "  $SELF pull"
+		echo "  $SELF merge"
 		echo "  $SELF push"
 		echo "  $SELF branches"
-		echo "  $SELF branch <remote> <branchname>"
-		echo "  $SELF checkout"
+		echo "  $SELF branch [<remote>] <branchname>"
+		echo "  $SELF checkout [<remote>] <branchname>"
 		echo "  $SELF compile"
 		echo "  $SELF run <client> <options>"
 		echo "  $SELF each <command>"