##// END OF EJS Templates
scm: prevent diff shows trace if UTF-8 is invalid in Ruby 1.9....
Toshi MARUYAMA -
r4792:111ae3c2e958
parent child
Show More
@@ -1,200 +1,204
1 1 # redMine - project management software
2 2 # Copyright (C) 2006 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require 'iconv'
19 19
20 20 module RepositoriesHelper
21 21 def format_revision(revision)
22 22 if revision.respond_to? :format_identifier
23 23 revision.format_identifier
24 24 else
25 25 revision.to_s
26 26 end
27 27 end
28 28
29 29 def truncate_at_line_break(text, length = 255)
30 30 if text
31 31 text.gsub(%r{^(.{#{length}}[^\n]*)\n.+$}m, '\\1...')
32 32 end
33 33 end
34 34
35 35 def render_properties(properties)
36 36 unless properties.nil? || properties.empty?
37 37 content = ''
38 38 properties.keys.sort.each do |property|
39 39 content << content_tag('li', "<b>#{h property}</b>: <span>#{h properties[property]}</span>")
40 40 end
41 41 content_tag('ul', content, :class => 'properties')
42 42 end
43 43 end
44 44
45 45 def render_changeset_changes
46 46 changes = @changeset.changes.find(:all, :limit => 1000, :order => 'path').collect do |change|
47 47 case change.action
48 48 when 'A'
49 49 # Detects moved/copied files
50 50 if !change.from_path.blank?
51 51 change.action = @changeset.changes.detect {|c| c.action == 'D' && c.path == change.from_path} ? 'R' : 'C'
52 52 end
53 53 change
54 54 when 'D'
55 55 @changeset.changes.detect {|c| c.from_path == change.path} ? nil : change
56 56 else
57 57 change
58 58 end
59 59 end.compact
60 60
61 61 tree = { }
62 62 changes.each do |change|
63 63 p = tree
64 64 dirs = change.path.to_s.split('/').select {|d| !d.blank?}
65 65 path = ''
66 66 dirs.each do |dir|
67 67 path += '/' + dir
68 68 p[:s] ||= {}
69 69 p = p[:s]
70 70 p[path] ||= {}
71 71 p = p[path]
72 72 end
73 73 p[:c] = change
74 74 end
75 75
76 76 render_changes_tree(tree[:s])
77 77 end
78 78
79 79 def render_changes_tree(tree)
80 80 return '' if tree.nil?
81 81
82 82 output = ''
83 83 output << '<ul>'
84 84 tree.keys.sort.each do |file|
85 85 style = 'change'
86 86 text = File.basename(h(file))
87 87 if s = tree[file][:s]
88 88 style << ' folder'
89 89 path_param = to_path_param(@repository.relative_path(file))
90 90 text = link_to(text, :controller => 'repositories',
91 91 :action => 'show',
92 92 :id => @project,
93 93 :path => path_param,
94 94 :rev => @changeset.identifier)
95 95 output << "<li class='#{style}'>#{text}</li>"
96 96 output << render_changes_tree(s)
97 97 elsif c = tree[file][:c]
98 98 style << " change-#{c.action}"
99 99 path_param = to_path_param(@repository.relative_path(c.path))
100 100 text = link_to(text, :controller => 'repositories',
101 101 :action => 'entry',
102 102 :id => @project,
103 103 :path => path_param,
104 104 :rev => @changeset.identifier) unless c.action == 'D'
105 105 text << " - #{c.revision}" unless c.revision.blank?
106 106 text << ' (' + link_to('diff', :controller => 'repositories',
107 107 :action => 'diff',
108 108 :id => @project,
109 109 :path => path_param,
110 110 :rev => @changeset.identifier) + ') ' if c.action == 'M'
111 111 text << ' ' + content_tag('span', c.from_path, :class => 'copied-from') unless c.from_path.blank?
112 112 output << "<li class='#{style}'>#{text}</li>"
113 113 end
114 114 end
115 115 output << '</ul>'
116 116 output
117 117 end
118 118
119 119 def to_utf8(str)
120 120 if str.respond_to?(:force_encoding)
121 121 str.force_encoding('UTF-8')
122 122 return str if str.valid_encoding?
123 123 else
124 124 return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
125 125 end
126 126
127 127 @encodings ||= Setting.repositories_encodings.split(',').collect(&:strip)
128 128 @encodings.each do |encoding|
129 129 begin
130 130 return Iconv.conv('UTF-8', encoding, str)
131 131 rescue Iconv::Failure
132 132 # do nothing here and try the next encoding
133 133 end
134 134 end
135 if str.respond_to?(:force_encoding)
136 str = str.encode("ASCII-8BIT", :invalid => :replace,
137 :undef => :replace, :replace => '?').encode("UTF-8")
138 end
135 139 str
136 140 end
137 141
138 142 def repository_field_tags(form, repository)
139 143 method = repository.class.name.demodulize.underscore + "_field_tags"
140 144 send(method, form, repository) if repository.is_a?(Repository) && respond_to?(method) && method != 'repository_field_tags'
141 145 end
142 146
143 147 def scm_select_tag(repository)
144 148 scm_options = [["--- #{l(:actionview_instancetag_blank_option)} ---", '']]
145 149 Redmine::Scm::Base.all.each do |scm|
146 150 scm_options << ["Repository::#{scm}".constantize.scm_name, scm] if Setting.enabled_scm.include?(scm) || (repository && repository.class.name.demodulize == scm)
147 151 end
148 152
149 153 select_tag('repository_scm',
150 154 options_for_select(scm_options, repository.class.name.demodulize),
151 155 :disabled => (repository && !repository.new_record?),
152 156 :onchange => remote_function(:url => { :controller => 'repositories', :action => 'edit', :id => @project }, :method => :get, :with => "Form.serialize(this.form)")
153 157 )
154 158 end
155 159
156 160 def with_leading_slash(path)
157 161 path.to_s.starts_with?('/') ? path : "/#{path}"
158 162 end
159 163
160 164 def without_leading_slash(path)
161 165 path.gsub(%r{^/+}, '')
162 166 end
163 167
164 168 def subversion_field_tags(form, repository)
165 169 content_tag('p', form.text_field(:url, :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)) +
166 170 '<br />(file:///, http://, https://, svn://, svn+[tunnelscheme]://)') +
167 171 content_tag('p', form.text_field(:login, :size => 30)) +
168 172 content_tag('p', form.password_field(:password, :size => 30, :name => 'ignore',
169 173 :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
170 174 :onfocus => "this.value=''; this.name='repository[password]';",
171 175 :onchange => "this.name='repository[password]';"))
172 176 end
173 177
174 178 def darcs_field_tags(form, repository)
175 179 content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
176 180 end
177 181
178 182 def mercurial_field_tags(form, repository)
179 183 content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
180 184 end
181 185
182 186 def git_field_tags(form, repository)
183 187 content_tag('p', form.text_field(:url, :label => 'Path to repository',
184 188 :size => 60, :required => true,
185 189 :disabled => (repository && !repository.root_url.blank?)))
186 190 end
187 191
188 192 def cvs_field_tags(form, repository)
189 193 content_tag('p', form.text_field(:root_url, :label => 'CVSROOT', :size => 60, :required => true, :disabled => !repository.new_record?)) +
190 194 content_tag('p', form.text_field(:url, :label => 'Module', :size => 30, :required => true, :disabled => !repository.new_record?))
191 195 end
192 196
193 197 def bazaar_field_tags(form, repository)
194 198 content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
195 199 end
196 200
197 201 def filesystem_field_tags(form, repository)
198 202 content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
199 203 end
200 204 end
General Comments 0
You need to be logged in to leave comments. Login now