From: Rudolf Polzer 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: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=a543153ec5024e471397ef0aeab6534c83469491;hp=-c Merge branch 'master' of ssh://git.xonotic.org/xonotic --- a543153ec5024e471397ef0aeab6534c83469491 diff --combined all index 1aaef603,b88931b4..9d48c58b --- a/all +++ b/all @@@ -240,9 -240,6 +240,9 @@@ case "$cmd" i fi done ;; + update-maps) + misc/tools/xonotic-map-compiler-autobuild download + ;; checkout|switch) remote=$1 branch=$2 @@@ -253,19 -250,25 +253,25 @@@ exists=false for d in $repos; do enter "$d0/$d" verbose - if [ -z "$branch" ]; then - b=`repobranch "$d"` - else - b=$branch - fi - if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then + b=$branch + if [ -n "$b" ] && git rev-parse "refs/heads/$b" >/dev/null 2>&1; then exists=true verbose git checkout "$b" - elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then + elif [ -n "$b" ] && git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then exists=true verbose git checkout --track -b "$b" "$remote/$b" else - verbose git checkout "`repobranch "$d"`" + b=`repobranch "$d"` + if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then + exists=true + verbose git checkout "$b" + elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then + exists=true + verbose git checkout --track -b "$b" "$remote/$b" + else + echo "WTF? Not even branch $b doesn't exist in $d" + exit 1 + fi fi cd "$d00" checkself "$cmd" "$@" @@@ -504,7 -507,6 +510,7 @@@ for T in $TARGETS; do verbose make $MAKEFLAGS "$@" "$T" done + verbose "$SELF" update-maps ;; run) if [ -n "$WE_HATE_OUR_USERS" ]; then @@@ -675,20 -677,10 +681,20 @@@ 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 @@@ -727,7 -719,7 +733,7 @@@ 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 --combined misc/tools/xonotic-map-compiler-autobuild index d0ef82e2,29cd9e09..5e0115a9 --- a/misc/tools/xonotic-map-compiler-autobuild +++ b/misc/tools/xonotic-map-compiler-autobuild @@@ -2,7 -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/" @@@ -23,11 -23,83 +23,83 @@@ allmaps( done } + log2spam() + { + map=$1 + url=$2 + branch=$3 + hash=$4 + + branch=${branch##refs/heads/} + branch=${branch##refs/remotes/} + branch=${branch##origin/} + + s_time= + s_samplesize= + s_failshaders= + s_leaked= + s_error= + + while IFS= read -r L; do + case "$L" in + *\ seconds\ elapsed) + s_time=$(($s_time + ${L%% seconds elapsed})) + ;; + WARNING:\ surface\ at\ *\ too\ large\ for\ desired\ samplesize*) + s=${L##* } + if [ -z "$s_samplesize" ] || [ "$s" -gt "$s_samplesize" ]; then + s_samplesize=$s + fi + ;; + WARNING:\ Couldn\'t\ find\ image\ for\ shader\ textures/NULL) + # radiant stupid + ;; + WARNING:\ Couldn\'t\ find\ image\ for\ shader\ *) + s_failshaders="$s_failshaders ${L##* }" + ;; + '******* leaked *******') + s_leaked=1 + ;; + '************ ERROR ************') + IFS= read -r s_error + ;; + esac + done + s_failshaders=`echo "$s_failshaders" | sed "s, textures/, ,g"` + s_failshaders=${s_failshaders# } + if [ -n "$s_error" ]; then + echo -n "[$branch] 4failed" + else + echo -n "[$branch] finished" + fi + echo -n " map compile of $map ($url): $s_time sec" + if [ -n "$s_samplesize" ]; then + echo -n ", FIX samplesize >= $s_samplesize" + fi + if [ -n "$s_failshaders" ]; then + if [ -n "`echo "$s_failshaders" | cut -d ' ' -f 4-`" ]; then + s_failshaders="`echo "$s_failshaders" | cut -d ' ' -f 1-3`..." + fi + echo -n ", FIX shaders $s_failshaders" + fi + if [ -n "$s_leaked" ]; then + echo -n ", FIX LEAK" + fi + if [ -n "$s_error" ]; then + s_error=`echo "$s_error" | sed "s,$PWD/\?,,g"` + echo -n ", ERROR: $s_error" + fi + echo + } + buildthemap() { - bspdir=$1 - M=$2 - blobhash=$3 + REFNAME=$1 + HASH=$2 + url=$3 + bspdir=$4 + M=$5 + blobhash=$6 if [ -f "$bspdir/$M-$blobhash.pk3" ]; then continue fi @@@ -37,6 -109,9 +109,9 @@@ ) zip -9r "$bspdir/$M-$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "maps/$M/" "maps/$M.lin" "gfx/${M}_mini.tga" ln -snf "../$M-$blobhash.pk3" "$bspdir/latest/$M.pk3" # from ALL branches, so beware! + if [ -n "$IRCSPAM" ]; then + cat "maps/$M.log" | log2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" | $IRCSPAM + fi } getthemap() @@@ -70,14 -145,14 +145,14 @@@ case "$1" i git reset --hard git clean -xfd git checkout "$HASH" - allmaps buildthemap "$bspoutdir" + allmaps buildthemap "$REFNAME" "$HASH" "$url" "$bspoutdir" done git checkout master ;; 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:" @@@ -87,6 -162,9 +162,9 @@@ mkdir -p "$bspdir" cd "$bspdir" rm -f *-????????????????????????????????????????-????????????????????????????????????????.pk3 - wget -r -l1 -A "*.pk3" -N --no-parent --no-directories "$url/latest" + wget -r -l1 -A "*.pk3" -N --no-parent --no-directories "$url""latest" + ;; + log2spam-test) + log2spam "mapname" "http://mapurl" "branch" "commit" ;; esac