Chris@1494: # Redmine - project management software Chris@1494: # Copyright (C) 2006-2014 Jean-Philippe Lang Chris@1494: # Chris@1494: # This program is free software; you can redistribute it and/or Chris@1494: # modify it under the terms of the GNU General Public License Chris@1494: # as published by the Free Software Foundation; either version 2 Chris@1494: # of the License, or (at your option) any later version. Chris@1494: # Chris@1494: # This program is distributed in the hope that it will be useful, Chris@1494: # but WITHOUT ANY WARRANTY; without even the implied warranty of Chris@1494: # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Chris@1494: # GNU General Public License for more details. Chris@1494: # Chris@1494: # You should have received a copy of the GNU General Public License Chris@1494: # along with this program; if not, write to the Free Software Chris@1494: # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Chris@1494: Chris@1494: module Redmine Chris@1494: # Class used to parse unified diffs Chris@1494: class UnifiedDiff < Array Chris@1494: attr_reader :diff_type, :diff_style Chris@1494: Chris@1494: def initialize(diff, options={}) Chris@1494: options.assert_valid_keys(:type, :style, :max_lines) Chris@1494: diff = diff.split("\n") if diff.is_a?(String) Chris@1494: @diff_type = options[:type] || 'inline' Chris@1494: @diff_style = options[:style] Chris@1494: lines = 0 Chris@1494: @truncated = false Chris@1494: diff_table = DiffTable.new(diff_type, diff_style) Chris@1494: diff.each do |line_raw| Chris@1494: line = Redmine::CodesetUtil.to_utf8_by_setting(line_raw) Chris@1494: unless diff_table.add_line(line) Chris@1494: self << diff_table if diff_table.length > 0 Chris@1494: diff_table = DiffTable.new(diff_type, diff_style) Chris@1494: end Chris@1494: lines += 1 Chris@1494: if options[:max_lines] && lines > options[:max_lines] Chris@1494: @truncated = true Chris@1494: break Chris@1494: end Chris@1494: end Chris@1494: self << diff_table unless diff_table.empty? Chris@1494: self Chris@1494: end Chris@1494: Chris@1494: def truncated?; @truncated; end Chris@1494: end Chris@1494: Chris@1494: # Class that represents a file diff Chris@1494: class DiffTable < Array Chris@1494: attr_reader :file_name Chris@1494: Chris@1494: # Initialize with a Diff file and the type of Diff View Chris@1494: # The type view must be inline or sbs (side_by_side) Chris@1494: def initialize(type="inline", style=nil) Chris@1494: @parsing = false Chris@1494: @added = 0 Chris@1494: @removed = 0 Chris@1494: @type = type Chris@1494: @style = style Chris@1494: @file_name = nil Chris@1494: @git_diff = false Chris@1494: end Chris@1494: Chris@1494: # Function for add a line of this Diff Chris@1494: # Returns false when the diff ends Chris@1494: def add_line(line) Chris@1494: unless @parsing Chris@1494: if line =~ /^(---|\+\+\+) (.*)$/ Chris@1494: self.file_name = $2 Chris@1494: elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/ Chris@1494: @line_num_l = $2.to_i Chris@1494: @line_num_r = $5.to_i Chris@1494: @parsing = true Chris@1494: end Chris@1494: else Chris@1494: if line =~ %r{^[^\+\-\s@\\]} Chris@1494: @parsing = false Chris@1494: return false Chris@1494: elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/ Chris@1494: @line_num_l = $2.to_i Chris@1494: @line_num_r = $5.to_i Chris@1494: else Chris@1494: parse_line(line, @type) Chris@1494: end Chris@1494: end Chris@1494: return true Chris@1494: end Chris@1494: Chris@1494: def each_line Chris@1494: prev_line_left, prev_line_right = nil, nil Chris@1494: each do |line| Chris@1494: spacing = prev_line_left && prev_line_right && (line.nb_line_left != prev_line_left+1) && (line.nb_line_right != prev_line_right+1) Chris@1494: yield spacing, line Chris@1494: prev_line_left = line.nb_line_left.to_i if line.nb_line_left.to_i > 0 Chris@1494: prev_line_right = line.nb_line_right.to_i if line.nb_line_right.to_i > 0 Chris@1494: end Chris@1494: end Chris@1494: Chris@1494: def inspect Chris@1494: puts '### DIFF TABLE ###' Chris@1494: puts "file : #{file_name}" Chris@1494: self.each do |d| Chris@1494: d.inspect Chris@1494: end Chris@1494: end Chris@1494: Chris@1494: private Chris@1494: Chris@1494: def file_name=(arg) Chris@1494: both_git_diff = false Chris@1494: if file_name.nil? Chris@1494: @git_diff = true if arg =~ %r{^(a/|/dev/null)} Chris@1494: else Chris@1494: both_git_diff = (@git_diff && arg =~ %r{^(b/|/dev/null)}) Chris@1494: end Chris@1494: if both_git_diff Chris@1494: if file_name && arg == "/dev/null" Chris@1494: # keep the original file name Chris@1494: @file_name = file_name.sub(%r{^a/}, '') Chris@1494: else Chris@1494: # remove leading b/ Chris@1494: @file_name = arg.sub(%r{^b/}, '') Chris@1494: end Chris@1494: elsif @style == "Subversion" Chris@1494: # removing trailing "(revision nn)" Chris@1494: @file_name = arg.sub(%r{\t+\(.*\)$}, '') Chris@1494: else Chris@1494: @file_name = arg Chris@1494: end Chris@1494: end Chris@1494: Chris@1494: def diff_for_added_line Chris@1494: if @type == 'sbs' && @removed > 0 && @added < @removed Chris@1494: self[-(@removed - @added)] Chris@1494: else Chris@1494: diff = Diff.new Chris@1494: self << diff Chris@1494: diff Chris@1494: end Chris@1494: end Chris@1494: Chris@1494: def parse_line(line, type="inline") Chris@1494: if line[0, 1] == "+" Chris@1494: diff = diff_for_added_line Chris@1494: diff.line_right = line[1..-1] Chris@1494: diff.nb_line_right = @line_num_r Chris@1494: diff.type_diff_right = 'diff_in' Chris@1494: @line_num_r += 1 Chris@1494: @added += 1 Chris@1494: true Chris@1494: elsif line[0, 1] == "-" Chris@1494: diff = Diff.new Chris@1494: diff.line_left = line[1..-1] Chris@1494: diff.nb_line_left = @line_num_l Chris@1494: diff.type_diff_left = 'diff_out' Chris@1494: self << diff Chris@1494: @line_num_l += 1 Chris@1494: @removed += 1 Chris@1494: true Chris@1494: else Chris@1494: write_offsets Chris@1494: if line[0, 1] =~ /\s/ Chris@1494: diff = Diff.new Chris@1494: diff.line_right = line[1..-1] Chris@1494: diff.nb_line_right = @line_num_r Chris@1494: diff.line_left = line[1..-1] Chris@1494: diff.nb_line_left = @line_num_l Chris@1494: self << diff Chris@1494: @line_num_l += 1 Chris@1494: @line_num_r += 1 Chris@1494: true Chris@1494: elsif line[0, 1] = "\\" Chris@1494: true Chris@1494: else Chris@1494: false Chris@1494: end Chris@1494: end Chris@1494: end Chris@1494: Chris@1494: def write_offsets Chris@1494: if @added > 0 && @added == @removed Chris@1494: @added.times do |i| Chris@1494: line = self[-(1 + i)] Chris@1494: removed = (@type == 'sbs') ? line : self[-(1 + @added + i)] Chris@1494: offsets = offsets(removed.line_left, line.line_right) Chris@1494: removed.offsets = line.offsets = offsets Chris@1494: end Chris@1494: end Chris@1494: @added = 0 Chris@1494: @removed = 0 Chris@1494: end Chris@1494: Chris@1494: def offsets(line_left, line_right) Chris@1494: if line_left.present? && line_right.present? && line_left != line_right Chris@1494: max = [line_left.size, line_right.size].min Chris@1494: starting = 0 Chris@1494: while starting < max && line_left[starting] == line_right[starting] Chris@1494: starting += 1 Chris@1494: end Chris@1494: if (! "".respond_to?(:force_encoding)) && starting < line_left.size Chris@1494: while line_left[starting].ord.between?(128, 191) && starting > 0 Chris@1494: starting -= 1 Chris@1494: end Chris@1494: end Chris@1494: ending = -1 Chris@1494: while ending >= -(max - starting) && (line_left[ending] == line_right[ending]) Chris@1494: ending -= 1 Chris@1494: end Chris@1494: if (! "".respond_to?(:force_encoding)) && ending > (-1 * line_left.size) Chris@1494: while line_left[ending].ord.between?(128, 255) && ending < -1 Chris@1494: if line_left[ending].ord.between?(128, 191) Chris@1494: if line_left[ending + 1].ord.between?(128, 191) Chris@1494: ending += 1 Chris@1494: else Chris@1494: break Chris@1494: end Chris@1494: else Chris@1494: ending += 1 Chris@1494: end Chris@1494: end Chris@1494: end Chris@1494: unless starting == 0 && ending == -1 Chris@1494: [starting, ending] Chris@1494: end Chris@1494: end Chris@1494: end Chris@1494: end Chris@1494: Chris@1494: # A line of diff Chris@1494: class Diff Chris@1494: attr_accessor :nb_line_left Chris@1494: attr_accessor :line_left Chris@1494: attr_accessor :nb_line_right Chris@1494: attr_accessor :line_right Chris@1494: attr_accessor :type_diff_right Chris@1494: attr_accessor :type_diff_left Chris@1494: attr_accessor :offsets Chris@1494: Chris@1494: def initialize() Chris@1494: self.nb_line_left = '' Chris@1494: self.nb_line_right = '' Chris@1494: self.line_left = '' Chris@1494: self.line_right = '' Chris@1494: self.type_diff_right = '' Chris@1494: self.type_diff_left = '' Chris@1494: end Chris@1494: Chris@1494: def type_diff Chris@1494: type_diff_right == 'diff_in' ? type_diff_right : type_diff_left Chris@1494: end Chris@1494: Chris@1494: def line Chris@1494: type_diff_right == 'diff_in' ? line_right : line_left Chris@1494: end Chris@1494: Chris@1494: def html_line_left Chris@1494: line_to_html(line_left, offsets) Chris@1494: end Chris@1494: Chris@1494: def html_line_right Chris@1494: line_to_html(line_right, offsets) Chris@1494: end Chris@1494: Chris@1494: def html_line Chris@1494: line_to_html(line, offsets) Chris@1494: end Chris@1494: Chris@1494: def inspect Chris@1494: puts '### Start Line Diff ###' Chris@1494: puts self.nb_line_left Chris@1494: puts self.line_left Chris@1494: puts self.nb_line_right Chris@1494: puts self.line_right Chris@1494: end Chris@1494: Chris@1494: private Chris@1494: Chris@1494: def line_to_html(line, offsets) Chris@1494: html = line_to_html_raw(line, offsets) Chris@1494: html.force_encoding('UTF-8') if html.respond_to?(:force_encoding) Chris@1494: html Chris@1494: end Chris@1494: Chris@1494: def line_to_html_raw(line, offsets) Chris@1494: if offsets Chris@1494: s = '' Chris@1494: unless offsets.first == 0 Chris@1494: s << CGI.escapeHTML(line[0..offsets.first-1]) Chris@1494: end Chris@1494: s << '' + CGI.escapeHTML(line[offsets.first..offsets.last]) + '' Chris@1494: unless offsets.last == -1 Chris@1494: s << CGI.escapeHTML(line[offsets.last+1..-1]) Chris@1494: end Chris@1494: s Chris@1494: else Chris@1494: CGI.escapeHTML(line) Chris@1494: end Chris@1494: end Chris@1494: end Chris@1494: end