From 634c5affe329d4f0d26bfe27aef444e9223415d2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sun, 5 Jul 2009 17:16:26 +0000 Subject: [PATCH] - drop obsolete files Changed files: cvsspam-multibyte_enc_disables_highlight-patch1.diff -> 1.3 cvsspam-trac.patch -> 1.6 --- ...ltibyte_enc_disables_highlight-patch1.diff | 35 -------- cvsspam-trac.patch | 84 ------------------- 2 files changed, 119 deletions(-) delete mode 100644 cvsspam-multibyte_enc_disables_highlight-patch1.diff delete mode 100644 cvsspam-trac.patch diff --git a/cvsspam-multibyte_enc_disables_highlight-patch1.diff b/cvsspam-multibyte_enc_disables_highlight-patch1.diff deleted file mode 100644 index b1e3011..0000000 --- a/cvsspam-multibyte_enc_disables_highlight-patch1.diff +++ /dev/null @@ -1,35 +0,0 @@ ---- cvsspam.rb (working copy) -+++ cvsspam.rb 2009-03-05 01:48:46.419779119 +0200 -@@ -936,7 +936,10 @@ - addInfixSize = line.length - (prefixLen+suffixLen) - oversize_change = deleteInfixSize*100/@lineJustDeleted.length>33 || addInfixSize*100/line.length>33 - -- if prefixLen==1 && suffixLen==0 || deleteInfixSize<=0 || oversize_change -+ # avoid doing 'within-a-line highlighting' if a multibyte encoding -+ # is suspected, as all the suffix/prefix stuff above is byte, not -+ # character based -+ if multibyte_encoding? || prefixLen==1 && suffixLen==0 || deleteInfixSize<=0 || oversize_change - print(htmlEncode(@lineJustDeleted)) - else - print(htmlEncode(@lineJustDeleted[0,prefixLen])) -@@ -1118,7 +1121,7 @@ - @lineJustDeleted = nil - end - shift(initial) -- if prefixLen==1 && suffixLen==0 || addInfixSize<=0 || oversize_change -+ if multibyte_encoding? || prefixLen==1 && suffixLen==0 || addInfixSize<=0 || oversize_change - encoded = htmlEncode(line) - else - encoded = htmlEncode(line[0,prefixLen]) + -@@ -1297,6 +1300,11 @@ - end - end - -+# guess if the users selected encoding is multibyte, since some CVSspam code -+# isn't multibyte-safe, and needs to be disabled. -+def multibyte_encoding? -+ $charset && ["utf-8", "utf-16"].include?($charset.downcase) -+end - - cvsroot_dir = "#{ENV['CVSROOT']}/CVSROOT" - $config = "#{cvsroot_dir}/cvsspam.conf" diff --git a/cvsspam-trac.patch b/cvsspam-trac.patch deleted file mode 100644 index c1b80a3..0000000 --- a/cvsspam-trac.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- cvsspam-0.2.12/cvsspam.rb 2009-04-23 20:54:40.224507514 +0300 -+++ cvsspam/cvsspam.rb 2009-04-23 20:53:58.177842646 +0300 -@@ -560,6 +560,10 @@ - jiraSub = proc { |match| - "#{match}" - } -+tracSub = proc { |match| -+ match =~ /([0-9]+)/ -+ "#{match}" -+} - ticketSub = proc { |match| - match =~ /([0-9]+)/ - "#{match}" -@@ -929,16 +933,39 @@ - - # Link to Trac - class TracFrontend < WebFrontend -+ -+ def base_url() -+ url = @base_url -+ -+ module_path = '/' -+ if Repository.count == 1 -+ rep = Repository.array.first -+ module_path << rep.common_prefix -+ end -+ -+ # if $tracProjects is set process repository_name to setup new $tracURL -+ if $tracProjects != nil && $tracURL != nil -+ $tracProjects.sort {|a,b| b[1] <=> a[1] }.each do |project, path| -+ if module_path.index(path) == 0 -+ url = "#{@base_url}/#{project}" -+ break -+ end -+ end -+ end -+ blah("base_url: '#{url}'") -+ return url -+ end -+ - def path_url(path, tag) -- add_repo("#{@base_url}browser/#{urlEncode(path)}") -+ add_repo("#{base_url}/browser/#{urlEncode(path)}") - end - - def version_url(path, version) -- add_repo("#{@base_url}browser/#{urlEncode(path)}?rev=#{version}") -+ add_repo("#{base_url}/browser/#{urlEncode(path)}?rev=#{version}") - end - - def diff_url(file) -- add_repo("#{@base_url}changeset/#{file.toVer}") -+ add_repo("#{base_url}/changeset/#{file.toVer}") - end - - protected -@@ -949,7 +976,7 @@ - else - log_anchor = "" - end -- add_repo("#{@base_url}log/#{urlEncode(file.path)}#{log_anchor}") -+ add_repo("#{base_url}/log/#{urlEncode(file.path)}#{log_anchor}") - end - end - -@@ -1693,6 +1720,7 @@ - $ticketURL = nil - $issueURL = nil - $viewcvsURL = nil -+$tracProjects = nil - $xplannerIterationURL = nil - $xplannerProjectURL = nil - $xplannerStoryURL = nil -@@ -1818,7 +1847,9 @@ - if $jiraURL != nil - commentSubstitutions['\b[a-zA-Z]+-[0-9]+\b'] = jiraSub - end --if $ticketURL != nil -+if $tracURL != nil -+ commentSubstitutions['\b[Tt][Ii][Cc][Kk][Ee][Tt]\s*#?[0-9]+\b'] = tracSub -+elsif $ticketURL != nil - commentSubstitutions['\b[Tt][Ii][Cc][Kk][Ee][Tt]\s*#?[0-9]+\b'] = ticketSub - end - if $issueURL != nil -- 2.43.0