bk commit into 4.1 tree (aelkin:1.2531) BUG#214748367

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
4.1 repository of elkin. When elkin 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, 2006-10-16 17:24:19+03:00, aelkin@stripped +1 -0
  Correcting BUG/WL identifier extraction to allow multiple references to auxilary
  bugs/wls in cset's comments. The targetted bug's identifier must be specified
  the first in the comments. Then it (and nothing else) will appear on subject lines
  of post-commit mails.
    Example:
          fix for the bug#2147483648: HELP! Can not rollback my uncommitted transaction!
          The randomization method to fix this artifact introduced in WL#0 has bee
          improved... As a side effect of the current changes all odd numbered bugs
          starting from bug#1 up to bug#214748367 become fixed too.

  BitKeeper/triggers/post-commit@stripped, 2006-10-16 17:20:00+03:00, aelkin@stripped +23 -16
    fixing extraction.

# 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:	aelkin
# Host:	dsl-hkigw8-febefb00-148.dhcp.inet.fi
# Root:	/home/elkin/MySQL/BARE/mysql-4.1

--- 1.34/BitKeeper/triggers/post-commit	2006-10-16 17:24:27 +03:00
+++ 1.35/BitKeeper/triggers/post-commit	2006-10-16 17:24:27 +03:00
@@ -28,21 +28,28 @@ fi
 
 CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`
 CSETKEY=`bk -R prs -r+ -h -d':KEY:' ChangeSet`
-BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/\1/p'`
-WL=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Ww][Ll] *# *\([0-9][0-9]*\).*$/ WL#\1/p'`
+ID=`sed  -ne 's/\([Bb][Uu][Gg] *# *[0-9][0-9]*\|[Ww][Ll] *# *[0-9][0-9]*\).*/\1/
+               y/bgluw/BGLUW/
+               s/.*\([Bb][Uu][Gg] *# *[0-9][0-9]*\|[Ww][Ll] *# *[0-9][0-9]*\)/\1/
+               s/ //gp'`
 
-if [ "$BUG" = "" ]
-then
-  TO=dev-public@stripped
-  BS=""
-  BH=""
-else
-  TO=dev-bugs@stripped
-  BS=" BUG#$BUG"
-# need newline here
-  BH="X-Bug: $BUG
+echo $ID
+
+case "$ID" in
+    BUG#*)
+	WL=""; 
+	BS=" $ID"
+	BH="X-Bug: `echo $ID | sed -ne 's/BUG#//p'`
 "
-fi
+	TO=dev-bugs@stripped;;
+    WL#*)
+	WL=" $ID"
+	BS=""
+	BH=""
+	TO=dev-public@stripped;;
+    *)
+	echo "Warning: neither BUG nor WL in the comments";;
+esac
 #++
 # dev-public@ / dev-bugs@
 #--
@@ -58,7 +65,7 @@ $BH
 EOF
   bk changes -v -r+
   bk cset -r+ -d
- ) | head -n $LIMIT | /usr/sbin/sendmail -t
+ ) | head -n $LIMIT | grep -i subject >> /tmp/subj.log
 
 #++
 # commits@ mail
@@ -82,7 +89,7 @@ see http://dev.mysql.com/doc/mysql/en/in
 EOF
   bk changes -v -r+
   bk cset -r+ -d
- ) | head -n $LIMIT | /usr/sbin/sendmail -t
+ ) | head -n $LIMIT | grep -i subject >> /tmp/subj.log
 
 #++
 # docs-commit@ mail
@@ -102,7 +109,7 @@ Subject: bk commit - $VERSION tree (Manu
 EOF
   bk changes -v -r+
   bk cset -r+ -d
- ) | head -n $LIMIT | /usr/sbin/sendmail -t
+ ) | head -n $LIMIT | grep -i subject >> /tmp/subj.log
  fi
 
 else