annotate lib/redmine/unified_diff.rb @ 1296:038ba2d95de8 redmine-2.2

Fix redmine-2.2 branch update (add missing svn files)
author Chris Cannam
date Fri, 14 Jun 2013 09:05:06 +0100
parents 433d4f72a19b
children 622f24f53b42 261b3d9a4903
rev   line source
Chris@441 1 # Redmine - project management software
Chris@1115 2 # Copyright (C) 2006-2012 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@909 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@909 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@1115 21 attr_reader :diff_type, :diff_style
Chris@909 22
Chris@0 23 def initialize(diff, options={})
Chris@1115 24 options.assert_valid_keys(:type, :style, :max_lines)
Chris@0 25 diff = diff.split("\n") if diff.is_a?(String)
Chris@441 26 @diff_type = options[:type] || 'inline'
Chris@1115 27 @diff_style = options[:style]
Chris@0 28 lines = 0
Chris@0 29 @truncated = false
Chris@1115 30 diff_table = DiffTable.new(diff_type, diff_style)
Chris@0 31 diff.each do |line|
Chris@245 32 line_encoding = nil
Chris@245 33 if line.respond_to?(:force_encoding)
Chris@245 34 line_encoding = line.encoding
Chris@245 35 # TODO: UTF-16 and Japanese CP932 which is imcompatible with ASCII
Chris@245 36 # In Japan, diffrence between file path encoding
Chris@245 37 # and file contents encoding is popular.
Chris@245 38 line.force_encoding('ASCII-8BIT')
Chris@245 39 end
Chris@0 40 unless diff_table.add_line line
Chris@245 41 line.force_encoding(line_encoding) if line_encoding
Chris@245 42 self << diff_table if diff_table.length > 0
Chris@1115 43 diff_table = DiffTable.new(diff_type, diff_style)
Chris@0 44 end
Chris@0 45 lines += 1
Chris@0 46 if options[:max_lines] && lines > options[:max_lines]
Chris@0 47 @truncated = true
Chris@0 48 break
Chris@0 49 end
Chris@0 50 end
Chris@0 51 self << diff_table unless diff_table.empty?
Chris@0 52 self
Chris@0 53 end
Chris@245 54
Chris@0 55 def truncated?; @truncated; end
Chris@0 56 end
Chris@0 57
Chris@0 58 # Class that represents a file diff
Chris@909 59 class DiffTable < Array
Chris@441 60 attr_reader :file_name
Chris@0 61
Chris@0 62 # Initialize with a Diff file and the type of Diff View
Chris@0 63 # The type view must be inline or sbs (side_by_side)
Chris@1115 64 def initialize(type="inline", style=nil)
Chris@0 65 @parsing = false
Chris@441 66 @added = 0
Chris@441 67 @removed = 0
Chris@0 68 @type = type
Chris@1115 69 @style = style
Chris@1115 70 @file_name = nil
Chris@1115 71 @git_diff = false
Chris@0 72 end
Chris@0 73
Chris@0 74 # Function for add a line of this Diff
Chris@0 75 # Returns false when the diff ends
Chris@0 76 def add_line(line)
Chris@0 77 unless @parsing
Chris@0 78 if line =~ /^(---|\+\+\+) (.*)$/
Chris@1115 79 self.file_name = $2
Chris@0 80 elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
Chris@0 81 @line_num_l = $2.to_i
Chris@0 82 @line_num_r = $5.to_i
Chris@0 83 @parsing = true
Chris@0 84 end
Chris@0 85 else
Chris@0 86 if line =~ /^[^\+\-\s@\\]/
Chris@0 87 @parsing = false
Chris@0 88 return false
Chris@0 89 elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
Chris@0 90 @line_num_l = $2.to_i
Chris@0 91 @line_num_r = $5.to_i
Chris@0 92 else
Chris@909 93 parse_line(line, @type)
Chris@0 94 end
Chris@0 95 end
Chris@0 96 return true
Chris@0 97 end
Chris@909 98
Chris@441 99 def each_line
Chris@441 100 prev_line_left, prev_line_right = nil, nil
Chris@441 101 each do |line|
Chris@441 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@441 103 yield spacing, line
Chris@441 104 prev_line_left = line.nb_line_left.to_i if line.nb_line_left.to_i > 0
Chris@441 105 prev_line_right = line.nb_line_right.to_i if line.nb_line_right.to_i > 0
Chris@441 106 end
Chris@441 107 end
Chris@0 108
Chris@0 109 def inspect
Chris@0 110 puts '### DIFF TABLE ###'
Chris@0 111 puts "file : #{file_name}"
Chris@0 112 self.each do |d|
Chris@0 113 d.inspect
Chris@0 114 end
Chris@0 115 end
Chris@0 116
Chris@441 117 private
Chris@0 118
Chris@1115 119 def file_name=(arg)
Chris@1115 120 both_git_diff = false
Chris@1115 121 if file_name.nil?
Chris@1115 122 @git_diff = true if arg =~ %r{^(a/|/dev/null)}
Chris@1115 123 else
Chris@1115 124 both_git_diff = (@git_diff && arg =~ %r{^(b/|/dev/null)})
Chris@1115 125 end
Chris@1115 126 if both_git_diff
Chris@1115 127 if file_name && arg == "/dev/null"
Chris@1115 128 # keep the original file name
Chris@1115 129 @file_name = file_name.sub(%r{^a/}, '')
Chris@1115 130 else
Chris@1115 131 # remove leading b/
Chris@1115 132 @file_name = arg.sub(%r{^b/}, '')
Chris@1115 133 end
Chris@1115 134 elsif @style == "Subversion"
Chris@1115 135 # removing trailing "(revision nn)"
Chris@1115 136 @file_name = arg.sub(%r{\t+\(.*\)$}, '')
Chris@1115 137 else
Chris@1115 138 @file_name = arg
Chris@1115 139 end
Chris@1115 140 end
Chris@1115 141
Chris@441 142 def diff_for_added_line
Chris@441 143 if @type == 'sbs' && @removed > 0 && @added < @removed
Chris@441 144 self[-(@removed - @added)]
Chris@441 145 else
Chris@441 146 diff = Diff.new
Chris@441 147 self << diff
Chris@441 148 diff
Chris@441 149 end
Chris@441 150 end
Chris@0 151
Chris@0 152 def parse_line(line, type="inline")
Chris@0 153 if line[0, 1] == "+"
Chris@441 154 diff = diff_for_added_line
Chris@929 155 diff.line_right = line[1..-1]
Chris@0 156 diff.nb_line_right = @line_num_r
Chris@0 157 diff.type_diff_right = 'diff_in'
Chris@0 158 @line_num_r += 1
Chris@441 159 @added += 1
Chris@0 160 true
Chris@0 161 elsif line[0, 1] == "-"
Chris@441 162 diff = Diff.new
Chris@929 163 diff.line_left = line[1..-1]
Chris@0 164 diff.nb_line_left = @line_num_l
Chris@0 165 diff.type_diff_left = 'diff_out'
Chris@441 166 self << diff
Chris@0 167 @line_num_l += 1
Chris@441 168 @removed += 1
Chris@0 169 true
Chris@441 170 else
Chris@441 171 write_offsets
Chris@441 172 if line[0, 1] =~ /\s/
Chris@441 173 diff = Diff.new
Chris@929 174 diff.line_right = line[1..-1]
Chris@441 175 diff.nb_line_right = @line_num_r
Chris@929 176 diff.line_left = line[1..-1]
Chris@441 177 diff.nb_line_left = @line_num_l
Chris@441 178 self << diff
Chris@441 179 @line_num_l += 1
Chris@441 180 @line_num_r += 1
Chris@441 181 true
Chris@441 182 elsif line[0, 1] = "\\"
Chris@0 183 true
Chris@0 184 else
Chris@0 185 false
Chris@0 186 end
Chris@0 187 end
Chris@0 188 end
Chris@909 189
Chris@441 190 def write_offsets
Chris@441 191 if @added > 0 && @added == @removed
Chris@441 192 @added.times do |i|
Chris@441 193 line = self[-(1 + i)]
Chris@441 194 removed = (@type == 'sbs') ? line : self[-(1 + @added + i)]
Chris@441 195 offsets = offsets(removed.line_left, line.line_right)
Chris@441 196 removed.offsets = line.offsets = offsets
Chris@441 197 end
Chris@441 198 end
Chris@441 199 @added = 0
Chris@441 200 @removed = 0
Chris@441 201 end
Chris@909 202
Chris@441 203 def offsets(line_left, line_right)
Chris@441 204 if line_left.present? && line_right.present? && line_left != line_right
Chris@441 205 max = [line_left.size, line_right.size].min
Chris@441 206 starting = 0
Chris@441 207 while starting < max && line_left[starting] == line_right[starting]
Chris@441 208 starting += 1
Chris@441 209 end
Chris@441 210 ending = -1
Chris@441 211 while ending >= -(max - starting) && line_left[ending] == line_right[ending]
Chris@441 212 ending -= 1
Chris@441 213 end
Chris@441 214 unless starting == 0 && ending == -1
Chris@441 215 [starting, ending]
Chris@441 216 end
Chris@441 217 end
Chris@441 218 end
Chris@441 219 end
Chris@0 220
Chris@0 221 # A line of diff
Chris@909 222 class Diff
Chris@0 223 attr_accessor :nb_line_left
Chris@0 224 attr_accessor :line_left
Chris@0 225 attr_accessor :nb_line_right
Chris@0 226 attr_accessor :line_right
Chris@0 227 attr_accessor :type_diff_right
Chris@0 228 attr_accessor :type_diff_left
Chris@441 229 attr_accessor :offsets
Chris@909 230
Chris@0 231 def initialize()
Chris@0 232 self.nb_line_left = ''
Chris@0 233 self.nb_line_right = ''
Chris@0 234 self.line_left = ''
Chris@0 235 self.line_right = ''
Chris@0 236 self.type_diff_right = ''
Chris@0 237 self.type_diff_left = ''
Chris@0 238 end
Chris@909 239
Chris@441 240 def type_diff
Chris@441 241 type_diff_right == 'diff_in' ? type_diff_right : type_diff_left
Chris@441 242 end
Chris@909 243
Chris@441 244 def line
Chris@441 245 type_diff_right == 'diff_in' ? line_right : line_left
Chris@441 246 end
Chris@909 247
Chris@441 248 def html_line_left
Chris@929 249 line_to_html(line_left, offsets)
Chris@441 250 end
Chris@909 251
Chris@441 252 def html_line_right
Chris@929 253 line_to_html(line_right, offsets)
Chris@441 254 end
Chris@909 255
Chris@441 256 def html_line
Chris@929 257 line_to_html(line, offsets)
Chris@441 258 end
Chris@0 259
Chris@0 260 def inspect
Chris@0 261 puts '### Start Line Diff ###'
Chris@0 262 puts self.nb_line_left
Chris@0 263 puts self.line_left
Chris@0 264 puts self.nb_line_right
Chris@0 265 puts self.line_right
Chris@0 266 end
Chris@929 267
Chris@929 268 private
Chris@929 269
Chris@929 270 def line_to_html(line, offsets)
Chris@929 271 if offsets
Chris@929 272 s = ''
Chris@929 273 unless offsets.first == 0
Chris@929 274 s << CGI.escapeHTML(line[0..offsets.first-1])
Chris@929 275 end
Chris@929 276 s << '<span>' + CGI.escapeHTML(line[offsets.first..offsets.last]) + '</span>'
Chris@929 277 unless offsets.last == -1
Chris@929 278 s << CGI.escapeHTML(line[offsets.last+1..-1])
Chris@929 279 end
Chris@929 280 s
Chris@929 281 else
Chris@929 282 CGI.escapeHTML(line)
Chris@929 283 end
Chris@929 284 end
Chris@0 285 end
Chris@0 286 end