]> git.xonotic.org Git - xonotic/xonotic.git/blobdiff - all
rename admin-merge-2 to admin-merge, give it a branch name argument
[xonotic/xonotic.git] / all
diff --git a/all b/all
index cf7e101d3472e7fd9cf697583f5b1994d7173508..bba700ae8f0d319b2fcdb465d234baf08a319bc9 100755 (executable)
--- a/all
+++ b/all
@@ -3,6 +3,10 @@
 
 set -e
 
+# I use this in EVERY shell script ;)
+LF="
+"
+
 d00=`pwd`
 while ! [ -f ./all ]; do
        if [ x"`pwd`" = x"/" ]; then
@@ -35,23 +39,10 @@ msg()
        echo "\e[1m$*\e[m"
 }
 
-checksum()
-{
-       if [ -x /usr/bin/md5sum ]; then
-               /usr/bin/md5sum "$@"
-       elif [ -x /bin/md5sum ]; then
-               /bin/md5sum "$@"
-       elif [ -x /usr/bin/cksum ]; then
-               /usr/bin/cksum "$@"
-       else
-               echo "NOCHECKSUM"
-       fi
-}
-
-self=`checksum "$SELF"`
+self=`git hash-object "$SELF"`
 checkself()
 {
-       self_new=`checksum "$SELF"`
+       self_new=`git hash-object "$SELF"`
        if [ x"$self" != x"$self_new" ]; then
                msg "./all has changed."
                if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
@@ -101,6 +92,17 @@ check_mergeconflict()
        fi
 }
 
+yesno()
+{
+       yesno=
+       while [ x"$yesno" != x"y" -a x"$yesno" != x"n" ]; do
+               eval "$2"
+               echo "$1"
+               IFS= read -r yesno
+       done
+       [ x"$yesno" = x"y" ]
+}
+
 enter()
 {
        $2 cd "$1"
@@ -108,28 +110,44 @@ enter()
 }
 
 repos_urls="
-.                             |                                                   | master
-data/xonotic-data.pk3dir      |                                                   | master
-data/xonotic-maps.pk3dir      |                                                   | master
-data/xonotic-music.pk3dir     |                                                   | master
-data/xonotic-nexcompat.pk3dir |                                                   | master
-darkplaces                    |                                                   | div0-stable
-fteqcc                        | git://github.com/Blub/qclib.git                   | master
-div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master
-netradiant                    |                                                   | master
+.                             |                                                   | master      |
+data/xonotic-data.pk3dir      |                                                   | master      |
+data/xonotic-maps.pk3dir      |                                                   | master      |
+data/xonotic-music.pk3dir     |                                                   | master      |
+data/xonotic-nexcompat.pk3dir |                                                   | master      |
+mediasource                   |                                                   | master      |
+darkplaces                    |                                                   | div0-stable | svn
+fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
+div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master      |
+netradiant                    |                                                   | master      |
 "
 # todo: in darkplaces, change repobranch to div0-stable
 
 repos=`echo "$repos_urls" | grep . | cut -d '|' -f 1 | tr -d ' '`
 
 base=`git config remote.origin.url`
-base=${base%xonotic.git}
+case "$base" in
+       */xonotic.git)
+               base=${base%xonotic.git}
+               ;;
+       *)
+               echo "The main repo is not xonotic.git, what have you done?"
+               exit 1
+               ;;
+esac
 
 repourl()
 {
        t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
        if [ -n "$t" ]; then
-               echo "$t"
+               case "$t" in
+                       *://*)
+                               echo "$t"
+                               ;;
+                       *)
+                               echo "$base$t"
+                               ;;
+               esac
        else
                if [ x"$1" = x"." ]; then
                        echo "$base""xonotic.git"
@@ -149,9 +167,15 @@ repobranch()
        fi
 }
 
+repoflags()
+{
+       echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' '
+       echo "$t"
+}
+
 repos=`for d in $repos; do
        p="${d%dir}"
-       if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! [ -f "$p" ]; then
+       if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! { [ -f "$d.no" ] || [ -f "$p" ]; }; then
                echo "$d"
        fi
 done`
@@ -164,59 +188,85 @@ shift
 
 case "$cmd" in
        update|pull)
+               allow_pull=true
+               if [ x"$1" = x"-N" ]; then
+                       allow_pull=false
+               fi
                for d in $repos; do
                        url=`repourl "$d"`
                        branch=`repobranch "$d"`
                        if [ -d "$d0/$d" ]; then
