annotate .svn/pristine/e2/e2bb0cea92833ba8c44d8a93db57426fa0eda055.svn-base @ 1327:287f201c2802 redmine-2.2-integration

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