From tpotpo at seii.fr Mon May 22 10:22:22 2006 From: tpotpo at seii.fr (Thomas Poindessous) Date: Mon May 22 10:25:30 2006 Subject: [cvsspam-devel] warning about a instance variable not initialized when adding a new file Message-ID: <447190DE.4090705@seii.fr> Hi, I use cvsspam 0.2.12 and each time I add a new file, I got this warning : /usr/local/cvsspam/cvsspam.rb:1804: warning: instance variable @fromVer not initialized /usr/local/cvsspam/cvsspam.rb:1805: warning: instance variable @fromVer not initialized Thanks for your help. -- Thomas Poindessous From dave at badgers-in-foil.co.uk Mon May 22 10:37:27 2006 From: dave at badgers-in-foil.co.uk (David Holroyd) Date: Mon May 22 10:37:30 2006 Subject: [cvsspam-devel] warning about a instance variable not initialized when adding a new file In-Reply-To: <447190DE.4090705@seii.fr> References: <447190DE.4090705@seii.fr> Message-ID: <20060522103726.GA7854@badgers-in-foil.co.uk> On Mon, May 22, 2006 at 12:22:22PM +0200, Thomas Poindessous wrote: > I use cvsspam 0.2.12 and each time I add a new file, I got this warning : > > /usr/local/cvsspam/cvsspam.rb:1804: warning: instance variable @fromVer not initialized > /usr/local/cvsspam/cvsspam.rb:1805: warning: instance variable @fromVer not initialized Yes, sorry about that. A fix is already committed to the repository, and will be included in the next release of CVSspam. The relevant change is attached, if that helps... ta, dave -- http://david.holroyd.me.uk/ -------------- next part -------------- Index: cvsspam.rb =================================================================== --- cvsspam.rb (revision 223) +++ cvsspam.rb (revision 224) @@ -388,6 +388,7 @@ class FileEntry def initialize(path) @path = path + @fromVer = @toVer = nil @lineAdditions = @lineRemovals = 0 @repository = Repository.get(path) @repository.merge_common_prefix(basedir()) @@ -1800,10 +1801,10 @@ return unless $fileEntries.length == 1 file = $fileEntries[0] name = zap_header_special_chars(file.path) - unless file.fromVer == "NONE" + if file.fromVer mail.header("References", make_msg_id("#{name}.#{file.fromVer}", $hostname)) end - unless file.toVer == "NONE" + if file.toVer mail.header("Message-ID", make_msg_id("#{name}.#{file.toVer}", $hostname)) end end From charles.duffy at isgenesis.com Wed May 24 02:02:05 2006 From: charles.duffy at isgenesis.com (Duff) Date: Wed May 24 08:50:52 2006 Subject: [cvsspam-devel] Patches: More flexible bug matching, ignore whitespace option Message-ID: <4473BE9D.9000507@isgenesis.com> The text files were produced on a Windows machine; hopefully there won't be linefeed-related issues. The patches themselves should be self-explanatory. -------------- next part -------------- A non-text attachment was scrubbed... Name: cvsspam-ignore_whitespace_option.patch Type: text/x-patch Size: 1362 bytes Desc: not available Url : http://lists.badgers-in-foil.co.uk/pipermail/cvsspam-devel/attachments/20060523/f7cf2c35/cvsspam-ignore_whitespace_option.bin -------------- next part -------------- A non-text attachment was scrubbed... Name: cvsspam-bug-regex.patch Type: text/x-patch Size: 491 bytes Desc: not available Url : http://lists.badgers-in-foil.co.uk/pipermail/cvsspam-devel/attachments/20060523/f7cf2c35/cvsspam-bug-regex.bin From dave at badgers-in-foil.co.uk Wed May 24 09:23:32 2006 From: dave at badgers-in-foil.co.uk (David Holroyd) Date: Wed May 24 09:23:38 2006 Subject: [cvsspam-devel] Patches: More flexible bug matching, ignore whitespace option In-Reply-To: <4473BE9D.9000507@isgenesis.com> References: <4473BE9D.9000507@isgenesis.com> Message-ID: <20060524092332.GA10789@badgers-in-foil.co.uk> On Tue, May 23, 2006 at 09:02:05PM -0500, Duff wrote: > The patches themselves should be self-explanatory. Patches applied. Many thanks for taking the time to prepare them so nicely! dave -- http://david.holroyd.me.uk/ From cduffy at spamcop.net Thu May 25 16:12:01 2006 From: cduffy at spamcop.net (Charles Duffy) Date: Thu May 25 16:12:36 2006 Subject: [cvsspam-devel] Minor spelling/typo fix Message-ID: <4475D751.6010807@spamcop.net> "partially", not "partialy". See attached. -------------- next part -------------- A non-text attachment was scrubbed... Name: cvsspam-typo-fix.patch Type: text/x-patch Size: 779 bytes Desc: not available Url : http://lists.badgers-in-foil.co.uk/pipermail/cvsspam-devel/attachments/20060525/b81305bb/cvsspam-typo-fix.bin From dave at badgers-in-foil.co.uk Thu May 25 16:42:39 2006 From: dave at badgers-in-foil.co.uk (David Holroyd) Date: Thu May 25 16:42:43 2006 Subject: [cvsspam-devel] Minor spelling/typo fix In-Reply-To: <4475D751.6010807@spamcop.net> References: <4475D751.6010807@spamcop.net> Message-ID: <20060525164238.GB12308@badgers-in-foil.co.uk> On Thu, May 25, 2006 at 11:12:01AM -0500, Charles Duffy wrote: > "partially", not "partialy". See attached. I've made the fix. Thanks for pointing out the problem! dave -- http://david.holroyd.me.uk/ From cduffy at spamcop.net Sat May 27 17:43:09 2006 From: cduffy at spamcop.net (Charles Duffy) Date: Sat May 27 17:43:43 2006 Subject: [cvsspam-devel] Patch to add XPlanner link support Message-ID: <20060527174309.GA12551@login.isgenesis.com> See attached. -------------- next part -------------- diff -ru3 cvsspam-0.2.12.orig/cvsspam.conf cvsspam-0.2.12.xplanner-support/cvsspam.conf --- cvsspam-0.2.12.orig/cvsspam.conf 2005-07-11 10:53:30.000000000 -0500 +++ cvsspam-0.2.12.xplanner-support/cvsspam.conf 2006-05-27 12:39:57.000000000 -0500 @@ -34,11 +34,19 @@ # # When $jiraURL is given, text of the form 'project-1234' will be linked # to this issue in JIRA. +# +# When $xplannerStoryURL, $xplannerIterationURL and $xplannerProjectURL are +# given, text of the form XS1234 will be linked to XPlanner stories; text of +# the form XI1234 will be linked to XPlanner iterations; and text of the form +# XP1234 will be linked to XPlanner projects. #$bugzillaURL = "http://bugzilla.mozilla.org/show_bug.cgi?id=%s" #$jiraURL = "http://jira.atlassian.com/secure/ViewIssue.jspa?key=%s" +#$xplannerStoryURL = "http://www.example.com/xplanner/do/view/userstory?oid=%s" +#$xplannerIterationURL = "http://www.example.com/xplanner/do/view/iteration?oid=%s" +#$xplannerProjectURL = "http://www.example.com/xplanner/do/view/project?oid=%s" # Link to Wiki systems # diff -ru3 cvsspam-0.2.12.orig/cvsspam.rb cvsspam-0.2.12.xplanner-support/cvsspam.rb --- cvsspam-0.2.12.orig/cvsspam.rb 2005-07-11 10:53:29.000000000 -0500 +++ cvsspam-0.2.12.xplanner-support/cvsspam.rb 2006-05-27 12:37:55.000000000 -0500 @@ -549,6 +549,18 @@ raw = $1 "[[#{raw}]]" } +xplannerIterationSub = proc { |match| + match =~ /([0-9]+)/ + "#{match}" +} +xplannerProjectSub = proc { |match| + match =~ /([0-9]+)/ + "#{match}" +} +xplannerStorySub = proc { |match| + match =~ /([0-9]+)/ + "#{match}" +} commentSubstitutions = { '(?:mailto:)?[\w\.\-\+\=]+\@[\w\-]+(?:\.[\w\-]+)+\b' => mailSub, '\b(?:http|https|ftp):[^ \t\n<>"]+[\w/]' => urlSub @@ -1251,6 +1263,9 @@ $jiraURL = nil $ticketURL = nil $viewcvsURL = nil +$xplannerIterationURL = nil +$xplannerProjectURL = nil +$xplannerStoryURL = nil $choraURL = nil $cvswebURL = nil $from_address = nil @@ -1364,6 +1379,15 @@ if $wikiURL != nil commentSubstitutions['\[\[.+\]\]'] = wikiSub end +if $xplannerIterationURL != nil + commentSubstitutions['\bXI\[?[0-9]+\]?'] = xplannerIterationSub +end +if $xplannerProjectURL != nil + commentSubstitutions['\bXP\[?[0-9]+\]?'] = xplannerProjectSub +end +if $xplannerStoryURL != nil + commentSubstitutions['\bXS\[?[0-9]+\]?'] = xplannerStorySub +end $commentEncoder = MultiSub.new(commentSubstitutions) From dave at badgers-in-foil.co.uk Wed May 31 21:37:28 2006 From: dave at badgers-in-foil.co.uk (David Holroyd) Date: Wed May 31 21:37:40 2006 Subject: [cvsspam-devel] Patch to add XPlanner link support In-Reply-To: <20060527174309.GA12551@login.isgenesis.com> References: <20060527174309.GA12551@login.isgenesis.com> Message-ID: <20060531213728.GA1704@badgers-in-foil.co.uk> On Sat, May 27, 2006 at 12:43:09PM -0500, Charles Duffy wrote: > See attached. Thanks! Patch applied. How is XPlanner? I'd not come accross it before. ta, dave -- http://david.holroyd.me.uk/ From cduffy at spamcop.net Wed May 31 22:13:58 2006 From: cduffy at spamcop.net (Charles Duffy) Date: Wed May 31 22:14:37 2006 Subject: [cvsspam-devel] Patch to add XPlanner link support In-Reply-To: <20060531213728.GA1704@badgers-in-foil.co.uk> References: <20060527174309.GA12551@login.isgenesis.com> <20060531213728.GA1704@badgers-in-foil.co.uk> Message-ID: <447E1526.5070006@spamcop.net> David Holroyd wrote: > On Sat, May 27, 2006 at 12:43:09PM -0500, Charles Duffy wrote: >> See attached. > > Thanks! Patch applied. Thank *you* -- I'm happier when not maintaining local branches. That said, would you mind changing the regexes to support lowercase? I ended up changing them (as from '\bXP\[?[0-9]+\]?' to '\b(XP|xp)\[?[0-9]+\]?') when the developers started using lowercase despite instructions specifying use of caps. > How is XPlanner? I'd not come accross it before. I don't know -- it's the dev team proper that uses it, and while I provide tools to support them, I'm in a different department.