-                               enter "$d0/$d" verbose
-                               verbose git config remote.origin.url "$url"
-                               verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-                                       # TODO remove this line later
-
-                               verbose git config core.autocrlf false
-                               verbose git config core.safecrlf false # we don't NEED that...
+                               if $allow_pull; then
+                                       enter "$d0/$d" verbose
+                                       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
-                                       if ! verbose git pull; then
-                                               check_mergeconflict "$d"
-                                               echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
-                                               read -r DUMMY
+                                       r=`git symbolic-ref HEAD`
+                                       r=${r#refs/heads/}
+                                       if git config branch.$r.remote >/dev/null 2>&1; then
+                                               if ! verbose git pull; then
+                                                       check_mergeconflict "$d"
+                                                       echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
+                                                       read -r DUMMY
+                                               fi
                                        fi
-                               fi
 
-                               cd "$d00"
-                               checkself "$cmd" "$@"
-                               cd "$d0/$d"
-                               verbose git remote prune origin
-                               cd "$d0"
+                                       cd "$d00"
+                                       checkself "$cmd" "$@"
+                                       cd "$d0/$d"
+                                       verbose git remote prune origin
+                                       cd "$d0"
+                               fi
                        else
                                verbose git clone "$url" "$d0/$d"
                                enter "$d0/$d" verbose
-                               verbose git checkout "$branch"
+                               if [ "$branch" != "master" ]; then
+                                       verbose git checkout --track -b "$branch" origin/"$branch"
+                               fi
                                cd "$d0"
                        fi
                done
                ;;
+       update-maps)
+               misc/tools/xonotic-map-compiler-autobuild download
+               ;;
        checkout|switch)
                remote=$1
                branch=$2
                if [ -z "$branch" ]; then
