From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 24 Jun 2010 08:12:48 +0000 (+0200)
Subject: Lots of improvements for admin-merge-2
X-Git-Tag: xonotic-v0.1.0preview~395
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=9fa81db68661140629c5f0227b070d98ccd36c67;ds=sidebyside

Lots of improvements for admin-merge-2
---

diff --git a/all b/all
index 71758f14..ccc9667e 100755
--- a/all
+++ b/all
@@ -669,68 +669,89 @@ case "$cmd" in
 					HEAD|master)
 						continue
 						;;
+					*/*)
+					   	;;
+					*)
+						continue
+						;;
 				esac
 				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
+					if yesno "Branch \"$ref\" probably should get deleted. Do it?" ''; 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
+				else
+					diffdata=`git diff --color --find-copies-harder --ignore-space-change "$base"..."$ref"`
+					if [ -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
-					fi
-				else
-					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
+					elif [ -n "$note" ]; then
 						reportdo4 echo "$note"
-						reportecho4 "--> rejected"
+						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" && ! { git ls-files -u | grep ' 1   ' >/dev/null; }; 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`
+							if [ x"$note" = x"del" ]; then
+								git push origin :"${ref#refs/remotes/origin/}"
+								reportecho4 "--> test failed, branch deleted"
+							elif [ -n "$note" ]; then
+								reportdo4 echo "$note"
+								reportecho4 "--> test failed"
+							else
+								reportecho4 "--> test failed, postponed"
+							fi
+						else
+							case ",`repoflags "$d"`," in
+								*,svn,*)
+									# we do quite a mess here... luckily we know $org
+									git fetch # svn needs to be current
+									git rebase -i --onto origin/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
-						reportecho4 "--> postponed"
+						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 [ x"$note" = x"del" ]; then
+							git push origin :"${ref#refs/remotes/origin/}"
+							reportecho4 "--> branch deleted"
+						elif [ -n "$note" ]; then
+							reportdo4 echo "$note"
+							reportecho4 "--> rejected"
+						else
+							reportecho4 "--> postponed"
+						fi
 					fi
 				fi
 				reportecho ""