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

[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-17 17:15:08+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 or WL's identifier must be specified
  the first in the comments. The referred bugs wls can be typed in same as 
  the targeted clickable format.
  If the the target of the fix is a WL and there are some references to bugs
  then the first found reference is regarded as "co-target" so that the bug's identifier
  comes up on the subject line along with the WL's and commit mail will update
  the bug page.
  This feature can be disarmed (if there is no need to update the referred bug's page) 
  with typing first a pseudo-bug pattern (bug#0).
  
  This paticular cset will generate subject line containing bug#0 (as it was the first
  referred) whereas the old script version would find the last referred pattern 
  (e.g bug#2147483648)

  BitKeeper/triggers/post-commit@stripped, 2006-10-17 17:15:07+03:00,
aelkin@stripped +11 -3
    fixing greedyness of old 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-17 17:15:13 +03:00
+++ 1.35/BitKeeper/triggers/post-commit	2006-10-17 17:15:13 +03:00
@@ -28,9 +28,17 @@ 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'`
-
+#
+# composing subject lines of commit mails.
+# if a fix targets to a WL and there is a bug referred
+# then X-Bug mail header will contain the first found bug's number
+#
+BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | \
+     sed -ne 's/[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/BUG#\1/
+              s/.*BUG#\([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/
+              s/.*\(WL#[0-9][0-9]*\)/ \1/p'`
 if [ "$BUG" = "" ]
 then
   TO=dev-public@stripped