-                       branch=$remote
-                       remote=origin
+                       case "$remote" in
+                               origin/*)
+                                       branch=${remote#origin/}
+                                       remote=origin
+                                       ;;
+                               *)
+                                       branch=$remote
+                                       remote=origin
+                                       ;;
+                       esac
                fi
                exists=false
                for d in $repos; do
                        enter "$d0/$d" verbose
-                       if git rev-parse "refs/heads/$branch" >/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 "$branch"
-                       elif git rev-parse "refs/remotes/$remote/$branch" >/dev/null 2>&1; then
+                               verbose git checkout "$b"
+                       elif [ -n "$b" ] && git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
                                exists=true
-                               verbose git checkout --track -b "$branch" "$remote/$branch"
+                               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" "$@"
@@ -247,23 +297,20 @@ case "$cmd" in
                        for d in $repos; do
                                dv=`visible_repo_name "$d"`
                                enter "$d0/$d" verbose
-                               a=
                                if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
                                        echo "Already having this branch in $dv."
                                else
-                                       while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                               echo "Branch in $dv?"
-                                               read -r a
-                                       done
-                                       if [ x"$a" = x"y" ]; then
+                                       if yesno "Branch in $dv?"; then
                                                if [ -n "$srcbranch" ]; then
                                                        b=$srcbranch
                                                else
-                                                       b="`repobranch "$d"`"
+                                                       b=origin/"`repobranch "$d"`"
+                                                       verbose git fetch origin || true
                                                fi
                                                # TODO do this without pushing
-                                               verbose git push "$remote" "$b":"$branch"
-                                               verbose git checkout --track -b "$branch" "$remote/$branch"
+                                               verbose git checkout -b "$branch" "$b"
+                                               verbose git config "branch.$branch.remote" "$remote"
+                                               verbose git config "branch.$branch.merge" "refs/heads/$branch"
                                        fi
                                fi
                                cd "$d0"
@@ -272,35 +319,6 @@ case "$cmd" in
                fi
                ;;
        branches)
-               for d in $repos; do
-                       enter "$d0/$d"
-                       echo "In $d:"
-                       git branch -a -v -v | cut -c 3- | while read -r BRANCH REV UPSTREAM TEXT; do
-                               case "$UPSTREAM" in
-                                       \[*)
-                                               UPSTREAM=${UPSTREAM#\[}
-                                               UPSTREAM=${UPSTREAM%\]}
-                                               UPSTREAM=${UPSTREAM%:*}
-                                               ;;
-                                       *)
-                                               TEXT="$UPSTREAM $TEXT"
-                                               UPSTREAM=
-                                               ;;
-                               esac
-                               if [ x"$REV" = x"->" ]; then
-                                       continue
-                               fi
-                               BRANCH=${BRANCH#remotes/}
-                               echo -n "  $BRANCH"
-                               if [ -n "$UPSTREAM" ]; then
-                                       echo -n " (tracking $UPSTREAM)"
-                               fi
-                               #echo " $TEXT"
-                               echo
-                       done
-               done
-               ;;
-       branches_short)
                for d in $repos; do
                        cd "$d0/$d" # am in a pipe, shouldn't use enter
                        git branch -a -v -v | cut -c 3- | sed "s,^,$d ,"
@@ -309,6 +327,9 @@ case "$cmd" in
                        branches_list=
                        # branches_repos_*=
                        while read -r d BRANCH REV UPSTREAM TEXT; do
+                               if [ x"$BRANCH" = x"`repobranch "$d"`" ]; then
+                                       continue
+                               fi
                                case "$UPSTREAM" in
                                        \[*)
                                                UPSTREAM=${UPSTREAM#\[}
@@ -327,13 +348,21 @@ case "$cmd" in
                                ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
                                branches_list="$branches_list $BRANCH" # TEH SORT MAKEZ IT UNIEQ
                                eval "r=\$branches_repos_$ID"
-                               r="$r $d:$UPSTREAM"
+                               case "$UPSTREAM" in
+                                       '')
+                                               r="$r $d"
+                                               ;;
+                                       *)
+                                               r="$r $d:$UPSTREAM"
+                                               ;;
+                               esac
                                eval "branches_repos_$ID=\$r"
                        done
                        echo -n "$branches_list" | xargs -n 1 echo | sort -u | while IFS= read -r BRANCH; do
                                ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
                                eval "r=\$branches_repos_$ID"
-                               echo "$BRANCH: $r"
+                               printf "%-60s %s\n" "$BRANCH" "$r"
+                               #echo "$BRANCH: $r"
                        done
                }
                ;;
@@ -345,12 +374,7 @@ case "$cmd" in
                        r=${r#refs/heads/}
                        if git log HEAD..origin/"`repobranch "$d"`" | grep .; then
                                # we have uncommitted changes
-                               a=
-                               while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Could merge from \"`repobranch "$d"`\" into \"$r\" in $dv. Do it?"
-                                       read -r a
-                               done
-                               if [ x"$a" = x"y" ]; then
+                               if yesno "Could merge from \"`repobranch "$d"`\" into \"$r\" in $dv. Do it?"; then
                                        if ! verbose git merge origin/"`repobranch "$d"`"; then
                                                check_mergeconflict "$d"
                                                exit 1 # this should ALWAYS be fatal
@@ -367,32 +391,29 @@ case "$cmd" in
                        enter "$d0/$d" verbose
                        r=`git symbolic-ref HEAD`
                        r=${r#refs/heads/}
-                       if git diff HEAD | grep .; then
+                       diffdata=`git diff --color HEAD`
+                       if [ -n "$diffdata" ]; then
                                # we have uncommitted changes
-                               a=
-                               while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Uncommitted changes in \"$r\" in $dv. Commit?"
-                                       read -r a
-                               done
-                               if [ x"$a" = x"y" ]; then
+                               if yesno "Uncommitted changes in \"$r\" in $dv. Commit?" 'echo "$diffdata" | less -r'; then
                                        verbose git commit -a
                                fi
                        fi
                        rem=`git config "branch.$r.remote" || echo origin`
-                       if { git log "$rem/$r".."$r" || git log origin/"`repobranch "$d"`".."$r"; } | grep .; then
-                               a=
-                               while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Push \"$r\" in $dv?"
-                                       read -r a
-                               done
-                               if [ x"$a" = x"y" ]; then
+                       bra=`git config "branch.$r.merge" || echo "$r"`
+                       upstream="$rem/$bra"
+                       if ! git rev-parse "$upstream" >/dev/null 2>&1; then
+                               upstream="origin/`repobranch "$d"`"
+                       fi
+                       logdata=`git log --color "$upstream".."$r"`
+                       if [ -n "$logdata" ]; then
+                               if yesno "Push \"$r\" in $dv?" 'echo "$logdata" | less -r'; then
                                        verbose git push "$rem" HEAD
                                fi
                        fi
                        if [ x"$submit" = x"-s" ]; then
                                case "$r" in
                                        */*)
