def diff
@rev_to = params[:rev_to] || (@rev-1)
- @diff = @repository.scm.diff(params[:path], @rev, @rev_to)
+ type = params[:type] || 'inline'
+ @diff = @repository.scm.diff(params[:path], @rev, @rev_to, type)
show_error and return unless @diff
end
def weeks_ago(date = Date.today)
(date.year - self.year)*52 + (date.cweek - self.cweek)
end
-end
\ No newline at end of file
+end
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
require 'rexml/document'
+require 'cgi'
module SvnRepos
raise CommandFailed
end
- def diff(path, identifier_from, identifier_to=nil)
+ def diff(path, identifier_from, identifier_to=nil, type="inline")
path ||= ''
if identifier_to and identifier_to.to_i > 0
identifier_to = identifier_to.to_i
end
end
return nil if $? && $?.exitstatus != 0
- diff
+ DiffTableList.new diff, type
+
rescue Errno::ENOENT => e
raise CommandFailed
end
self.message = attributes[:message] || ""
self.paths = attributes[:paths]
end
+
+ end
+
+ # A line of Diff
+ class Diff
+
+ attr_accessor :nb_line_left
+ attr_accessor :line_left
+ attr_accessor :nb_line_right
+ attr_accessor :line_right
+ attr_accessor :type_diff_right
+ attr_accessor :type_diff_left
+
+ def initialize ()
+ self.nb_line_left = ''
+ self.nb_line_right = ''
+ self.line_left = ''
+ self.line_right = ''
+ self.type_diff_right = ''
+ self.type_diff_left = ''
+ end
+
+ def inspect
+ puts '### Start Line Diff ###'
+ puts self.nb_line_left
+ puts self.line_left
+ puts self.nb_line_right
+ puts self.line_right
+ end
+ end
+
+ class DiffTableList < Array
+
+ def initialize (diff, type="inline")
+ diff_table = DiffTable.new type
+ diff.each do |line|
+ if line =~ /^Index: (.*)$/
+ self << diff_table if diff_table.length > 1
+ diff_table = DiffTable.new type
+ end
+ a = diff_table.add_line line
+ end
+ self << diff_table
+ end
+ end
+
+ # Class for create a Diff
+ class DiffTable < Hash
+
+ attr_reader :file_name, :line_num_l, :line_num_r
+
+ # Initialize with a Diff file and the type of Diff View
+ # The type view must be inline or sbs (side_by_side)
+ def initialize (type="inline")
+ @parsing = false
+ @nb_line = 1
+ @start = false
+ @before = 'same'
+ @second = true
+ @type = type
+ end
+
+ # Function for add a line of this Diff
+ def add_line(line)
+ unless @parsing
+ if line =~ /^Index: (.*)$/
+ @file_name = $1
+ return false
+ elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
+ @line_num_l = $2.to_i
+ @line_num_r = $5.to_i
+ @parsing = true
+ end
+ else
+ if line =~ /^_+$/
+ self.delete(self.keys.sort.last)
+ @parsing = false
+ return false
+ elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
+ @line_num_l = $2.to_i
+ @line_num_r = $5.to_i
+ else
+ @nb_line += 1 if parse_line(line, @type)
+ end
+ end
+ return true
+ end
+
+ def inspect
+ puts '### DIFF TABLE ###'
+ puts "file : #{file_name}"
+ self.each do |d|
+ d.inspect
+ end
+ end
+
+ private
+
+ # Test if is a Side By Side type
+ def sbs?(type, func)
+ if @start and type == "sbs"
+ if @before == func and @second
+ tmp_nb_line = @nb_line
+ self[tmp_nb_line] = Diff.new
+ else
+ @second = false
+ tmp_nb_line = @start
+ @start += 1
+ @nb_line -= 1
+ end
+ else
+ tmp_nb_line = @nb_line
+ @start = @nb_line
+ self[tmp_nb_line] = Diff.new
+ @second = true
+ end
+ unless self[tmp_nb_line]
+ @nb_line += 1
+ self[tmp_nb_line] = Diff.new
+ else
+ self[tmp_nb_line]
+ end
+ end
+
+ # Escape the HTML for the diff
+ def escapeHTML(line)
+ CGI.escapeHTML(line).gsub(/\s/, ' ')
+ end
+
+ def parse_line (line, type="inline")
+ if line[0, 1] == "+"
+ diff = sbs? type, 'add'
+ @before = 'add'
+ diff.line_left = escapeHTML line[1..-1]
+ diff.nb_line_left = @line_num_l
+ diff.type_diff_left = 'diff_in'
+ @line_num_l += 1
+ true
+ elsif line[0, 1] == "-"
+ diff = sbs? type, 'remove'
+ @before = 'remove'
+ diff.line_right = escapeHTML line[1..-1]
+ diff.nb_line_right = @line_num_r
+ diff.type_diff_right = 'diff_out'
+ @line_num_r += 1
+ true
+ elsif line[0, 1] =~ /\s/
+ @before = 'same'
+ @start = false
+ diff = Diff.new
+ diff.line_right = escapeHTML line[1..-1]
+ diff.nb_line_right = @line_num_r
+ diff.line_left = escapeHTML line[1..-1]
+ diff.nb_line_left = @line_num_l
+ self[@nb_line] = diff
+ @line_num_l += 1
+ @line_num_r += 1
+ true
+ else
+ false
+ end
+ end
end
end
\ No newline at end of file
<h2><%= l(:label_revision) %> <%= @rev %>: <%= @path.gsub(/^.*\//, '') %></h2>
-<% parsing = false
-line_num_l = 0
-line_num_r = 0 %>
-<% @diff.each do |line| %>
-<%
- if line =~ /^Index: (.*)$/
- if parsing %>
- </tbody></table>
- <%
- end
- parsing = false %>
- <table class="list"><thead>
- <tr><th colspan="3" class="list-filename"><%= l(:label_attachment) %>: <%= $1 %></th></tr>
- <tr><th>@<%= @rev %></th><th>@<%= @rev_to %></th><th></th></tr>
- </thead><tbody>
- <%
- next
- elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
- line_num_l = $2.to_i
- line_num_r = $5.to_i
- parsing = true
- next
- elsif line =~ /^_+$/
- # We have reached the 'Properties' section.
- parsing = false
- next
- end
- next unless parsing
-%>
-
-<tr>
-
-<% case line[0, 1]
- when " " %>
-<th class="line-num"><%= line_num_l %></th>
-<th class="line-num"><%= line_num_r %></th>
-<td class="line-code">
-<% line_num_l = line_num_l + 1
- line_num_r = line_num_r + 1
-
- when "-" %>
-<th class="line-num"></th>
-<th class="line-num"><%= line_num_r %></th>
-<td class="line-code" style="background: #fdd;">
-<% line_num_r = line_num_r + 1
-
- when "+" %>
-<th class="line-num"><%= line_num_l %></th>
-<th class="line-num"></th>
-<td class="line-code" style="background: #dfd;">
-<% line_num_l = line_num_l + 1
-
- else
- next
- end %>
-
-<%= h(line[1..-1]).gsub(/\s/, " ") %></td></tr>
+<!-- Choose view type -->
+<% form_tag({ :controller => 'repositories', :action => 'diff'}, :method => 'get') do %>
+ <% params.each do |k, p| %>
+ <% if k != "type" %>
+ <%= hidden_field_tag(k,p) %>
+ <% end %>
+ <% end %>
+ <p><label><%= l(:label_view_diff) %></label>
+ <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], params[:type]), :onchange => "if (this.value != '') {this.form.submit()}" %>
+ <%= submit_tag l(:button_apply) %></p>
+<% end %>
+<% @diff.each do |table_file| %>
+<% if params[:type] == 'sbs' %>
+ <table class="list">
+ <thead>
+ <tr>
+ <th colspan="4" class="list-filename">
+ <%= l(:label_attachment) %>: <%= table_file.file_name %>
+ </th>
+ </tr>
+ <tr>
+ <th colspan="2"><%= l(:label_revision) %> <%= @rev %></th>
+ <th colspan="2"><%= l(:label_revision) %> <%= @rev_to %></th>
+ </tr>
+ </thead>
+ <tbody>
+ <% table_file.keys.sort.each do |key| %>
+ <tr>
+ <th class="line-num">
+ <%= table_file[key].nb_line_left %>
+ </th>
+ <td class="line-code <%= table_file[key].type_diff_left %>">
+ <%= table_file[key].line_left %>
+ </td>
+ <th class="line-num">
+ <%= table_file[key].nb_line_right %>
+ </th>
+ <td class="line-code <%= table_file[key].type_diff_right %>">
+ <%= table_file[key].line_right %>
+ </td>
+ </tr>
+ <% end %>
+ </tbody>
+ </table>
+<% else %>
+ <table class="list">
+ <thead>
+ <tr>
+ <th colspan="3" class="list-filename">
+ <%= l(:label_attachment) %>: <%= table_file.file_name %>
+ </th>
+ </tr>
+ <tr>
+ <th>@<%= @rev %></th>
+ <th>@<%= @rev_to %></th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ <% table_file.keys.sort.each do |key, line| %>
+ <tr>
+ <th class="line-num">
+ <%= table_file[key].nb_line_left %>
+ </th>
+ <th class="line-num">
+ <%= table_file[key].nb_line_right %>
+ </th>
+ <% if table_file[key].line_left.empty? %>
+ <td class="line-code <%= table_file[key].type_diff_right %>">
+ <%= table_file[key].line_right %>
+ </td>
+ <% else %>
+ <td class="line-code <%= table_file[key].type_diff_left %>">
+ <%= table_file[key].line_left %>
+ </td>
+ <% end %>
+ </tr>
+ <% end %>
+ </tbody>
+ </table>
+<% end %>
<% end %>
-</tbody>
-</table>
<% content_for :header_tags do %>
<%= stylesheet_link_tag "scm" %>
label_statistics: Statistiken
label_commits_per_month: Übertragungen pro Monat
label_commits_per_author: Übertragungen pro Autor
+label_view_diff: View differences
+label_diff_inline: inline
+label_diff_side_by_side: side by side
button_login: Einloggen
button_submit: OK
label_statistics: Statistics
label_commits_per_month: Commits per month
label_commits_per_author: Commits per author
+label_view_diff: View differences
+label_diff_inline: inline
+label_diff_side_by_side: side by side
button_login: Login
button_submit: Submit
label_statistics: Statistics
label_commits_per_month: Commits per month
label_commits_per_author: Commits per author
+label_view_diff: View differences
+label_diff_inline: inline
+label_diff_side_by_side: side by side
button_login: Conexión
button_submit: Someter
label_statistics: Statistiques
label_commits_per_month: Commits par mois
label_commits_per_author: Commits par auteur
+label_view_diff: Voir les différences
+label_diff_inline: en ligne
+label_diff_side_by_side: côte à côte
button_login: Connexion
button_submit: Soumettre
label_statistics: Statistics
label_commits_per_month: Commits per month
label_commits_per_author: Commits per author
+label_view_diff: View differences
+label_diff_inline: inline
+label_diff_side_by_side: side by side
button_login: Login
button_submit: Invia
label_statistics: Statistics
label_commits_per_month: Commits per month
label_commits_per_author: Commits per author
+label_view_diff: View differences
+label_diff_inline: inline
+label_diff_side_by_side: side by side
button_login: ログイン
button_submit: 変更
font-weight: bolder;\r
text-align: left;\r
}\r
+\r
+.diff_out{\r
+ background: #fdd;\r
+}\r
+\r
+.diff_in{\r
+ background: #dfd;\r
+}\r
projects / redmine.git / commitdiff