annotate lib/redmine/.svn/text-base/unified_diff.rb.svn-base @ 1176:7d9db6065048 bug_352

Close obsolete branch bug_352
author Chris Cannam
date Wed, 01 Feb 2012 16:09:00 +0000
parents cbce1fd3b1b7
children
rev   line source
Chris@441 1 # Redmine - project management software
Chris@441 2 # Copyright (C) 2006-2011 Jean-Philippe Lang
Chris@0 3 #
Chris@0 4 # This program is free software; you can redistribute it and/or
Chris@0 5 # modify it under the terms of the GNU General Public License
Chris@0 6 # as published by the Free Software Foundation; either version 2
Chris@0 7 # of the License, or (at your option) any later version.
Chris@0 8 #
Chris@0 9 # This program is distributed in the hope that it will be useful,
Chris@0 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
Chris@0 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Chris@0 12 # GNU General Public License for more details.
Chris@0 13 #
Chris@0 14 # You should have received a copy of the GNU General Public License
Chris@0 15 # along with this program; if not, write to the Free Software
Chris@0 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Chris@0 17
Chris@0 18 module Redmine
Chris@0 19 # Class used to parse unified diffs
Chris@441 20 class UnifiedDiff < Array
Chris@441 21 attr_reader :diff_type
Chris@441 22
Chris@0 23 def initialize(diff, options={})
Chris@0 24 options.assert_valid_keys(:type, :max_lines)
Chris@0 25 diff = diff.split("\n") if diff.is_a?(String)
Chris@441 26 @diff_type = options[:type] || 'inline'
Chris@0 27 lines = 0
Chris@0 28 @truncated = false
Chris@441 29 diff_table = DiffTable.new(@diff_type)
Chris@0 30 diff.each do |line|
Chris@245 31 line_encoding = nil
Chris@245 32 if line.respond_to?(:force_encoding)
Chris@245 33 line_encoding = line.encoding
Chris@245 34 # TODO: UTF-16 and Japanese CP932 which is imcompatible with ASCII
Chris@245 35 # In Japan, diffrence between file path encoding
Chris@245 36 # and file contents encoding is popular.
Chris@245 37 line.force_encoding('ASCII-8BIT')
Chris@245 38 end
Chris@0 39 unless diff_table.add_line line
Chris@245 40 line.force_encoding(line_encoding) if line_encoding
Chris@245 41 self << diff_table if diff_table.length > 0
Chris@0 42 diff_table = DiffTable.new(diff_type)
Chris@0 43 end
Chris@0 44 lines += 1
Chris@0 45 if options[:max_lines] && lines > options[:max_lines]
Chris@0 46 @truncated = true
Chris@0 47 break
Chris@0 48 end
Chris@0 49 end
Chris@0 50 self << diff_table unless diff_table.empty?
Chris@0 51 self
Chris@0 52 end
Chris@245 53
Chris@0 54 def truncated?; @truncated; end
Chris@0 55 end
Chris@0 56
Chris@0 57 # Class that represents a file diff
Chris@441 58 class DiffTable < Array
Chris@441 59 attr_reader :file_name
Chris@0 60
Chris@0 61 # Initialize with a Diff file and the type of Diff View
Chris@0 62 # The type view must be inline or sbs (side_by_side)
Chris@0 63 def initialize(type="inline")
Chris@0 64 @parsing = false
Chris@441 65 @added = 0
Chris@441 66 @removed = 0
Chris@0 67 @type = type
Chris@0 68 end
Chris@0 69
Chris@0 70 # Function for add a line of this Diff
Chris@0 71 # Returns false when the diff ends
Chris@0 72 def add_line(line)
Chris@0 73 unless @parsing
Chris@0 74 if line =~ /^(---|\+\+\+) (.*)$/
Chris@0 75 @file_name = $2
Chris@0 76 elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
Chris@0 77 @line_num_l = $2.to_i
Chris@0 78 @line_num_r = $5.to_i
Chris@0 79 @parsing = true
Chris@0 80 end
Chris@0 81 else
Chris@0 82 if line =~ /^[^\+\-\s@\\]/
Chris@0 83 @parsing = false
Chris@0 84 return false
Chris@0 85 elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
Chris@0 86 @line_num_l = $2.to_i
Chris@0 87 @line_num_r = $5.to_i
Chris@0 88 else
Chris@441 89 parse_line(line, @type)
Chris@0 90 end
Chris@0 91 end
Chris@0 92 return true
Chris@0 93 end
Chris@441 94
Chris@441 95 def each_line
Chris@441 96 prev_line_left, prev_line_right = nil, nil
Chris@441 97 each do |line|
Chris@441 98 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 99 yield spacing, line
Chris@441 100 prev_line_left = line.nb_line_left.to_i if line.nb_line_left.to_i > 0
Chris@441 101 prev_line_right = line.nb_line_right.to_i if line.nb_line_right.to_i > 0
Chris@441 102 end
Chris@441 103 end
Chris@0 104
Chris@0 105 def inspect
Chris@0 106 puts '### DIFF TABLE ###'
Chris@0 107 puts "file : #{file_name}"
Chris@0 108 self.each do |d|
Chris@0 109 d.inspect
Chris@0 110 end
Chris@0 111 end
Chris@0 112
Chris@441 113 private
Chris@0 114
Chris@0 115 # Escape the HTML for the diff
Chris@0 116 def escapeHTML(line)
Chris@0 117 CGI.escapeHTML(line)
Chris@0 118 end
Chris@441 119
Chris@441 120 def diff_for_added_line
Chris@441 121 if @type == 'sbs' && @removed > 0 && @added < @removed
Chris@441 122 self[-(@removed - @added)]
Chris@441 123 else
Chris@441 124 diff = Diff.new
Chris@441 125 self << diff
Chris@441 126 diff
Chris@441 127 end
Chris@441 128 end
Chris@0 129
Chris@0 130 def parse_line(line, type="inline")
Chris@0 131 if line[0, 1] == "+"
Chris@441 132 diff = diff_for_added_line
Chris@0 133 diff.line_right = escapeHTML line[1..-1]
Chris@0 134 diff.nb_line_right = @line_num_r
Chris@0 135 diff.type_diff_right = 'diff_in'
Chris@0 136 @line_num_r += 1
Chris@441 137 @added += 1
Chris@0 138 true
Chris@0 139 elsif line[0, 1] == "-"
Chris@441 140 diff = Diff.new
Chris@0 141 diff.line_left = escapeHTML line[1..-1]
Chris@0 142 diff.nb_line_left = @line_num_l
Chris@0 143 diff.type_diff_left = 'diff_out'
Chris@441 144 self << diff
Chris@0 145 @line_num_l += 1
Chris@441 146 @removed += 1
Chris@0 147 true
Chris@441 148 else
Chris@441 149 write_offsets
Chris@441 150 if line[0, 1] =~ /\s/
Chris@441 151 diff = Diff.new
Chris@441 152 diff.line_right = escapeHTML line[1..-1]
Chris@441 153 diff.nb_line_right = @line_num_r
Chris@441 154 diff.line_left = escapeHTML line[1..-1]
Chris@441 155 diff.nb_line_left = @line_num_l
Chris@441 156 self << diff
Chris@441 157 @line_num_l += 1
Chris@441 158 @line_num_r += 1
Chris@441 159 true
Chris@441 160 elsif line[0, 1] = "\\"
Chris@0 161 true
Chris@0 162 else
Chris@0 163 false
Chris@0 164 end
Chris@0 165 end
Chris@0 166 end
Chris@441 167
Chris@441 168 def write_offsets
Chris@441 169 if @added > 0 && @added == @removed
Chris@441 170 @added.times do |i|
Chris@441 171 line = self[-(1 + i)]
Chris@441 172 removed = (@type == 'sbs') ? line : self[-(1 + @added + i)]
Chris@441 173 offsets = offsets(removed.line_left, line.line_right)
Chris@441 174 removed.offsets = line.offsets = offsets
Chris@441 175 end
Chris@441 176 end
Chris@441 177 @added = 0
Chris@441 178 @removed = 0
Chris@441 179 end
Chris@441 180
Chris@441 181 def offsets(line_left, line_right)
Chris@441 182 if line_left.present? && line_right.present? && line_left != line_right
Chris@441 183 max = [line_left.size, line_right.size].min
Chris@441 184 starting = 0
Chris@441 185 while starting < max && line_left[starting] == line_right[starting]
Chris@441 186 starting += 1
Chris@441 187 end
Chris@441 188 ending = -1
Chris@441 189 while ending >= -(max - starting) && line_left[ending] == line_right[ending]
Chris@441 190 ending -= 1
Chris@441 191 end
Chris@441 192 unless starting == 0 && ending == -1
Chris@441 193 [starting, ending]
Chris@441 194 end
Chris@441 195 end
Chris@441 196 end
Chris@441 197 end
Chris@0 198
Chris@0 199 # A line of diff
Chris@0 200 class Diff
Chris@0 201 attr_accessor :nb_line_left
Chris@0 202 attr_accessor :line_left
Chris@0 203 attr_accessor :nb_line_right
Chris@0 204 attr_accessor :line_right
Chris@0 205 attr_accessor :type_diff_right
Chris@0 206 attr_accessor :type_diff_left
Chris@441 207 attr_accessor :offsets
Chris@0 208
Chris@0 209 def initialize()
Chris@0 210 self.nb_line_left = ''
Chris@0 211 self.nb_line_right = ''
Chris@0 212 self.line_left = ''
Chris@0 213 self.line_right = ''
Chris@0 214 self.type_diff_right = ''
Chris@0 215 self.type_diff_left = ''
Chris@0 216 end
Chris@441 217
Chris@441 218 def type_diff
Chris@441 219 type_diff_right == 'diff_in' ? type_diff_right : type_diff_left
Chris@441 220 end
Chris@441 221
Chris@441 222 def line
Chris@441 223 type_diff_right == 'diff_in' ? line_right : line_left
Chris@441 224 end
Chris@441 225
Chris@441 226 def html_line_left
Chris@441 227 if offsets
Chris@441 228 line_left.dup.insert(offsets.first, '<span>').insert(offsets.last, '</span>')
Chris@441 229 else
Chris@441 230 line_left
Chris@441 231 end
Chris@441 232 end
Chris@441 233
Chris@441 234 def html_line_right
Chris@441 235 if offsets
Chris@441 236 line_right.dup.insert(offsets.first, '<span>').insert(offsets.last, '</span>')
Chris@441 237 else
Chris@441 238 line_right
Chris@441 239 end
Chris@441 240 end
Chris@441 241
Chris@441 242 def html_line
Chris@441 243 if offsets
Chris@441 244 line.dup.insert(offsets.first, '<span>').insert(offsets.last, '</span>')
Chris@441 245 else
Chris@441 246 line
Chris@441 247 end
Chris@441 248 end
Chris@0 249
Chris@0 250 def inspect
Chris@0 251 puts '### Start Line Diff ###'
Chris@0 252 puts self.nb_line_left
Chris@0 253 puts self.line_left
Chris@0 254 puts self.nb_line_right
Chris@0 255 puts self.line_right
Chris@0 256 end
Chris@0 257 end
Chris@0 258 end