undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fc7ef1e8ae
git-commit-vandalism/dotest

34 lines
919 B
Plaintext
Raw Normal View History

Add "applypatch" and "dotest" scripts to tie it all together. This should be getting it all pretty close to a working setup.
2005-04-12 10:40:20 +02:00
#!/bin/sh
##
## "dotest" is my stupid name for my patch-application script, which
## I never got around to renaming after I tested it. We're now on the
## second generation of scripts, still called "dotest".
##
## You give it a mbox-format collection of emails, and it will try to
## apply them to the kernel using "applypatch"
##
[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.
2005-04-20 17:23:00 +02:00
## dotest [ -q ] mail_archive [Signoff_file]
##
Add "applypatch" and "dotest" scripts to tie it all together. This should be getting it all pretty close to a working setup.
2005-04-12 10:40:20 +02:00
rm -rf .dotest
mkdir .dotest
[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.
2005-04-20 17:23:00 +02:00
case $1 in
-q) touch .dotest/.query_apply
shift;;
esac
Add "applypatch" and "dotest" scripts to tie it all together. This should be getting it all pretty close to a working setup.
2005-04-12 10:40:20 +02:00
mailsplit $1 .dotest || exit 1
for i in .dotest/*
do
Avoid doing the "filelist" thing, since "git-apply" picks up the files automatically ..and git-apply does a lot better job at it anyway. Also, we break the comment/diff on a line that starts with "diff -", not just on the "---" line. Especially for git diffs, we actually want that line in the diff. (We should probably also break on "Index: ..." followed by "=====")
2005-06-23 18:40:23 +02:00
mailinfo .dotest/msg .dotest/patch < $i > .dotest/info || exit 1
Add "stripspace" program to clean up email commentary Remove multiple empty lines, and empty lines at beginning and end.
2005-04-30 19:58:41 +02:00
stripspace < .dotest/msg > .dotest/msg-clean
Avoid doing the "filelist" thing, since "git-apply" picks up the files automatically ..and git-apply does a lot better job at it anyway. Also, we break the comment/diff on a line that starts with "diff -", not just on the "---" line. Especially for git diffs, we actually want that line in the diff. (We should probably also break on "Index: ..." followed by "=====")
2005-06-23 18:40:23 +02:00
applypatch .dotest/msg-clean .dotest/patch .dotest/info "$2"
[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.
2005-04-20 17:23:00 +02:00
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
Add "applypatch" and "dotest" scripts to tie it all together. This should be getting it all pretty close to a working setup.
2005-04-12 10:40:20 +02:00
done
[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.
2005-04-20 17:23:00 +02:00
# return to pristine
rm -fr .dotest
Reference in New Issue Copy Permalink