make ./all push work

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 924f75e61ab2fb8cb6a077b05c733108472d7880..5d801ebe81e61dcaad5cb0d5dd9a43ecd0c70faf 100755 (executable)
--- a/all
+++ b/all
@@ -3,6 +3,7 @@
 set -e
 
 repos="
+       .
        data/xonotic-data.pk3dir
        data/xonotic-maps.pk3dir
        data/xonotic-music.pk3dir
@@ -17,7 +18,7 @@ shift
 
 d0=`pwd`
 case "$cmd" in
-       update)
+       update|pull)
                base=`git config remote.origin.url`
                base=${base%/xonotic.git}
                for d in $repos; do
@@ -55,7 +56,13 @@ case "$cmd" in
                "$0" branch
                ;;
        branch)
-               if [ $# = 0 ]; then
+               remote=$1
+               branch=$2
+               if [ -z "$branch" ]; then
+                       branch=$remote
+                       remote=origin
+               fi
+               if [ -z "$branch" ]; then
                        for d in $repos; do
                                cd "$d0/$d"
                                r=`git symbolic-ref HEAD`
@@ -71,8 +78,9 @@ case "$cmd" in
                                        echo "Branch in $d?"
                                        read -r a
                                done
-                               if [ x"$a" = "y" ]; then
-                                       git branch "$1"
+                               if [ x"$a" = x"y" ]; then
+                                       git push "$remote" HEAD:"$branch"
+                                       git checkout --track -b "$branch" "$remote/$branch"
                                fi
                                cd "$d0"
                        done
@@ -87,11 +95,30 @@ case "$cmd" in
                        cd "$d0"
                done
                ;;
+       push)
+               for d in $repos; do
+                       cd "$d0/$d"
+                       r=`git symbolic-ref HEAD`
+                       r=${r#refs/heads/}
+                       a=
+                       if git log "origin/$r".."$r" | grep .; then
+                               while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+                                       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
+                               fi
+                       fi
+                       cd "$d0"
+               done
+               ;;
        *)
                echo "Usage:"
-               echo "  $0 update"
-               echo "  $0 branch"
+               echo "  $0 pull"
+               echo "  $0 push"
                echo "  $0 branches"
+               echo "  $0 branch"
                echo "  $0 checkout"
                ;;
 esac