X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=c1a830f750343884c60982b16864fdbb3fa8bbd7;hp=72601766d029ec3c37dd8126ec4300721ec6a2a6;hb=9c652378468e8b2dc7010764c7b6091a6f04ae0d;hpb=3db1a9351091e06b89427f5d4f7c6dc408ae80c1

diff --git a/all b/all
index 72601766..c1a830f7 100755
--- a/all
+++ b/all
@@ -18,7 +18,7 @@ SELF="$d0/all"
 case "$0" in
 	all|*/all)
 		case "`uname`" in
-			MINGW*)
+			MINGW*|Win*)
 				# Windows hates users. So this script has to copy itself elsewhere first...
 				tname=
 				cp "$SELF" ../all.xonotic.sh
@@ -101,7 +101,7 @@ check_mergeconflict()
 
 enter()
 {
-	verbose cd "$1"
+	$2 cd "$1"
 	check_mergeconflict "$1"
 }
 
@@ -143,7 +143,7 @@ case "$cmd" in
 					;;
 			esac
 			if [ -d "$d0/$d" ]; then
-				enter "$d0/$d"
+				enter "$d0/$d" verbose
 				case "$d" in
 					.)
 						;;
@@ -153,10 +153,17 @@ case "$cmd" in
 						fi
 						;;
 				esac
-				if ! verbose git pull; then
-					check_mergeconflict "$d"
-					# do not exit, as this may also mean we are tracking something else
+				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"
+						exit 1 # FATAL
+					fi
 				fi
+
 				cd "$d00"
 				checkself "$cmd" "$@"
 				cd "$d0/$d"
@@ -176,7 +183,7 @@ case "$cmd" in
 		fi
 		exists=false
 		for d in $repos; do
-			enter "$d0/$d"
+			enter "$d0/$d" verbose
 			if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
 				exists=true
 				verbose git checkout "$branch"
@@ -198,10 +205,14 @@ case "$cmd" in
 	branch)
 		remote=$1
 		branch=$2
+		srcbranch=$3
 		if [ -z "$branch" ]; then
 			branch=$remote
 			remote=origin
 		fi
+		if [ -z "$srcbranch" ]; then
+			srcbranch=master
+		fi
 		if [ -z "$branch" ]; then
 			for d in $repos; do
 				enter "$d0/$d"
@@ -213,14 +224,14 @@ case "$cmd" in
 		else
 			for d in $repos; do
 				dv=`visible_repo_name "$d"`
-				enter "$d0/$d"
+				enter "$d0/$d" verbose
 				a=
 				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
-					verbose git push "$remote" HEAD:"$branch"
+					verbose git push "$remote" "$srcbranch":"$branch"
 					verbose git checkout --track -b "$branch" "$remote/$branch"
 				fi
 				cd "$d0"
@@ -232,14 +243,35 @@ case "$cmd" in
 		for d in $repos; do
 			enter "$d0/$d"
 			echo "In $d:"
-			git branch -a | sed 's/^/  /; /->/d'
-			cd "$d0"
+			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
 		;;
 	merge)
 		for d in $repos; do
 			dv=`visible_repo_name "$d"`
-			enter "$d0/$d"
+			enter "$d0/$d" verbose
 			r=`git symbolic-ref HEAD`
 			r=${r#refs/heads/}
 			if git log HEAD..origin/master | grep .; then
@@ -259,10 +291,10 @@ case "$cmd" in
 			cd "$d0"
 		done
 		;;
-	push)
+	push|commit)
 		for d in $repos; do
 			dv=`visible_repo_name "$d"`
-			enter "$d0/$d"
+			enter "$d0/$d" verbose
 			r=`git symbolic-ref HEAD`
 			r=${r#refs/heads/}
 			if git diff HEAD | grep .; then
@@ -298,11 +330,11 @@ case "$cmd" in
 				fi
 			fi
 		fi
-		enter "$d0/fteqcc"
+		enter "$d0/fteqcc" verbose
 		verbose make $MAKEFLAGS
-		enter "$d0/data/xonotic-data.pk3dir"
+		enter "$d0/data/xonotic-data.pk3dir" verbose
 		verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS
-		enter "$d0/darkplaces"
+		enter "$d0/darkplaces" verbose
 		verbose make $MAKEFLAGS sv-debug
 		verbose make $MAKEFLAGS cl-debug
 		verbose make $MAKEFLAGS sdl-debug
@@ -332,11 +364,72 @@ case "$cmd" in
 		;;
 	each|foreach)
 		for d in $repos; do
-			enter "$d0/$d"
+			enter "$d0/$d" verbose
 			verbose "$@"
 			cd "$d0"
 		done
 		;;
+	save-patches)
+		outfile=$1
+		patchdir=`mktemp -d -t save-patches.XXXXXX`
+		for d in $repos; do
+			enter "$d0/$d" verbose
+			git branch -v -v | cut -c 3- | {
+				i=0
+				while read -r BRANCH REV UPSTREAM TEXT; do
+					case "$UPSTREAM" in
+						\[*)
+							UPSTREAM=${UPSTREAM#\[}
+							UPSTREAM=${UPSTREAM%\]}
+							UPSTREAM=${UPSTREAM%:*}
+							TRACK=true
+							;;
+						*)
+							UPSTREAM=origin/master
+							TRACK=false
+							;;
+					esac
+					if [ x"$REV" = x"->" ]; then
+						continue
+					fi
+					if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH" | grep .; then
+						echo "$d" > "$patchdir/$i/info.txt"
+						echo "$BRANCH" > "$patchdir/$i/info.txt"
+						echo "$UPSTREAM" >> "$patchdir/$i/info.txt"
+						echo "$TRACK" >> "$patchdir/$i/info.txt"
+						i=$(($i+1))
+					else
+						rm -rf "$patchdir/$i"
+					fi
+				done
+			}
+		done
+		( cd "$patchdir" && tar cvzf - . ) > "$outfile"
+		rm -rf "$patchdir"
+		;;
+	restore-patches)
+		infile=$1
+		patchdir=`mktemp -d -t restore-patches.XXXXXX`
+		( cd "$patchdir" && tar xvzf - ) < "$infile"
+		# detach the head
+		for P in "$patchdir"/*/info.txt; do
+			D=${P%/info.txt}
+			exec 3<"$P"
+			read -r d <&3
+			read -r BRANCH <&3
+			read -r UPSTREAM <&3
+			read -r TRACK <&3
+			verbose git checkout HEAD^0
+			verbose git branch -D "$BRANCH"
+			if [ x"$TRACK" = x"true" ]; then
+				verbose git checkout --track -b "$BRANCH" "$UPSTREAM"
+			else
+				verbose git branch -b "$BRANCH" "$UPSTREAM"
+			fi
+			verbose git am "$D"
+		done
+		rm -rf "$patchdir"
+		;;
 	*)
 		echo "Usage:"
 		echo "  $SELF pull"
@@ -344,6 +437,7 @@ case "$cmd" in
 		echo "  $SELF push"
 		echo "  $SELF branches"
 		echo "  $SELF branch [<remote>] <branchname>"
+		echo "  $SELF branch <remote> <branchname> <srcbranchname>"
 		echo "  $SELF checkout [<remote>] <branchname>"
 		echo "  $SELF compile"
 		echo "  $SELF run <client> <options>"