| @@ -1,176 +1,182 | |||
|
|
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(txt) |
|
|
22 | 22 | txt.to_s[0,8] |
|
|
23 | 23 | end |
|
|
24 | 24 | |
|
|
25 | def truncate_at_line_break(text, length = 255) | |
|
|
26 | if text | |
|
|
27 | text.gsub(%r{^(.{#{length}}[^\n]*)\n.+$}m, '\\1...') | |
|
|
28 | end | |
|
|
29 | end | |
|
|
30 | ||
|
|
25 | 31 | def render_properties(properties) |
|
|
26 | 32 | unless properties.nil? || properties.empty? |
|
|
27 | 33 | content = '' |
|
|
28 | 34 | properties.keys.sort.each do |property| |
|
|
29 | 35 | content << content_tag('li', "<b>#{h property}</b>: <span>#{h properties[property]}</span>") |
|
|
30 | 36 | end |
|
|
31 | 37 | content_tag('ul', content, :class => 'properties') |
|
|
32 | 38 | end |
|
|
33 | 39 | end |
|
|
34 | 40 | |
|
|
35 | 41 | def render_changeset_changes |
|
|
36 | 42 | changes = @changeset.changes.find(:all, :limit => 1000, :order => 'path').collect do |change| |
|
|
37 | 43 | case change.action |
|
|
38 | 44 | when 'A' |
|
|
39 | 45 | # Detects moved/copied files |
|
|
40 | 46 | if !change.from_path.blank? |
|
|
41 | 47 | change.action = @changeset.changes.detect {|c| c.action == 'D' && c.path == change.from_path} ? 'R' : 'C' |
|
|
42 | 48 | end |
|
|
43 | 49 | change |
|
|
44 | 50 | when 'D' |
|
|
45 | 51 | @changeset.changes.detect {|c| c.from_path == change.path} ? nil : change |
|
|
46 | 52 | else |
|
|
47 | 53 | change |
|
|
48 | 54 | end |
|
|
49 | 55 | end.compact |
|
|
50 | 56 | |
|
|
51 | 57 | tree = { } |
|
|
52 | 58 | changes.each do |change| |
|
|
53 | 59 | p = tree |
|
|
54 | 60 | dirs = change.path.to_s.split('/').select {|d| !d.blank?} |
|
|
55 | 61 | dirs.each do |dir| |
|
|
56 | 62 | p[:s] ||= {} |
|
|
57 | 63 | p = p[:s] |
|
|
58 | 64 | p[dir] ||= {} |
|
|
59 | 65 | p = p[dir] |
|
|
60 | 66 | end |
|
|
61 | 67 | p[:c] = change |
|
|
62 | 68 | end |
|
|
63 | 69 | |
|
|
64 | 70 | render_changes_tree(tree[:s]) |
|
|
65 | 71 | end |
|
|
66 | 72 | |
|
|
67 | 73 | def render_changes_tree(tree) |
|
|
68 | 74 | return '' if tree.nil? |
|
|
69 | 75 | |
|
|
70 | 76 | output = '' |
|
|
71 | 77 | output << '<ul>' |
|
|
72 | 78 | tree.keys.sort.each do |file| |
|
|
73 | 79 | s = !tree[file][:s].nil? |
|
|
74 | 80 | c = tree[file][:c] |
|
|
75 | 81 | |
|
|
76 | 82 | style = 'change' |
|
|
77 | 83 | style << ' folder' if s |
|
|
78 | 84 | style << " change-#{c.action}" if c |
|
|
79 | 85 | |
|
|
80 | 86 | text = h(file) |
|
|
81 | 87 | unless c.nil? |
|
|
82 | 88 | path_param = to_path_param(@repository.relative_path(c.path)) |
|
|
83 | 89 | text = link_to(text, :controller => 'repositories', |
|
|
84 | 90 | :action => 'entry', |
|
|
85 | 91 | :id => @project, |
|
|
86 | 92 | :path => path_param, |
|
|
87 | 93 | :rev => @changeset.revision) unless s || c.action == 'D' |
|
|
88 | 94 | text << " - #{c.revision}" unless c.revision.blank? |
|
|
89 | 95 | text << ' (' + link_to('diff', :controller => 'repositories', |
|
|
90 | 96 | :action => 'diff', |
|
|
91 | 97 | :id => @project, |
|
|
92 | 98 | :path => path_param, |
|
|
93 | 99 | :rev => @changeset.revision) + ') ' if c.action == 'M' |
|
|
94 | 100 | text << ' ' + content_tag('span', c.from_path, :class => 'copied-from') unless c.from_path.blank? |
|
|
95 | 101 | end |
|
|
96 | 102 | output << "<li class='#{style}'>#{text}</li>" |
|
|
97 | 103 | output << render_changes_tree(tree[file][:s]) if s |
|
|
98 | 104 | end |
|
|
99 | 105 | output << '</ul>' |
|
|
100 | 106 | output |
|
|
101 | 107 | end |
|
|
102 | 108 | |
|
|
103 | 109 | def to_utf8(str) |
|
|
104 | 110 | return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii |
|
|
105 | 111 | @encodings ||= Setting.repositories_encodings.split(',').collect(&:strip) |
|
|
106 | 112 | @encodings.each do |encoding| |
|
|
107 | 113 | begin |
|
|
108 | 114 | return Iconv.conv('UTF-8', encoding, str) |
|
|
109 | 115 | rescue Iconv::Failure |
|
|
110 | 116 | # do nothing here and try the next encoding |
|
|
111 | 117 | end |
|
|
112 | 118 | end |
|
|
113 | 119 | str |
|
|
114 | 120 | end |
|
|
115 | 121 | |
|
|
116 | 122 | def repository_field_tags(form, repository) |
|
|
117 | 123 | method = repository.class.name.demodulize.underscore + "_field_tags" |
|
|
118 | 124 | send(method, form, repository) if repository.is_a?(Repository) && respond_to?(method) |
|
|
119 | 125 | end |
|
|
120 | 126 | |
|
|
121 | 127 | def scm_select_tag(repository) |
|
|
122 | 128 | scm_options = [["--- #{l(:actionview_instancetag_blank_option)} ---", '']] |
|
|
123 | 129 | REDMINE_SUPPORTED_SCM.each do |scm| |
|
|
124 | 130 | scm_options << ["Repository::#{scm}".constantize.scm_name, scm] if Setting.enabled_scm.include?(scm) || (repository && repository.class.name.demodulize == scm) |
|
|
125 | 131 | end |
|
|
126 | 132 | |
|
|
127 | 133 | select_tag('repository_scm', |
|
|
128 | 134 | options_for_select(scm_options, repository.class.name.demodulize), |
|
|
129 | 135 | :disabled => (repository && !repository.new_record?), |
|
|
130 | 136 | :onchange => remote_function(:url => { :controller => 'repositories', :action => 'edit', :id => @project }, :method => :get, :with => "Form.serialize(this.form)") |
|
|
131 | 137 | ) |
|
|
132 | 138 | end |
|
|
133 | 139 | |
|
|
134 | 140 | def with_leading_slash(path) |
|
|
135 | 141 | path.to_s.starts_with?('/') ? path : "/#{path}" |
|
|
136 | 142 | end |
|
|
137 | 143 | |
|
|
138 | 144 | def without_leading_slash(path) |
|
|
139 | 145 | path.gsub(%r{^/+}, '') |
|
|
140 | 146 | end |
|
|
141 | 147 | |
|
|
142 | 148 | def subversion_field_tags(form, repository) |
|
|
143 | 149 | content_tag('p', form.text_field(:url, :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)) + |
|
|
144 | 150 | '<br />(http://, https://, svn://, file:///)') + |
|
|
145 | 151 | content_tag('p', form.text_field(:login, :size => 30)) + |
|
|
146 | 152 | content_tag('p', form.password_field(:password, :size => 30, :name => 'ignore', |
|
|
147 | 153 | :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)), |
|
|
148 | 154 | :onfocus => "this.value=''; this.name='repository[password]';", |
|
|
149 | 155 | :onchange => "this.name='repository[password]';")) |
|
|
150 | 156 | end |
|
|
151 | 157 | |
|
|
152 | 158 | def darcs_field_tags(form, repository) |
|
|
153 | 159 | content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?))) |
|
|
154 | 160 | end |
|
|
155 | 161 | |
|
|
156 | 162 | def mercurial_field_tags(form, repository) |
|
|
157 | 163 | content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?))) |
|
|
158 | 164 | end |
|
|
159 | 165 | |
|
|
160 | 166 | def git_field_tags(form, repository) |
|
|
161 | 167 | content_tag('p', form.text_field(:url, :label => 'Path to .git directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?))) |
|
|
162 | 168 | end |
|
|
163 | 169 | |
|
|
164 | 170 | def cvs_field_tags(form, repository) |
|
|
165 | 171 | content_tag('p', form.text_field(:root_url, :label => 'CVSROOT', :size => 60, :required => true, :disabled => !repository.new_record?)) + |
|
|
166 | 172 | content_tag('p', form.text_field(:url, :label => 'Module', :size => 30, :required => true, :disabled => !repository.new_record?)) |
|
|
167 | 173 | end |
|
|
168 | 174 | |
|
|
169 | 175 | def bazaar_field_tags(form, repository) |
|
|
170 | 176 | content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?))) |
|
|
171 | 177 | end |
|
|
172 | 178 | |
|
|
173 | 179 | def filesystem_field_tags(form, repository) |
|
|
174 | 180 | content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?))) |
|
|
175 | 181 | end |
|
|
176 | 182 | end |
| @@ -1,28 +1,28 | |||
|
|
1 | 1 | <% form_tag({:controller => 'repositories', :action => 'diff', :id => @project, :path => to_path_param(path)}, :method => :get) do %> |
|
|
2 | 2 | <table class="list changesets"> |
|
|
3 | 3 | <thead><tr> |
|
|
4 | 4 | <th>#</th> |
|
|
5 | 5 | <th></th> |
|
|
6 | 6 | <th></th> |
|
|
7 | 7 | <th><%= l(:label_date) %></th> |
|
|
8 | 8 | <th><%= l(:field_author) %></th> |
|
|
9 | 9 | <th><%= l(:field_comments) %></th> |
|
|
10 | 10 | </tr></thead> |
|
|
11 | 11 | <tbody> |
|
|
12 | 12 | <% show_diff = entry && entry.is_file? && revisions.size > 1 %> |
|
|
13 | 13 | <% line_num = 1 %> |
|
|
14 | 14 | <% revisions.each do |changeset| %> |
|
|
15 | 15 | <tr class="changeset <%= cycle 'odd', 'even' %>"> |
|
|
16 | 16 | <td class="id"><%= link_to format_revision(changeset.revision), :action => 'revision', :id => project, :rev => changeset.revision %></td> |
|
|
17 | 17 | <td class="checkbox"><%= radio_button_tag('rev', changeset.revision, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %></td> |
|
|
18 | 18 | <td class="checkbox"><%= radio_button_tag('rev_to', changeset.revision, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td> |
|
|
19 | 19 | <td class="committed_on"><%= format_time(changeset.committed_on) %></td> |
|
|
20 | 20 | <td class="author"><%=h changeset.committer.to_s.split('<').first %></td> |
|
|
21 | <td class="comments"><%= textilizable(changeset.comments) %></td> | |
|
|
21 | <td class="comments"><%= textilizable(truncate_at_line_break(changeset.comments)) %></td> | |
|
|
22 | 22 | </tr> |
|
|
23 | 23 | <% line_num += 1 %> |
|
|
24 | 24 | <% end %> |
|
|
25 | 25 | </tbody> |
|
|
26 | 26 | </table> |
|
|
27 | 27 | <%= submit_tag(l(:label_view_diff), :name => nil) if show_diff %> |
|
|
28 | 28 | <% end %> |
General Comments 0
You need to be logged in to leave comments.
Login now