-                                               verbose git push "$rem" HEAD:"${r%%/*}/finished/${r#*/}"
+                                               verbose git push "$rem" HEAD:"${bra%%/*}/finished/${bra#*/}"
                                                ;;
                                esac
                        fi
@@ -402,6 +423,12 @@ case "$cmd" in
        compile)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        TARGETS="sv-debug cl-debug"
+                       if [ -z "$CC" ]; then
+                               export CC=gcc
+                       fi
+               elif [ x"`uname`" = x"Darwin" ] && ( [ -d /Library/Frameworks/SDL.framework ] || [ -d $(HOME)/Library/Frameworks/SDL.framework ] ); then
+                       # AGL is broken in Snow Leopard, so let's default to SDL if it is available.
+                       TARGETS="sv-debug sdl-debug"
                else
                        TARGETS="sv-debug cl-debug sdl-debug"
                fi
@@ -440,6 +467,9 @@ case "$cmd" in
                                        MAKEFLAGS="$MAKEFLAGS DP_LINK_TO_LIBJPEG=1"
                                        ;;
                        esac
+                       if [ -n "$WE_HATE_OUR_USERS" ]; then
+                               MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw"
+                       fi
                fi
                enter "$d0/fteqcc" verbose
                if $clean; then
@@ -450,6 +480,7 @@ case "$cmd" in
                if $clean; then
                        verbose make $MAKEFLAGS clean
                fi
+               verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
                verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
                enter "$d0/darkplaces" verbose
                if $clean; then
@@ -458,13 +489,17 @@ case "$cmd" in
                for T in $TARGETS; do
                        verbose make $MAKEFLAGS "$@" "$T"
                done
+               verbose "$SELF" update-maps
+               ;;
+       makebuild)
+               
                ;;
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
                        export PATH="$d0/misc/buildfiles/w32:$PATH"
                elif [ x"`uname`" = x"Darwin" ]; then
-                       export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Nexuiz.app/Contents/MacOS"
+                       export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
                        client=-sdl
                else
                        client=-sdl
@@ -488,16 +523,36 @@ case "$cmd" in
                        fi
                fi
                set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
+
+               # if pulseaudio is running: USE IT
+               if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
+                       if ps -C pulseaudio >/dev/null; then
+                               if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
+                                       export SDL_AUDIODRIVER=pulse
+                               fi
+                       fi
+               fi
+
                if [ -n "$USE_GDB" ]; then
                        set -- gdb --args "$@"
                fi
                "$@"
                ;;
        each|foreach)
+               keep_going=false
+               if [ x"$1" = x"-k" ]; then
+                       keep_going=true
+                       shift
+               fi
                for d in $repos; do
-                       enter "$d0/$d" verbose
-                       verbose "$@"
-                       cd "$d0"
+                       if verbose cd "$d0/$d"; then
+                               if $keep_going; then
+                                       verbose "$@" || true
+                               else
+                                       verbose "$@"
+                               fi
+                               cd "$d0"
+                       fi
                done
                ;;
        save-patches)
@@ -562,43 +617,269 @@ case "$cmd" in
                rm -rf "$patchdir"
                ;;
        admin-merge)
-               if [ "$#" = 1 ]; then
-                       set -- "${1%%/*}" "${1#*/}"
-               fi
+               branch=$1
+               t=`mktemp`
+               report=""
+               reportecho()
+               {
+                       report=$report"$*$LF"
+                       echo "$*"
+               }
+               reportecho4()
+               {
+                       report=$report"    $*$LF"
+                       echo "    $*"
+               }
+               reportdo4()
+               {
+                       o=`"$@" | sed 's/^/    /' || true`
+                       reportecho "$o"
+               }
                for d in $repos; do
                        enter "$d0/$d" verbose
