diff options
Diffstat (limited to 'BitKeeper/triggers')
| -rwxr-xr-x | BitKeeper/triggers/post-commit | 10 | ||||
| -rwxr-xr-x | BitKeeper/triggers/pre-delta | 15 |
2 files changed, 20 insertions, 5 deletions
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index c3a61ed2dde..e3cd589f50b 100755 --- a/BitKeeper/triggers/post-commit +++ b/BitKeeper/triggers/post-commit @@ -8,10 +8,10 @@ else COMMITTER=$USER fi FROM=$COMMITTER@mysql.com -COMMITS=commits@lists.mysql.com +COMMITS=maria@lists.mysql.com DOCS=docs-commit@mysql.com LIMIT=10000 -VERSION="5.1" +VERSION="maria" BKROOT=`bk root` if [ -x /usr/sbin/sendmail ]; then @@ -73,11 +73,11 @@ else fi #++ -# commits@ or dev-private@ mail +# maria@ or dev-private@ mail #-- LIST="commits" -TO="commits@lists.mysql.com" +TO="maria@lists.mysql.com" if [ -f .tree-is-private ] then LIST="dev-private" @@ -103,7 +103,7 @@ see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html EOF bk changes -v -r+ bk rset -r+ -ah | bk gnupatch -h -dup -T - ) | bk sed -e ${LIMIT}q > $BKROOT/BitKeeper/tmp/commits.txt + ) > $BKROOT/BitKeeper/tmp/commits.txt $SENDMAIL -t < $BKROOT/BitKeeper/tmp/commits.txt diff --git a/BitKeeper/triggers/pre-delta b/BitKeeper/triggers/pre-delta index cd861703bb5..d6afe0905e7 100755 --- a/BitKeeper/triggers/pre-delta +++ b/BitKeeper/triggers/pre-delta @@ -20,3 +20,18 @@ then exit 1 fi +# detect if C/C++ files have new trailing white space +trailingblank=`echo $BK_FILE | egrep '\.(c|.h)'` +if [ -n "$trailingblank" ] +then + trailingblank=`bk diffs $BK_FILE | grep '^> .*[[:space:]]$'` + if [ -n "$trailingblank" ] + then + echo "bk diffs $BK_FILE | grep '^> .*[[:space:]]$'" + echo "reported white space at end of some added/modified lines" + echo "" + echo "Checkin FAILED!" + echo "Fix the problem and retry." + exit 1 + fi +fi |