From ad4e9ce4f9b34c4e6dd941b3244bcf56a3e3d62d Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@SteelEye.com>
Date: Wed, 20 Apr 2005 08:23:00 -0700
Subject: [PATCH] [PATCH] make dotest more amenable to commit message editing

This makes "dotest" a lot nicer to sue, especially for people who were
used to editing the commit comments after-the-fact in BK, which git
doesn't apply.

he syntax is

	dotest [-q] mailbox [signoff]

so the command line operates exactly as you're used to.  If you supply
the -q it will query before applying (I also added the [a]pply all the
rest option).  If the signoff file is absent, no signoff line gets
added.

There's also one addition in this:  a checkout-cache line.  I added that
for poor saps like me whose laptop takes minutes to checkout a full
build tree, so I can run dotest in a directory with no checked out
files.
---
 applypatch | 40 +++++++++++++++++++++++++++++++++++++---
 dotest     | 17 ++++++++++++++++-
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/applypatch b/applypatch
index 9799cf98da..397e4a0e50 100755
--- a/applypatch
+++ b/applypatch
@@ -9,27 +9,61 @@
 ##	$2 - file with the actual patch
 ##	$3 - file with list of filenames the patch touches
 ##	$4 - "info" file with Author, email and subject
+##	$5 - optional file containing signoff to add
 ##
+signoff="$5"
+final=.dotest/final-commit
+##
+## If this file exists, we ask before applying
+##
+query_apply=.dotest/.query_apply
 MSGFILE=$1
 PATCHFILE=$2
 FILES=$3
 INFO=$4
+EDIT=${VISUAL:-$EDITOR}
+EDIT=${EDIT:-vi}
+
 export AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' .dotest/info)"
 export AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' .dotest/info)"
 export SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' .dotest/info)"
 
+if [ -n "$signoff" -a -f "$signoff" ]; then
+	cat $signoff >> $MSGFILE
+fi
+
+(echo "[PATCH] $SUBJECT" ; echo ; cat $MSGFILE ) > $final
+
+f=0
+[ -f $query_apply ] || f=1
+
+while [ $f -eq 0 ]; do
+	echo "Commit Body is:"
+	echo "--------------------------"
+	cat $final
+	echo "--------------------------"
+	echo -n "Apply? [y]es/[n]o/[e]dit/[a]ccept all "
+	read reply
+	case $reply in
+		y|Y) f=1;;
+		n|N) exit 2;;	# special value to tell dotest to keep going
+		e|E) $EDIT $final;;
+		a|A) rm -f $query_apply
+		     f=1;;
+	esac
+done
+
 echo
 echo Applying "'$SUBJECT'"
 echo
 
-(echo "[PATCH] $SUBJECT" ; echo ; cat $MSGFILE ) > .dotest/final-commit
-
 check-files $(cat $FILES) || exit 1
+checkout-cache -q $(cat $FILES) || exit 1
 patch -u --no-backup-if-mismatch -f -p1 --fuzz=0 --input=$PATCHFILE || exit 1
 update-cache --add --remove $(cat $FILES) || exit 1
 tree=$(write-tree) || exit 1
 echo Wrote tree $tree
-commit=$(commit-tree $tree -p $(cat .git/HEAD) < .dotest/final-commit) || exit 1
+commit=$(commit-tree $tree -p $(cat .git/HEAD) < $final) || exit 1
 echo Committed: $commit
 echo $commit > .git/HEAD
 
diff --git a/dotest b/dotest
index 7d2c16b9ab..a3e3d35ae0 100755
--- a/dotest
+++ b/dotest
@@ -7,11 +7,26 @@
 ## You give it a mbox-format collection of emails, and it will try to
 ## apply them to the kernel using "applypatch"
 ##
+## dotest [ -q ] mail_archive [Signoff_file]
+##
 rm -rf .dotest
 mkdir .dotest
+case $1 in
+
+	-q)	touch .dotest/.query_apply
+		shift;;
+esac
 mailsplit $1 .dotest || exit 1
 for i in .dotest/*
 do
 	mailinfo .dotest/msg .dotest/patch .dotest/file < $i > .dotest/info || exit 1
-	applypatch .dotest/msg .dotest/patch .dotest/file .dotest/info || exit 1
+	applypatch .dotest/msg .dotest/patch .dotest/file .dotest/info "$2"
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		# 2 is a special exit code from applypatch to indicate that
+	    	# the patch wasn't applied, but continue anyway 
+		[ $ret -ne 2 ] && exit $ret
+	fi
 done
+# return to pristine
+rm -fr .dotest