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

diff --git a/all b/all
index 607db5634d0ca4de99e18b7aa918e97fa1922661..be7c976af7bb84c355a2baab43547f4790e3dc92 100755 (executable)
--- a/all
+++ b/all
@@ -134,6 +134,18 @@ case "$base" in
                exit 1
                ;;
 esac
+pushbase=`git config remote.origin.pushurl || true`
+case "$pushbase" in
+       */xonotic.git)
+               pushbase=${pushbase%xonotic.git}
+               ;;
+       '')
+               ;;
+       *)
+               echo "The main repo is not xonotic.git, what have you done?"
+               exit 1
+               ;;
+esac
 
 repourl()
 {
@@ -156,6 +168,27 @@ repourl()
        fi
 }
 
+repopushurl()
+{
+       [ -n "$pushbase" ] || return 0
+       repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
+       if [ -n "$repo_t" ]; then
+               case "$repo_t" in
+                       *://*)
+                               ;;
+                       *)
+                               echo "$pushbase$repo_t"
+                               ;;
+               esac
+       else
+               if [ x"$1" = x"." ]; then
+                       echo "$pushbase""xonotic.git"
+               else
+                       echo "$pushbase${1##*/}.git"
+               fi
+       fi
+}
+
 repobranch()
 {
        repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
@@ -266,6 +299,13 @@ fix_upstream_rebase_mergefail()
 
 fix_git_config()
 {
+       verbose git config remote.origin.url "$1"
+       if [ -n "$2" ]; then
+               verbose git config remote.origin.pushurl "$2"
+       else
+               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
        if [ -z "`git config push.default`" ]; then
                verbose git config push.default current # or is tracking better?
@@ -295,20 +335,33 @@ case "$cmd" in
                        verbose fix_upstream_rebase_mergefail && verbose fix_upstream_rebase_mergeok
                done
                ;;
+       fix_config)
+               for d in $repos; do
+                       url=`repourl "$d"`
+                       pushurl=`repopushurl "$d"`
+                       branch=`repobranch "$d"`
+                       if [ -d "$d0/$d" ]; then
+                               enter "$d0/$d" verbose
+                               fix_git_config "$url" "$pushurl"
+                               cd "$d0"
+                       fi
+               done
+               ;;
        update|pull)
                allow_pull=true
                if [ x"$1" = x"-N" ]; then
                        allow_pull=false
                fi
+               if $allow_pull; then
+                       "$SELF" fix_config
+               fi
                for d in $repos; do
                        url=`repourl "$d"`
+                       pushurl=`repopushurl "$d"`
                        branch=`repobranch "$d"`
                        if [ -d "$d0/$d" ]; then
                                if $allow_pull; then
                                        enter "$d0/$d" verbose
-                                       fix_git_config
-                                       verbose git config remote.origin.url "$url"
-                                       verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
                                        r=`git symbolic-ref HEAD`
                                        r=${r#refs/heads/}
                                        if git config branch.$r.remote >/dev/null 2>&1; then
@@ -331,7 +384,7 @@ case "$cmd" in
                        else
                                verbose git clone "$url" "$d0/$d"
                                enter "$d0/$d" verbose
-                               fix_git_config
+                               fix_git_config "$url" "$pushurl"
                                if [ "$branch" != "master" ]; then
                                        verbose git checkout --track -b "$branch" origin/"$branch"
                                fi
@@ -910,6 +963,8 @@ case "$cmd" in
                echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
                ;;
        clean)
+               "$SELF" fix_config
+               "$SELF" update -N
                force=false
                gotoupstream=false
                fetchupstream=false

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index d7bf5864a212a5e3cf323874f9e67d01509622fb..e11b4576fa74441ef46f9d49668c5dadb3ee8a1a 100755 (executable)
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -41,7 +41,7 @@ cached()
        if ! $flag; then
                return 0
        fi
