From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 17 Jun 2010 12:08:52 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~422
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=a543153ec5024e471397ef0aeab6534c83469491;hp=7e147c7e326b0d218600e590f6289f18bbe93f19

Merge branch 'master' of ssh://git.xonotic.org/xonotic
---

diff --git a/all b/all
index b88931b4..9d48c58b 100755
--- a/all
+++ b/all
@@ -240,6 +240,9 @@ case "$cmd" in
 			fi
 		done
 		;;
+	update-maps)
+		misc/tools/xonotic-map-compiler-autobuild download
+		;;
 	checkout|switch)
 		remote=$1
 		branch=$2
@@ -507,6 +510,7 @@ 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
@@ -677,10 +681,20 @@ case "$cmd" in
 				esac
 				reportecho "  Branch $ref:"
 				note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
-				if [ -n "$note" ]; then
+				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 "$base".."$ref"; git diff --color --find-copies-harder --ignore-space-change "$base"..."$ref"; } | less -r'; then
+				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
@@ -719,7 +733,7 @@ case "$cmd" in
 						fi
 					fi
 				else
-					git notes --ref "refs/notes/admin-merge" add "$ref"
+					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"
diff --git a/data/.gitignore b/data/.gitignore
index 800b2108..f4ef265a 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1 +1,2 @@
 xonotic-*.pk3dir
+*.pk3
diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 29cd9e09..5e0115a9 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -2,7 +2,7 @@
 
 set -e
 
-bspdir="$PWD/bspfiles"
+bspdir="$PWD/data"
 url=http://141.2.16.23/~xonotic/bsp-autobuilds/
 
 bspoutdir="$HOME/public_html/bsp-autobuilds/"
@@ -151,8 +151,8 @@ case "$1" in
 		;;
 	download)
 		rm -rf "$bspdir.old"
-		mv "$bspdir" "$bspdir.old" || true
-		mkdir -p "$bspdir"
+		mkdir -p "$bspdir" "$bspdir.old"
+		mv "$bspdir"/*-????????????????????????????????????????-????????????????????????????????????????.pk3 "$bspdir.old"/ || true
 		cd data/xonotic-maps.pk3dir
 		allmaps getthemap "$url" "$bspdir.old" "$bspdir"
 		echo "List of maps that got deleted (if any) and currently are in $bspdir.old:"