summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <df@pippilotta.erinye.com>2007-06-13 11:48:07 +0200
committerunknown <df@pippilotta.erinye.com>2007-06-13 11:48:07 +0200
commitd87c987533af12d0aa1bd96b05857c6b2739a854 (patch)
tree65add67db351350c01e9c964c9c5b0f770beb3c4 /BitKeeper
parentcb17b80118e97adaf23e6d7c8b5705b8581a3267 (diff)
parentff265ac842a6cc7f1866200397a8bd7fc27adee2 (diff)
downloadmariadb-git-d87c987533af12d0aa1bd96b05857c6b2739a854.tar.gz
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commit
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
Diffstat (limited to 'BitKeeper')
-rwxr-xr-xBitKeeper/triggers/post-commit56
1 files changed, 35 insertions, 21 deletions
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index 229553cdccf..245d644e06a 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -26,6 +26,13 @@ then
exit
fi
+IS_MERGE=`bk changes -r+ -k -m`
+if [ "$IS_MERGE" = "" ]
+then
+ echo Merge changeset, not sending mails
+ exit
+fi
+
CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`
CSETKEY=`bk -R prs -r+ -h -d':KEY:' ChangeSet`
#
@@ -41,42 +48,49 @@ WL=`bk -R prs -r+ -h -d':C:' ChangeSet | \
s/.*\(WL#[0-9][0-9]*\)/ \1/p'`
if [ "$BUG" = "" ]
then
- TO=dev-public@mysql.com
+# TO=dev-public@mysql.com
BS=""
BH=""
else
- TO=dev-bugs@mysql.com
+# TO=dev-bugs@mysql.com
BS=" BUG#$BUG"
# need newline here
BH="X-Bug: $BUG
"
fi
-#++
-# dev-public@ / dev-bugs@
-#--
- echo "Commit successful, notifying developers at $TO"
- (
- cat <<EOF
-List-ID: <bk.mysql-$VERSION>
-From: $FROM
-To: $TO
-Subject: bk commit - $VERSION tree ($CHANGESET)${BS}${WL}
-X-CSetKey: <$CSETKEY>
-$BH
-EOF
- bk changes -v -r+
- bk cset -r+ -d
- ) | head -n $LIMIT | /usr/sbin/sendmail -t
+##++
+## dev-public@ / dev-bugs@
+##--
+# echo "Commit successful, notifying developers at $TO"
+# (
+# cat <<EOF
+#List-ID: <bk.mysql-$VERSION>
+#From: $FROM
+#To: $TO
+#Subject: bk commit - $VERSION tree ($CHANGESET)${BS}${WL}
+#X-CSetKey: <$CSETKEY>
+#$BH
+#EOF
+# bk changes -v -r+
+# bk cset -r+ -d
+# ) | head -n $LIMIT | /usr/sbin/sendmail -t
#++
-# commits@ mail
+# commits@ or dev-private@ mail
#--
- echo "Notifying commits list at $COMMITS"
+
+TO="commits"
+if [ -f .tree-is-private ]
+then
+ TO="dev-private"
+fi
+
+ echo "Notifying $TO list at $TO"
(
cat <<EOF
List-ID: <bk.mysql-$VERSION>
From: $FROM
-To: $COMMITS
+To: $TO@mysql.com
Subject: bk commit into $VERSION tree ($CHANGESET)$BS
X-CSetKey: <$CSETKEY>
$BH