bk commit into 5.2 tree (df:1.2520)

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.2 repository of df. When df does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-13 12:43:48+02:00, df@stripped +1 -0
  Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commit
  into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.2
  MERGE: 1.2469.224.1

  BitKeeper/triggers/post-commit@stripped, 2007-06-13 12:43:44+02:00, df@stripped
+0 -0
    Auto merged
    MERGE: 1.37.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	df
# Host:	pippilotta.erinye.com
# Root:	/shared/home/df/mysql/build/mysql-5.2/RESYNC

--- 1.38/BitKeeper/triggers/post-commit	2007-05-24 09:17:54 +02:00
+++ 1.39/BitKeeper/triggers/post-commit	2007-06-13 12:43:44 +02:00
@@ -33,6 +33,13 @@
   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`
 #
@@ -48,44 +55,33 @@
               s/.*\(WL#[0-9][0-9]*\)/ \1/p'`
 if [ "$BUG" = "" ]
 then
-  TO=dev-public@stripped
+#  TO=dev-public@stripped
   BS=""
   BH=""
 else
-  TO=dev-bugs@stripped
+#  TO=dev-bugs@stripped
   BS=" BUG#$BUG"
 # need newline here
   BH="X-Bug: $BUG
 "
 fi
+
 #++
-# dev-public@ / dev-bugs@
+# commits@ or dev-private@ mail
 #--
- 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 rset -r+ -ah | bk gnupatch -h -dup -T
- ) > $BKROOT/BitKeeper/tmp/dev_public.txt
 
-$SENDMAIL -t < $BKROOT/BitKeeper/tmp/dev_public.txt
+TO="commits"
+if [ -f .tree-is-private ]
+then
+  TO="dev-private"
+fi
 
-#++
-# commits@ mail
-#--
- echo "Notifying commits list at $COMMITS"
+ echo "Notifying $TO list at $TO"
  (
    cat <<EOF
 List-ID: <bk.mysql-$VERSION>
 From: $FROM
-To: $COMMITS
+To: $TO@stripped
 Subject: bk commit into $VERSION tree ($CHANGESET)$BS
 X-CSetKey: <$CSETKEY>
 $BH