Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic

diff --git a/all b/all
index 5db6bae96c35af01daae355f9fcb435fdfdfa9a1..1b29784dc4e9e5d8f22276ddf534a92b5ac516e9 100755 (executable)
--- a/all
+++ b/all
@@ -269,6 +269,18 @@ fix_upstream_rebase()
        if [ -z "$r_me" ] || [ -z "$r_other" ]; then
                return
        fi
+
+       # one of the two sides of the merge should be remote upstream, or all is fine
+       r_r=`git symbolic-ref HEAD`
+       r_r=${r_r#refs/heads/}
+       r_rem=`git config "branch.$r_rem.remote" || $ECHO origin`
+       r_bra=`git config "branch.$r_bra.merge" || $ECHO "$r_r"`
+       if [ x"$r_me" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
+               if [ x"$r_other" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
+                       return
+               fi
+       fi
+
        r_base=`git merge-base "$r_me" "$r_other"`
 
        # no merge-base? upstream did filter-branch
@@ -382,11 +394,11 @@ bestmirror()
                m=$pre$in$suf
                if t=`mirrorspeed "$m"`; then
                        if [ -n "$t" ]; then
-                               t=$(($t$op)) # fudge factor
-                               msg "$m -> $t ticks ($op)"
-                               if [ -z "$bestt" ] || [ "$t" -lt "$bestt" ]; then
+                               tt=$(($t$op)) # fudge factor
+                               msg "$m -> $t$op = $tt ticks"
+                               if [ -z "$bestt" ] || [ "$tt" -lt "$bestt" ]; then
                                        bestin=$in
-                                       bestt=$t
+                                       bestt=$tt
                                fi
                        else
                                msg "$m -> error"
@@ -524,12 +536,27 @@ case "$cmd" in
                        fi
                        shift
                done
+               case "$location" in
+                       current)
+                               if [ x"`git config xonotic.all.mirrorselection 2>/dev/null || true`" != x"done" ]; then
+                                       git config xonotic.all.mirrorselection done
+                                       location=best
+                               fi
+                               ;;
+               esac
                case "$location" in
                        best)
+                               # if we fetched via ssh://, switch to git:// for fetching and keep using ssh:// for pushing
+                               case "$base" in
+                                       ssh://*)
+                                               pushbase=$base
+                                               base=git://git.xonotic.org/xonotic/
+                                               ;;
+                               esac
                                newbase=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,:// .git.xonotic.org/,"`
                                case "$newbase" in
                                        *\ *)
-                                               if location=`bestmirror $newbase"xonotic.git" de us nl:'*3/2'`; then # 50% malus to the NL server to not overload it too much
+                                               if location=`bestmirror $newbase"xonotic.git" de us nl:'*6/5'`; then # 20% malus to the NL server to not overload it too much
                                                        :
                                                else
                                                        location=current

diff --git a/data/.gitignore b/data/.gitignore
index 3a9fe405da400645d421d01d407a51bd05133d7a..bc67e3be6d90adfb8806bd3134518266904cdd29 100644 (file)
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1,3 +1,7 @@
 xonotic-*.pk3dir
 *.pk3
 benchmark.log
+gfx
+maps
+scripts
+textures

diff --git a/the-big-benchmark.sh b/the-big-benchmark.sh
index 15b78e0d93562ac2996c074462e8cb80c0d7be61..1744a1adc2523457ea90858c9512ce97287ea96b 100755 (executable)
--- a/the-big-benchmark.sh
+++ b/the-big-benchmark.sh
@@ -37,7 +37,7 @@ USE_GDB=no ./all run "$@" -nohome -benchmarkruns 3 -benchmark demos/the-big-keyb
        git checkout div0-stable-pred3d9 || git checkout -t origin/div0-stable-pred3d9 || exit 1
 )
 ./all compile -r
-USE_GDB=no ./all run "$@" -nohome -benchmarkruns 3 -benchmark demos/the-big-keybench.dem +//master || true
+USE_GDB=no ./all run "$@" -nohome -benchmarkruns 3 -benchmark demos/the-big-keybench.dem +//div0-stable-pred3d9 || true
 ./all clean -r -f -u
 set +x