-                       git rev-parse "$1/$2" || continue
-                       # 1. review
-                       {
-                               git log HEAD.."$1/$2"
-                               git diff HEAD..."$1/$2"
-                       } | less
-                       a=
-                       while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                               echo "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"
-                               read -r a
-                       done
-                       if [ x"$a" = x"y" ]; then
-                               git merge "$1/$2"
-                               cd "$d0"
-                               a=
-                               if ! "$SELF" compile; then
-                                       a=n
+                       base="`repobranch "$d"`"
+                       reportecho "In $d:"
+                       for ref in `git for-each-ref --format='%(refname)' refs/remotes/origin/`; do
+                               case "${ref#refs/remotes/origin/}" in
+                                       "$base")
+                                               continue
+                                               ;;
+                                       HEAD|master)
+                                               continue
+                                               ;;
+                               esac
+                               if [ -n "$branch" ]; then
+                                       if [ x"$branch" != x"${ref#refs/remotes/origin/}" ]; then
+                                               continue
+                                       fi
                                fi
-                               cd "$d0/$d"
-                               while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."
-                                       read -r a
-                               done
-                               if [ x"$a" = x"y" ]; then
-                                       git push origin HEAD
-                                       git push "$1" :"$2"
+                               reportecho "  Branch $ref:"
+                               note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
+                               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?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then
+                                       git checkout "$base"
+                                       org=`git rev-parse HEAD`
+                                       if ! git merge "$ref" 2>&1 | tee "$t"; then
+                                               git reset --hard "$org"
+                                               GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
+                                               reportdo4 cat "$t"
+                                               reportecho4 "--> merge failed"
+                                       elif ! "$SELF" compile 2>&1 | tee "$t"; then
+                                               git reset --hard "$org"
+                                               GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Compile failed:$LF`cat "$t"`" "$ref"
+                                               reportdo4 cat "$t"
+                                               reportecho4 "--> compile failed"
+                                       elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
+                                               git reset --hard "$org"
+                                               git notes edit "$ref"
+                                               note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
+                                               reportdo4 echo "$note"
+                                               reportecho4 "--> test failed"
+                                       else
+                                               case ",`repoflags "$d"`," in
+                                                       *,svn,*)
+                                                               # we do quite a mess here... luckily we know $org
+                                                               git pull # svn needs to be current
+                                                               git rebase -i --onto master "$org"
+                                                               git svn dcommit --add-author-from
+                                                               git reset --hard "$org"
+                                                               ;;
+                                                       *)
+                                                               git push origin HEAD
+                                                               ;;
+                                               esac
+                                               reportecho4 "--> MERGED"
+                                               if yesno "Delete original branch \"$ref\"?"; then
+                                                       git push origin :"${ref#refs/remotes/origin/}"
+                                                       reportecho4 "--> branch deleted"
+                                               fi
+                                       fi
                                else
-                                       git reset --hard HEAD@{1}
+                                       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"
+                                               reportecho4 "--> rejected"
+                                       else
+                                               reportecho4 "--> postponed"
+                                       fi
                                fi
