PATCH: Add FIXED-IN keyword support to commit messages.

[Michael Pyne]

On Tuesday, May 18, 2010 18:08:47 Michael Pyne wrote:
> On Tuesday, May 18, 2010 13:10:54 David Faure wrote:
> > On Friday 07 May 2010, Michael Pyne wrote:
> > > Can someone with karma please look this over and if it works, commit?
> > > Feel free to extract the auto version detection if it doesn't work.
> > 
> > Committed, but didn't work, see
> > https://bugs.kde.org/show_bug.cgi?id=140970
> 
> Hmm, I think it would be instructive to see if the email was generated
> properly and Bugzilla messed it up, or if the email was not generated
> properly. I'll see if I can play around with feeding an example commit log
> into the script and see what I get I guess.

Well hacking post-commit.pl to enable debug mode and read from my SVN layout 
seems to successfully generate the email to bug control, something like this:

From: Test <mpyne at kde.org>
To: bug-control at bugs.kde.org
Subject: trunk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

@bug_id = 11111
@bug_status = RESOLVED
@resolution = FIXED
@cf_versionfixed = 4.4.4

SVN commit 49 by kde-svn:

One more time trying to test post-commit.pl for KDE's kde-common, this time 
with a BUG
keyword.

BUG: 11111
FIXED-IN: 4.4.4


 M  +0 -1      README  


WebSVN link: http://websvn.kde.org/?view=rev&revision=49

BUT: I apparently didn't get the database field name properly set. It should 
be @cf_versionfixedin and not @cf_versionfixed.  The following fixes that, and 
fixes the branch guessing to not override the user (since the flowpath is 
different than I thought), please give it a shot:

Index: post-commit.pl
===================================================================
--- post-commit.pl      (revision 1128305)
+++ post-commit.pl      (working copy)
@@ -223,7 +223,7 @@
 my $dirlist = join(' ', @dirschanged);
 
 # Make a default version fixed string
-if ($commondir)
+if (!$version_fixed && $commondir)
   {
     $version_fixed = $1 if ($commondir =~ m{/branches/KDE/(\d[\d\.]+)/});
   }
@@ -407,7 +407,7 @@
     push(@bug_body, "\@resolution = FIXED\n");
 
     if ( $version_fixed ) {
-      push(@bug_body, "\@cf_versionfixed = $version_fixed\n");
+      push(@bug_body, "\@cf_versionfixedin = $version_fixed\n");
     }
   }
 

Regards,
 - Michael Pyne
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20100518/9e282edb/attachment.sig>