-       sleep 0.25
+       #sleep 0.25
        if [ x"$infile1" = x"$outfile1" ]; then
                keep=true
        fi

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 390b82d1d8ff37daf49bf2b94853497b87e8dd8e..1194ee093db895bbb9f6205d790a2b1c030456c6 100755 (executable)
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -14,17 +14,27 @@ getthemap_fail=false
 
 allmaps()
 {
-       for F in maps/*.map.options; do
-               if ! [ -f "$F" ]; then
-                       continue
-               fi
-               if ! [ -f "${F%.options}" ]; then
-                       continue
-               fi
-               M=${F#maps/}
-               M=${M%.map.options}
-               blobhash=`git ls-files -s -- "$F" | cut -d ' ' -f 2`-`git ls-files -s -- "${F%.options}" | cut -d ' ' -f 2`
-               "$@" "$M" "$blobhash"
+       commithash=$1
+       shift
+       for F in `git show "${commithash}:maps/"`; do
+               case "$F" in
+                       *.map.options)
+                               ;;
+                       *)
+                               continue
+                               ;;
+               esac
+               M=${F%.map.options}
+               blobhash=`git rev-parse --revs-only "${commithash}:maps/$M.map.options" || true`-`git rev-parse --revs-only "${commithash}:maps/$M.map" || true`
+               case "$blobhash" in
+                       -*)
+                               ;;
+                       *-)
+                               ;;
+                       *)
+                               "$@" "$M" "$blobhash" "$commithash"
+                               ;;
+               esac
        done
 }
 
@@ -144,15 +154,20 @@ log2spam()
 buildthemap()
 {
        REFNAME=$1
-       HASH=$2
-       url=$3
-       M=$4
-       blobhash=$5
+       url=$2
+       M=$3
+       blobhash=$4
+       commithash=$5
        if HEAD "$url$M-$blobhash.pk3"; then
                continue
        fi
+
+       git reset --hard
+       git clean -xfd
+       git checkout -f "$commithash"
+
        if [ -n "$IRCSPAM" ]; then
-               pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" | $IRCSPAM
+               pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" | $IRCSPAM
        fi
        t0=`date +%s`
        (
@@ -169,7 +184,7 @@ buildthemap()
        dt=$(($t1 - $t0))
        status=$?
        if [ -n "$IRCSPAM" ]; then
-               cat "maps/$M.log" | log2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" "$status" "$dt" > "maps/$M.irc"
+               cat "maps/$M.log" | log2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" "$status" "$dt" > "maps/$M.irc"
        fi
        zip -9r "$M-$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "maps/$M.irc" "maps/$M/" "maps/$M.lin" "gfx/${M}_mini.tga"
        ln -snf "../$M-$blobhash.pk3" "$M.pk3" # from ALL branches, so beware!
@@ -186,13 +201,14 @@ buildthemap()
 screenshotthemap()
 {
        REFNAME=$1
-       HASH=$2
-       url=$3
-       M=$4
-       blobhash=$5
+       url=$2
+       M=$3
+       blobhash=$4
+       commithash=$5
        if HEAD "$url$M-$blobhash/"; then
                continue
        fi
+
        rm -rf ~/.xonotic
        (
                cd ../..
@@ -204,14 +220,14 @@ screenshotthemap()
        )
        if ! mv ~/.xonotic/data/screenshots "$M-$blobhash"; then
                if [ -n "$IRCSPAM" ]; then
-                       #ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" 1 > "maps/$M.ircss"
-                       ss2spam "$M" "$url?d" "$REFNAME" "$HASH" 1 > "maps/$M.ircss"
+                       #ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$commithash" 1 > "maps/$M.ircss"
+                       ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 1 > "maps/$M.ircss"
                fi
                return 1
        fi
        if [ -n "$IRCSPAM" ]; then
-               #ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" 0 > "maps/$M.ircss"
-               ss2spam "$M" "$url?d" "$REFNAME" "$HASH" 0 > "maps/$M.ircss"
+               #ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$commithash" 0 > "maps/$M.ircss"
+               ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 0 > "maps/$M.ircss"
        fi
        chmod 1777 "$M-$blobhash"
        ln -snf "../$M-$blobhash" "$M" # from ALL branches, so beware!
@@ -229,6 +245,7 @@ getthemap()
        bspdir=$3
        M=$4
        blobhash=$5
+       commithash=$6
        if mv "$bspdir_old/$M-$blobhash.pk3" "$bspdir/$M-$blobhash.pk3"; then
                continue
        fi
@@ -248,69 +265,86 @@ getthemap()
        fi
 }
 
+indexthemap()
+{
+       REFNAME=$1
+       M=$2
+       blobhash=$3
+       commithash=$4
+       echo "$M $blobhash $commithash $REFNAME"
+}
+
+rundownload()
+{
+       mkdir -p "$bspdir" "$bspdir.old"
+       for b in "$bspdir"/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
+               if [ -e "$b" ]; then
+                       mv "$b" "$bspdir.old"/
+               fi
+       done
+       allmaps "HEAD" getthemap "$url_http" "$bspdir.old" "$bspdir"
+}
+
+branches()
+{
+       git for-each-ref 'refs/remotes' | grep -vE '    refs/remotes/([^/]*/HEAD|.*/archived/.*)$'
+}
+
+runmakeindex()
+{
+       cd data/xonotic-maps.pk3dir
+       branches | while read -r HASH TYPE REFNAME; do
+               allmaps "$HASH" indexthemap "$REFNAME"
+       done
+       cd ../..
+}
+
 case "$1" in
        build)
                cd data/xonotic-maps.pk3dir
