- rediff from upstream svn to exact same diff:

[packages/cvsspam.git] / cvsspam-branch.diff

Index: cvsspam.conf
===================================================================
--- cvsspam.conf	(revision 223)
+++ cvsspam.conf	(revision 253)
@@ -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
 # 
@@ -125,6 +133,15 @@
 #$diff_ignore_keywords = true
 
 
+# cvsdiff whitespace ignoring               (Default: show whitespace-only changes)
+#
+#   Whitespace-only changes can distract from the rest of a diff. Set this
+#   value to true to exclude changes in the amount of whitespace (adds the -b
+#   option to cvs diff).
+
+$diff_ignore_whitespace = true
+
+
 # $no_removed_file_diff and $no_added_file_diff
 #
 #     Set both these options, and emails will only include diffs for files
@@ -177,3 +194,13 @@
 #   them happy, you can say $files_in_subject = true here.
 
 #$files_in_subject = false
+
+
+
+# Email size limit                                        (Default: around 2MB)
+#
+#     When large changes are committed, large CVSspam emails can result.  Here
+#   you can set the size of email that CVSspam is not allowed to append any
+#   more diffs onto.  Specify the number of bytes.
+
+#$mail_size_limit = 2097152
Index: collect_diffs.rb
===================================================================
--- collect_diffs.rb	(revision 223)
+++ collect_diffs.rb	(revision 253)
@@ -27,6 +27,13 @@
 $dirtemplate = "#cvsspam.#{Process.getpgrp}.#{Process.uid}"
 
 def find_data_dir
+  if $from_address
+    safe_from = make_fromaddr_safe_for_filename($from_address)
+    Dir["#{$tmpdir}/#{$dirtemplate}.#{safe_from}-*"].each do |dir|
+      stat = File.stat(dir)
+      return dir if stat.owned?
+    end
+  end
   Dir["#{$tmpdir}/#{$dirtemplate}-*"].each do |dir|
     stat = File.stat(dir)
     return dir if stat.owned?
@@ -35,6 +42,14 @@
 end
 
 
+# transform any special / unexpected characters appearing in the argument to
+# --from so that they will not cause problems if the value is inserted into
+# a file or directory name
+def make_fromaddr_safe_for_filename(addr)
+  addr.gsub(/[^a-zA-Z0-1.,_-]/, "_")
+end
+
+
 def blah(msg)
   if $debug
     $stderr.puts "collect_diffs.rb: #{msg}"
@@ -129,7 +144,14 @@
   changes = Array.new
   i = 0
   while i < cvs_info.length
-    changes << ChangeInfo.new(cvs_info[i], cvs_info[i+=1], cvs_info[i+=1])
+    change_file = cvs_info[i]
+    # It's been reported,
+    # http://lists.badgers-in-foil.co.uk/pipermail/cvsspam-devel/2005-September/000380.html
+    # that sometimes the second revision number that CVS gives us contains a
+    # trailing newline character, so we strip ws from these values before use,
+    change_from = cvs_info[i+=1].strip
+    change_to = cvs_info[i+=1].strip
+    changes << ChangeInfo.new(change_file, change_from, change_to)
     i+=1
   end
   return changes
@@ -222,6 +244,7 @@
 
       diff_cmd = Array.new << $cvs_prog << "-nq" << "diff" << "-Nu"
       diff_cmd << "-kk" if $diff_ignore_keywords
+      diff_cmd << "-b" if $diff_ignore_whitespace
 
       if change.isAddition
         file.write "#A "
@@ -333,9 +356,11 @@
 end
 
 $config = nil
+$from_address = nil
 $cvs_prog = "cvs"
 $debug = false
 $diff_ignore_keywords = false
+$diff_ignore_whitespace = false
 $task_keywords = []
 
 unless ENV.has_key?('CVSROOT')
@@ -387,6 +412,7 @@
   end
   $config = arg if opt=="--config"
   $debug = true if opt == "--debug"
+  $from_address = arg if opt == "--from"
 end
 
 blah("CVSROOT is #{ENV['CVSROOT']}")
Index: record_lastdir.rb
===================================================================
--- record_lastdir.rb	(revision 223)
+++ record_lastdir.rb	(revision 253)
@@ -4,7 +4,6 @@
 #   http://www.badgers-in-foil.co.uk/projects/cvsspam/
 # Copyright (c) David Holroyd
 
-$repositorydir = ARGV.shift
 
 $tmpdir = ENV["TMPDIR"] || "/tmp"
 
@@ -19,6 +18,36 @@
   nil
 end
 
+
+# transform any special / unexpected characters appearing in the argument to
+# --from so that they will not cause problems if the value is inserted into
+# a file or directory name
+def make_fromaddr_safe_for_filename(addr)
+  addr.gsub(/[^a-zA-Z0-1.,_-]/, "_")
+end
+
+# Option processing doesn't use GetoptLong (for the moment) bacause arguments
+# given to this script by CVS include the names of committed files.  It
+# seems quite possible that one of those file names could begin with a '-'
+# and therefore be treated by GetoptLong as a value which requires processing.
+# This would probably result in an error.
+#
+# [That could be worked around by placing a '--' option (which tells GetoptLong
+# to stop processing option arguments) at the very end of the arguments to
+# record_lastdir.rb in commitinfo, but that's very easily forgotten, and isn't
+# really backwards compatable with the behaviour of older CVSspam releases.]
+if ARGV.first == "--from"
+  # we could, of course, be tricked, if the first committed file in the list
+  # happened to be named '--from' :S
+
+  # drop the "--from"
+  ARGV.shift
+  # and use the value which was given following the option,
+  $dirtemplate << "." << make_fromaddr_safe_for_filename(ARGV.shift)
+end
+
+$repositorydir = ARGV.shift
+
 $datadir = find_data_dir()
 
 if $datadir==nil
Index: project.xml
===================================================================
Index: CREDITS
===================================================================
--- CREDITS	(revision 223)
+++ CREDITS	(revision 253)
@@ -29,3 +29,10 @@