X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=338967a7e998281f6e47c88f6823ba278dbb8b69;hp=3e372b8557f8b1f607b6609dbf52f82fe88791c8;hb=ca76086bfdfc713ecded00f8e4c7fa6d0cdc49a2;hpb=2cc90fbfe0604eab702c024c3d93a868f712fc36

diff --git a/all b/all
index 3e372b85..338967a7 100755
--- a/all
+++ b/all
@@ -120,7 +120,7 @@ div0-gittools                 |
 d0_blind_id                   |                                                   | master         |
 data/xonotic-maps.pk3dir      |                                                   | master         |
 mediasource                   |                                                   | master         | no
-fteqcc                        |                                                   | xonotic-stable |
+fteqcc                        |                                                   | xonotic-stable | noautocrlf
 "
 # todo: in darkplaces, change repobranch to div0-stable
 
@@ -308,7 +308,14 @@ fix_git_config()
 		verbose git config --unset remote.origin.pushurl || true
 	fi
 	verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-	verbose git config core.autocrlf input
+	case ",`repoflags "$d"`," in
+		*,noautocrlf,*)
+			verbose git config --unset core.autocrlf || true
+			;;
+		*)
+			verbose git config core.autocrlf input
+			;;
+	esac
 	if [ -z "`git config push.default || true`" ]; then
 		verbose git config push.default current # or is tracking better?
 	fi
@@ -332,6 +339,39 @@ mkzip0()
 	zip -0y "$@"
 }
 
+mirrorspeed()
+{
+	# first result is to be ignored, but we use it to check status
+	git ls-remote "$1" refs/heads/master >/dev/null 2>&1 || return 1
+	{ time -p git ls-remote "$1" refs/heads/master; } 2>&1 >/dev/null | head -n 1 | cut -d ' ' -f 2 | tr -d . | sed 's,^0*,,'
+		# unit: clock ticks (depends on what "time" returns
+}
+
+bestmirror()
+{
+	pre=$1; shift
+	suf=$1; shift
+
+	bestin=
+	bestt=
+	for in in "$@"; do
+		m=$pre$in$suf
+		if t=`mirrorspeed "$m"`; then
+			msg "$m -> $t ticks"
+			if [ -n "$t" ]; then
+				if [ -z "$bestt" ] || [ "$t" -lt "$bestt" ]; then
+					bestin=$in
+					bestt=$t
+				fi
+			fi
+		else
+			msg "$m -> FAIL"
+		fi
+	done
+	msg "Best mirror seems to be $pre$bestin$suf"
+	echo "$bestin"
+}
+
 case "$cmd" in
 	fix_upstream_rebase)
 		for d in $repos; do
@@ -431,12 +471,14 @@ case "$cmd" in
 				case "$2" in
 					nl) ;;
 					de) ;;
+					best) ;;
 					default) ;;
 					*)
 						msg "Invalid location!"
 						msg "Possible locations for the -l option:"
 						msg "  nl (Netherlands, run by merlijn)"
 						msg "  de (Germany, run by divVerent)"
+						msg "  best (find automatically)"
 						msg "  default (currently nl)"
 						exit 1
 						;;
@@ -464,6 +506,17 @@ case "$cmd" in
 						;;
 				esac
 				;;
+			best)
+				base=`echo "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,:// .git.xonotic.org/,"`
+				case "$base" in
+					*\ *)
+						location=`bestmirror $base"xonotic.git" de nl`
+						;;
+					*)
+						location=
+						;;
+				esac
+				;;
 		esac
 		if [ -n "$location" ]; then
 			base=`echo "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,://$location.git.xonotic.org/,"`
@@ -1039,6 +1092,12 @@ case "$cmd" in
 			reportecho "$o"
 		}
 		for d in $repos; do
+			case "$d" in
+				fteqcc)
+					# sorry, fteqcc repo is managed manually
+					continue
+					;;
+			esac
 			enter "$d0/$d" verbose
 			base="`repobranch "$d"`"
 			reportecho "In $d:"
@@ -1122,6 +1181,11 @@ case "$cmd" in
 								reportecho4 "--> test failed, postponed"
 							fi
 						else
+							# apply crlf, or other cleanup filters (non-behavioural changes)
+							git reset --hard
+							find . -type f -exec touch {} \;
+							git commit -a --amend -C HEAD || true # don't fail if nothing to commit
+
 							echo "MERGING"
 							case ",`repoflags "$d"`," in
 								*,svn,*)
@@ -1203,8 +1267,21 @@ case "$cmd" in
 				rmuntracked=true
 			elif [ x"$X" = x"-D" ]; then
 				killbranches=true
+			elif echo "$X" | grep '^-FFFF*UUUU*$' >/dev/null; then
+				msg ''
+				msg '        _____'
+				msg '    ,--'\''-\\P/`\\  FFFFFFF'
+				msg ' __/_    B/,-.\\  FFFFFFF'
+				msg ' /  _\\  (//  O\\\\  FFFFFF'
+				msg '| (O  `) _\\._ _)\\  FFFUU'
+				msg '| |___/.^d0~~"\\  \\ UUUU'
+				msg '|     |`~'\''     \\ |  UUUU'
+				msg '|     |    __,C>|| UUUU'
+				msg '\\    /_ ,-/,-'\''   |  UUUU'
+				msg ' \\\\_ \\_>~'\''      /  UUUU-'
+				msg ''
 			else
-				break
+				msg "Unknown arg: $X"
 			fi
 			found=true
 			shift
@@ -1527,7 +1604,7 @@ case "$cmd" in
 		# music: reduce bitrate
 		verbose export do_jpeg=true
 		verbose export jpeg_qual_rgb=80
-		verbose export jpeg_qual_a=99
+		verbose export jpeg_qual_a=97
 		verbose export do_dds=false
 		verbose export do_ogg=true
 		verbose export ogg_qual=1