annotate .svn/pristine/d4/d40bacc3af8fb7641b23c992be523d5d162b016d.svn-base @ 1298:4f746d8966dd redmine_2.3_integration

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