annotate .svn/pristine/94/944d411653288a21a0ff204f1b6e78fb0e5bc022.svn-base @ 1519:afce8026aaeb redmine-2.4-integration

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