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

diff --git a/all b/all
index b88931b4813bc5fb03d40b3ef268cb36014e1c2a..9d48c58ba6d5c38c948aeac26b577f08678146d9 100755 (executable)
--- a/all
+++ b/all
@@ -240,6 +240,9 @@ case "$cmd" in
                        fi
                done
                ;;
+       update-maps)
+               misc/tools/xonotic-map-compiler-autobuild download
+               ;;
        checkout|switch)
                remote=$1
                branch=$2
@@ -507,6 +510,7 @@ case "$cmd" in
                for T in $TARGETS; do
                        verbose make $MAKEFLAGS "$@" "$T"
                done
+               verbose "$SELF" update-maps
                ;;
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
@@ -677,10 +681,20 @@ case "$cmd" in
                                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
@@ -719,7 +733,7 @@ case "$cmd" in
                                                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 --git a/data/.gitignore b/data/.gitignore
index 800b2108999389a410324c772de4dbbafd870d09..f4ef265aa54c771382a5090fff72354b04321681 100644 (file)
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1 +1,2 @@
 xonotic-*.pk3dir
+*.pk3

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 29cd9e09115e77c296afae9a172459bceeb946e3..5e0115a960ef3b8da541ef197ee8c42a28698bf0 100755 (executable)
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -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/"
@@ -151,8 +151,8 @@ case "$1" in
                ;;
        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:"