]>
Commit | Line | Data |
---|---|---|
426191d1 ER |
1 | --- cvsspam-0.2.12/cvsspam.rb 2009-04-23 20:54:40.224507514 +0300 |
2 | +++ cvsspam/cvsspam.rb 2009-04-23 20:53:58.177842646 +0300 | |
20c31d42 ER |
3 | @@ -560,6 +560,10 @@ |
4 | jiraSub = proc { |match| | |
5 | "<a href=\"#{$jiraURL.sub(/%s/, match)}\">#{match}</a>" | |
6 | } | |
7 | +tracSub = proc { |match| | |
8 | + match =~ /([0-9]+)/ | |
9 | + "<a href=\"#{"$tracURL/ticket/%s".sub(/%s/, $1)}\">#{match}</a>" | |
10 | +} | |
11 | ticketSub = proc { |match| | |
12 | match =~ /([0-9]+)/ | |
13 | "<a href=\"#{$ticketURL.sub(/%s/, $1)}\">#{match}</a>" | |
426191d1 ER |
14 | @@ -929,16 +933,39 @@ |
15 | ||
20c31d42 ER |
16 | # Link to Trac |
17 | class TracFrontend < WebFrontend | |
426191d1 ER |
18 | + |
19 | + def base_url() | |
20 | + url = @base_url | |
21 | + | |
22 | + module_path = '/' | |
23 | + if Repository.count == 1 | |
24 | + rep = Repository.array.first | |
25 | + module_path << rep.common_prefix | |
26 | + end | |
27 | + | |
28 | + # if $tracProjects is set process repository_name to setup new $tracURL | |
29 | + if $tracProjects != nil && $tracURL != nil | |
30 | + $tracProjects.sort {|a,b| b[1] <=> a[1] }.each do |project, path| | |
31 | + if module_path.index(path) == 0 | |
32 | + url = "#{@base_url}/#{project}" | |
33 | + break | |
34 | + end | |
35 | + end | |
36 | + end | |
37 | + blah("base_url: '#{url}'") | |
38 | + return url | |
39 | + end | |
40 | + | |
20c31d42 ER |
41 | def path_url(path, tag) |
42 | - add_repo("#{@base_url}browser/#{urlEncode(path)}") | |
426191d1 | 43 | + add_repo("#{base_url}/browser/#{urlEncode(path)}") |
20c31d42 ER |
44 | end |
45 | ||
46 | def version_url(path, version) | |
47 | - add_repo("#{@base_url}browser/#{urlEncode(path)}?rev=#{version}") | |
426191d1 | 48 | + add_repo("#{base_url}/browser/#{urlEncode(path)}?rev=#{version}") |
20c31d42 ER |
49 | end |
50 | ||
51 | def diff_url(file) | |
52 | - add_repo("#{@base_url}changeset/#{file.toVer}") | |
426191d1 | 53 | + add_repo("#{base_url}/changeset/#{file.toVer}") |
20c31d42 ER |
54 | end |
55 | ||
56 | protected | |
426191d1 | 57 | @@ -949,7 +976,7 @@ |
20c31d42 ER |
58 | else |
59 | log_anchor = "" | |
60 | end | |
61 | - add_repo("#{@base_url}log/#{urlEncode(file.path)}#{log_anchor}") | |
426191d1 | 62 | + add_repo("#{base_url}/log/#{urlEncode(file.path)}#{log_anchor}") |
20c31d42 ER |
63 | end |
64 | end | |
65 | ||
426191d1 ER |
66 | @@ -1693,6 +1720,7 @@ |
67 | $ticketURL = nil | |
68 | $issueURL = nil | |
69 | $viewcvsURL = nil | |
70 | +$tracProjects = nil | |
71 | $xplannerIterationURL = nil | |
72 | $xplannerProjectURL = nil | |
73 | $xplannerStoryURL = nil | |
74 | @@ -1818,7 +1847,9 @@ | |
20c31d42 ER |
75 | if $jiraURL != nil |
76 | commentSubstitutions['\b[a-zA-Z]+-[0-9]+\b'] = jiraSub | |
77 | end | |
78 | -if $ticketURL != nil | |
79 | +if $tracURL != nil | |
80 | + commentSubstitutions['\b[Tt][Ii][Cc][Kk][Ee][Tt]\s*#?[0-9]+\b'] = tracSub | |
81 | +elsif $ticketURL != nil | |
82 | commentSubstitutions['\b[Tt][Ii][Cc][Kk][Ee][Tt]\s*#?[0-9]+\b'] = ticketSub | |
83 | end | |
84 | if $issueURL != nil |