fix another bug in the script ;)

[xonotic/xonotic.git] / all

diff --git a/all b/all
index d7967467b65057b6111c237fba7c74cdba218ec4..c912afa02533670096b8e41374c105e2bb3a738f 100755 (executable)
--- a/all
+++ b/all
@@ -269,6 +269,19 @@ 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"`
+       r_bra=${r_bra#refs/heads/}
+       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
@@ -368,15 +381,28 @@ bestmirror()
 
        bestin=
        bestt=
-       for in in "$@"; do
+       for mir in "$@"; do
+               case "$mir" in
+                       *:*)
+                               in=${mir%%:*}
+                               op=${mir#*:}
+                               ;;
+                       *)
+                               in=$mir
+                               op=
+                               ;;
+               esac
                m=$pre$in$suf
                if t=`mirrorspeed "$m"`; then
-                       msg "$m -> $t ticks"
                        if [ -n "$t" ]; then
-                               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"
                        fi
                else
                        msg "$m -> FAIL"
@@ -489,6 +515,7 @@ case "$cmd" in
                                case "$2" in
                                        nl) ;;
                                        de) ;;
+                                       us) ;;
                                        best) ;;
                                        default) ;;
                                        *)
@@ -496,6 +523,7 @@ case "$cmd" in
                                                msg "Possible locations for the -l option:"
                                                msg "  nl (Netherlands, run by merlijn)"
                                                msg "  de (Germany, run by divVerent)"
+                                               msg "  us (United States of America, run by detrate)"
                                                msg "  best (find automatically)"
                                                msg "  default (currently nl)"
                                                exit 1
@@ -509,12 +537,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 nl`; then
+                                               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