annotate .svn/pristine/45/455894853af15224c178defd4436e0297eee3c97.svn-base @ 929:5f33065ddc4b redmine-1.3

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