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