+                               reportecho ""
+                       done
+                       reportecho ""
+               done
+               rm -f "$t"
+               echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
+               ;;
+
+       # release building goes here
+       release-mkdir)
+               mkdir -p Xonotic/"$1"
+               ;;
+       release-prepare)
+#"$SELF" each git clean -fxd
+               mkdir -p Xonotic
+               "$SELF" release-copy Docs/
+               "$SELF" release-copy misc/
+               "$SELF" release-copy server/
+               "$SELF" release-copy xonotic-linux-glx.sh
+               "$SELF" release-copy xonotic-linux-sdl.sh
+               "$SELF" release-mkdir data
+               "$SELF" release-mkdir fteqcc
+               ;;
+       release-copy)
+               rsync --exclude=.git -vaSHPAX "$1" Xonotic/"$1"
+               ;;
+       release-compile-run)
+               host=$1
+               buildpath=$2
+               maketargets=$3
+               makeflags=$4
+               srcdir=$5
+               targetfiles=$6
+               rsync --delete -zvaSHPAX "$srcdir"/ "$host:$buildpath/"
+               ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags"
+        for f in $targetfiles; do
+                       rsync -zvaSHPAX "$host:$buildpath/${f%:*}" "${f##*:}"
+               done
+               ;;
+       release-compile)
+               suffix=$1
+               makeflags=$2
+               fteqcc_maketargets=$3
+               fteqcc_files=$4
+               darkplaces_maketargets=$5
+               darkplaces_files=$6
+               "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "fteqcc" "$fteqcc_files"
+               "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "fteqcc" "$darkplaces_files"
+               ;;
+       release-engine-win32)
+               rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/w32/* Xonotic/
+               "$SELF" release-compile win32 \
+                       '"DP_MAKE_TARGET=mingw CC="$HOME/mingw32/bin/i386-mingw32-gcc -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dxheaders" WINDRES="$HOME/mingw32/bin/i386-mingw32-windres" SDL_CONFIG="$HOME/sdl-win32/SDL-1.2.13/bin/sdl-config"' \
+                       win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
+                       debug 'darkplaces.exe:xonotic.exe darkplaces-sdl.exe:xonotic-sdl.exe darkplaces-dedicated.exe:xonotic-dedicated.exe'
+               ;;
+       release-engine-osx)
+               rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/osx/* Xonotic/
+               "$SELF" release-compile osx \
+                       'CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"' \
+                       all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \
+                       sdl-debug 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin'
+               ;;
+       release-engine-linux32)
+               "$SELF" release-compile linux32 \
+                       'CC="gcc -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=$HOME/modplug-i386/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/jpeg7/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/jpeg7/include"' \
+                       all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
+                       debug 'darkplaces-glx:Xonotic/xonotic-linux-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux-linux32-dedicated'
+               ;;
+       release-engine-linux64)
+               "$SELF" release-compile linux64 \
+                       'CC="gcc -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=$HOME/modplug-x86_64/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/jpeg7/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/jpeg7/include"' \
+                       all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \
+                       debug 'darkplaces-glx:Xonotic/xonotic-linux-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux-linux64-dedicated'
+               ;;
+       release-engine)
+               "$SELF" release-engine-win32
+               "$SELF" release-engine-osx
+               "$SELF" release-engine-linux32
+               "$SELF" release-engine-linux64
+               ;;
+       release-maps)
+               "$SELF" update-maps
+               for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
+                       if [ -f "$X" ]; then
+                               cd Xonotic/data/xonotic-maps.pk3dir
+                               unzip ../../../"$X"
+                               cd ../../..
                        fi
                done
                ;;
+       release-finish)
+               # version numnber and stuff like that
+               ;;
+       release-buildpk3-transform-raw)
+               dir=$1
+               ;;
+       release-buildpk3-transform-normal)
+               dir=$1
+               cd "$dir"
+               # texture: convert to jpeg and dds
+               export do_jpeg=true
+               export jpeg_qual_rgb=95
+               export jpeg_qual_a=99
+               export do_dds=true
+               export dds_flags=
+               export do_ogg=false
+               find textures -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
+               ;;
+       release-buildpk3-transform-low)
+               dir=$1
+               cd "$dir"
+               # texture: convert to jpeg and dds
+               # music: reduce bitrate
+               export do_jpeg=true
+               export jpeg_qual_rgb=95
+               export jpeg_qual_a=99
+               export do_dds=false
+               export do_ogg=true
+               export ogg_qual=1
+               find textures sound/cdtracks -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
+               ;;
+       release-buildpk3)
+               src=$1
+               dst=$2
+               transform=$3
+               case "$dst" in
+                       /*)
+                               ;;
+                       */)
+                               dst="$PWD/$dst"
+                               ;;
+               esac
+               rm -rf Xonotic/temp
+               rsync --exclude=.git -vaSHPAX "$src"/ "Xonotic/temp"
+               "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
+               cd Xonotic/temp
+               zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
+               cd ../..
+               rm -rf Xonotic/temp
+               ;;
+       release-buildpk3s)
+               src=$1
+               shift
+               while [ "$#" -gt 1 ]; do
+                       "$SELF" release-buildpk3 "$src" "Xonotic/${src%.pk3dir}$2.pk3" "$1"
+                       shift
+                       shift
+               done
+               ;;
+       release-pack)
+               "$SELF" release-buildpk3s data/font-dejavu.pk3dir                  raw ''
+               "$SELF" release-buildpk3s data/xonotic-data.pk3dir       normal '' raw '-raw' low '-low'
+               "$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal '' raw '-raw' low '-low'
+               "$SELF" release-buildpk3s data/xonotic-music.pk3dir      normal '' raw '-raw' low '-low'
+               "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                       low ''
+               ;;
+       release)
+               "$SELF" release-prepare
+               "$SELF" release-maps
+               "$SELF" release-finish
+               "$SELF" release-pack
+               "$SELF" release-engine
+               ;;
        *)
                echo "Usage:"
                echo "  $SELF pull"