X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=78102fe060bb2879ead19b201d11fcaf4f073bd8;hp=924f75e61ab2fb8cb6a077b05c733108472d7880;hb=e542b80b4bc4613a3db1fa56267c5a4a931bf163;hpb=df60018c0be76935b077f30ae8cf1bb4d155ce58

diff --git a/all b/all
index 924f75e6..78102fe0 100755
--- a/all
+++ b/all
@@ -3,9 +3,11 @@
 set -e
 
 repos="
+	.
 	data/xonotic-data.pk3dir
 	data/xonotic-maps.pk3dir
 	data/xonotic-music.pk3dir
+	data/xonotic-nexcompat.pk3dir
 	darkplaces
 "
 
@@ -17,17 +19,23 @@ shift
 
 d0=`pwd`
 case "$cmd" in
-	update)
+	update|pull)
 		base=`git config remote.origin.url`
-		base=${base%/xonotic.git}
+		base=${base%xonotic.git}
 		for d in $repos; do
 			if [ -d "$d0/$d" ]; then
 				cd "$d0/$d"
-				git config remote.origin.url "$base/${d##*/}.git"
+				case "$d" in
+					.)
+						;;
+					*)
+						git config remote.origin.url "$base${d##*/}.git"
+						;;
+				esac
 				git pull
 				cd "$d0"
 			else
-				git clone "$base/${d##*/}.git" "$d0/$d"
+				git clone "$base${d##*/}.git" "$d0/$d"
 			fi
 		done
 		;;
@@ -55,7 +63,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 +85,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 +102,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