-               git for-each-ref 'refs/remotes' | while read -r HASH TYPE REFNAME; do
-                       case "$REFNAME" in
-                               */archived/*)
-                                       continue
-                                       ;;
-                       esac
+               branches | while read -r HASH TYPE REFNAME; do
                        if [ -f "$build_cachedir/$HASH" ]; then
                                continue
                        fi
-                       git reset --hard
-                       git clean -xfd
-                       git checkout -f "$HASH"
-                       allmaps buildthemap "$REFNAME" "$HASH" "$url_http"
+                       allmaps "$HASH" buildthemap "$REFNAME" "$url_http"
                        touch "$build_cachedir/$HASH"
                done
                git checkout -f master
                ;;
        screenshot)
+               runmakeindex > "branches.idx.new"
+               rsync -vaSHP "branches.idx.new" "$url_ssh""branches.idx.new"
+               rm -f "branches.idx.new"
                cd data/xonotic-maps.pk3dir
-               git for-each-ref 'refs/remotes' | while read -r HASH TYPE REFNAME; do
-                       case "$REFNAME" in
-                               */archived/*)
-                                       continue
-                                       ;;
-                       esac
+               branches | while read -r HASH TYPE REFNAME; do
                        if [ -f "$screenshot_cachedir/$HASH" ]; then
                                continue
                        fi
+
                        git reset --hard
                        git clean -xfd
                        git checkout -f "$HASH"
 
-                       cd ../..
-                       mkdir -p "$bspdir" "$bspdir.old"
-                       for b in "$bspdir"/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
-                               if [ -e "$b" ]; then
-                                       mv "$b" "$bspdir.old"/
-                               fi
-                       done
-                       cd data/xonotic-maps.pk3dir
-                       allmaps getthemap "$url_http" "$bspdir.old" "$bspdir"
-
-                       if ! $getthemap_fail; then
-                               allmaps screenshotthemap "$REFNAME" "$HASH" "$url_http"
-                               touch "$screenshot_cachedir/$HASH"
+                       rundownload
+                       if $getthemap_fail; then
+                               continue
                        fi
+
+                       allmaps "$HASH" screenshotthemap "$REFNAME" "$url_http"
+
+                       touch "$screenshot_cachedir/$HASH"
                done
                git checkout -f master
                ;;
+       makeindex)
+               runmakeindex
+               ;;
        download)
-               mkdir -p "$bspdir" "$bspdir.old"
-               for b in "$bspdir"/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
-                       if [ -e "$b" ]; then
-                               mv "$b" "$bspdir.old"/
-                       fi
-               done
                cd data/xonotic-maps.pk3dir
-               allmaps getthemap "$url_http" "$bspdir.old" "$bspdir"
+               rundownload
+               cd ../..
                echo "List of maps that got deleted (if any) and currently are in $bspdir.old:"
-               ls -l "$bspdir.old"
+               ls -l "$bspdir.old" || true
                ;;
        download-latest)
                mkdir -p "$bspdir"