./all: make "push" autodetect uncommitted changes, and offer commit

[xonotic/xonotic.git] / all

diff --git a/all b/all
index da755b7d6cc2a5ee55a8daea8e8cebe8f86016f0..76263e203c698c62c2c8fffaf6283ea3c2528e5b 100755 (executable)
--- a/all
+++ b/all
@@ -2,15 +2,49 @@
 
 set -e
 
-repos="
+msg()
+{
+       echo "\e[1m$*\e[m"
+}
+
+self=`cksum "$0"`
+checkself()
+{
+       self_new=`cksum "$0"`
+       if [ x"$self" != x"$self_new" ]; then
+               msg "./all has changed."
+               if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
+                       msg "Rerunning the requested operation to make sure."
+                       export XONOTIC_FORBID_RERUN_ALL=1
+                       exec "$0" "$@"
+               else
+                       msg "Please try $0 update, and then retry your requested operation."
+                       exit 1
+               fi
+       fi
+       return 0
+}
+
+verbose()
+{
+       msg "+ $*"
+       "$@"
+}
+
+repos_urls="
        .
        data/xonotic-data.pk3dir
        data/xonotic-maps.pk3dir
        data/xonotic-music.pk3dir
        data/xonotic-nexcompat.pk3dir
        darkplaces
+       fteqcc@git://github.com/Blub/qclib.git
+       div0-gittools@git://git.icculus.org/divverent/div0-gittools.git
+       netradiant
 "
 
+repos=`for X in $repos_urls; do echo "${X%%@*}"; done`
+
 if [ "$#" = 0 ]; then
        set -- help
 fi
@@ -22,20 +56,38 @@ case "$cmd" in
        update|pull)
                base=`git config remote.origin.url`
                base=${base%xonotic.git}
-               for d in $repos; do
+               for dcomplete in $repos_urls; do
+                       case "$dcomplete" in
+                               *@*)
+                                       d=${dcomplete%%@*}
+                                       url=${dcomplete#*@}
+                                       switch=false
+                                       ;;
+                               *)
+                                       d=${dcomplete%%@*}
+                                       url=$base${d##*/}.git
+                                       switch=true
+                                       ;;
+                       esac
                        if [ -d "$d0/$d" ]; then
-                               cd "$d0/$d"
+                               verbose cd "$d0/$d"
                                case "$d" in
                                        .)
                                                ;;
                                        *)
-                                               git config remote.origin.url "$base${d##*/}.git"
+                                               if $switch; then
+                                                       verbose git config remote.origin.url "$url"
+                                               fi
                                                ;;
                                esac
-                               git pull
+                               verbose git pull
+                               cd "$d0"
+                               checkself "$0" "$@"
+                               cd "$d0/$d"
+                               verbose git remote prune origin
                                cd "$d0"
                        else
-                               git clone "$base${d##*/}.git" "$d0/$d"
+                               verbose git clone "$url" "$d0/$d"
                        fi
                done
                ;;
@@ -48,18 +100,22 @@ case "$cmd" in
                fi
                exists=false
                for d in $repos; do
-                       cd "$d0/$d"
+                       verbose cd "$d0/$d"
                        if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
                                exists=true
-                               git checkout "$branch"
+                               verbose git checkout "$branch"
                        elif git rev-parse "refs/remotes/$remote/$branch" >/dev/null 2>&1; then
                                exists=true
-                               git checkout --track -b "$branch" "$remote/$branch"
+                               verbose git checkout --track -b "$branch" "$remote/$branch"
                        else
-                               git checkout master
+                               verbose git checkout master
                        fi
                        cd "$d0"
+                       checkself "$0" "$@"
                done
+               if ! $exists; then
+                       echo "The requested branch was not found in any repository."
+               fi
                "$0" branch
                ;;
        branch)
@@ -82,12 +138,12 @@ case "$cmd" in
                                cd "$d0/$d"
                                a=
                                while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Branch in $d?"
+                                       echo "Branch in \"$d\"?"
                                        read -r a
                                done
                                if [ x"$a" = x"y" ]; then
-                                       git push "$remote" HEAD:"$branch"
-                                       git checkout --track -b "$branch" "$remote/$branch"
+                                       verbose git push "$remote" HEAD:"$branch"
+                                       verbose git checkout --track -b "$branch" "$remote/$branch"
                                fi
                                cd "$d0"
                        done
@@ -108,37 +164,45 @@ case "$cmd" in
                        r=`git symbolic-ref HEAD`
                        r=${r#refs/heads/}
                        a=
+                       if git diff HEAD | grep .; then
+                               # we have uncommitted changes
+                               while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+                                       echo "Uncommitted changes in \"$r\" in \"$d\". Commit?"
+                                       read -r a
+                               done
+                               if [ x"$a" = x"y" ]; then
+                                       verbose git commit -a
+                               fi
+                       fi
                        if git log "origin/$r".."$r" | grep .; then
                                while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Push $r in $d?"
+                                       echo "Push \"$r\" in \"$d\"?"
                                        read -r a
                                done
                                if [ x"$a" = x"y" ]; then
-                                       git push `git config "branch.$r.remote" || echo origin` HEAD
+                                       verbose git push `git config "branch.$r.remote" || echo origin` HEAD
                                fi
                        fi
                        cd "$d0"
                done
                ;;
        compile)
-               (
-                       cd data/xonotic-data.pk3dir
-                       make $MAKEFLAGS
-               ) || exit $?
-               (
-                       if [ -z "$MAKEFLAGS" ]; then
-                               if [ -f /proc/cpuinfo ]; then
-                                       ncpus=$((`grep -c '^processor   :' /proc/cpuinfo`+0))
-                                       if [ $ncpus -gt 1 ]; then
-                                               MAKEFLAGS=-j$ncpus
-                                       fi
+               if [ -z "$MAKEFLAGS" ]; then
+                       if [ -f /proc/cpuinfo ]; then
+                               ncpus=$((`grep -c '^processor   :' /proc/cpuinfo`+0))
+                               if [ $ncpus -gt 1 ]; then
+                                       MAKEFLAGS=-j$ncpus
                                fi
                        fi
-                       cd darkplaces
-                       make $MAKEFLAGS sv-debug
-                       make $MAKEFLAGS cl-debug
-                       make $MAKEFLAGS sdl-debug
-               ) || exit $?
+               fi
+               verbose cd "$d0/fteqcc"
+               verbose make $MAKEFLAGS
+               verbose cd "$d0/data/xonotic-data.pk3dir"
+               verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS
+               verbose cd "$d0/darkplaces"
+               verbose make $MAKEFLAGS sv-debug
+               verbose make $MAKEFLAGS cl-debug
+               verbose make $MAKEFLAGS sdl-debug
                ;;
        run)
                client=-sdl
@@ -160,12 +224,13 @@ case "$cmd" in
                                exit 1
                        fi
                fi
-               exec "darkplaces/darkplaces$client" -xonotic $@
+               #verbose "darkplaces/darkplaces$client" -xonotic "$@"
+               verbose "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
                ;;
-       each)
+       each|foreach)
                for d in $repos; do
-                       cd "$d0/$d"
-                       "$@"
+                       verbose cd "$d0/$d"
+                       verbose "$@"
                        cd "$d0"
                done
                ;;