mirror of
https://github.com/redmine/redmine.git
synced 2026-03-06 04:21:23 +01:00
Fixed: Roadmap crashes when a version has a due date > 2037. r18646@gaspard (orig r1888): jplang | 2008-09-21 10:54:02 +0200 Fixed: invalid effective date (eg. 99999-01-01) causes an error on version edition screen. r18647@gaspard (orig r1889): jplang | 2008-09-21 10:54:50 +0200 Fixes VersionTest class. r18648@gaspard (orig r1890): jplang | 2008-09-21 14:07:44 +0200 Fixed: login filter providing incorrect back_url for Redmine installed in sub-directory (#1900). r18649@gaspard (orig r1891): winterheart | 2008-09-21 14:31:34 +0200 de.yml from #1745, thank to Sven Schuchmann and Thomas Löber for contribution r18650@gaspard (orig r1892): winterheart | 2008-09-21 14:32:16 +0200 #1928, update for Italian language r18651@gaspard (orig r1893): jplang | 2008-09-21 14:45:22 +0200 Unescape back_url param before calling redirect_to. r18652@gaspard (orig r1894): jplang | 2008-09-21 15:28:12 +0200 Strip LDAP attribute names before saving (#1890). r18653@gaspard (orig r1895): jplang | 2008-09-21 20:45:30 +0200 Switch order of current and previous revisions in side-by-side diff (#1903). r18654@gaspard (orig r1896): jplang | 2008-09-21 22:38:36 +0200 Typo in migration 97 name (#1929). r18655@gaspard (orig r1897): winterheart | 2008-09-22 16:49:18 +0200 #1921, pt translation git-svn-id: http://redmine.rubyforge.org/svn/branches/nbc@1898 e93f8b46-1217-0410-a6f0-8f06a7374b81
179 lines
4.8 KiB
Ruby
179 lines
4.8 KiB
Ruby
# redMine - project management software
|
|
# Copyright (C) 2006-2008 Jean-Philippe Lang
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU General Public License
|
|
# as published by the Free Software Foundation; either version 2
|
|
# of the License, or (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
module Redmine
|
|
# Class used to parse unified diffs
|
|
class UnifiedDiff < Array
|
|
def initialize(diff, type="inline")
|
|
diff_table = DiffTable.new type
|
|
diff.each do |line|
|
|
if line =~ /^(---|\+\+\+) (.*)$/
|
|
self << diff_table if diff_table.length > 1
|
|
diff_table = DiffTable.new type
|
|
end
|
|
a = diff_table.add_line line
|
|
end
|
|
self << diff_table unless diff_table.empty?
|
|
self
|
|
end
|
|
end
|
|
|
|
# Class that represents a file diff
|
|
class DiffTable < Hash
|
|
attr_reader :file_name, :line_num_l, :line_num_r
|
|
|
|
# Initialize with a Diff file and the type of Diff View
|
|
# The type view must be inline or sbs (side_by_side)
|
|
def initialize(type="inline")
|
|
@parsing = false
|
|
@nb_line = 1
|
|
@start = false
|
|
@before = 'same'
|
|
@second = true
|
|
@type = type
|
|
end
|
|
|
|
# Function for add a line of this Diff
|
|
def add_line(line)
|
|
unless @parsing
|
|
if line =~ /^(---|\+\+\+) (.*)$/
|
|
@file_name = $2
|
|
return false
|
|
elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
|
|
@line_num_l = $2.to_i
|
|
@line_num_r = $5.to_i
|
|
@parsing = true
|
|
end
|
|
else
|
|
if line =~ /^[^\+\-\s@\\]/
|
|
@parsing = false
|
|
return false
|
|
elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
|
|
@line_num_l = $2.to_i
|
|
@line_num_r = $5.to_i
|
|
else
|
|
@nb_line += 1 if parse_line(line, @type)
|
|
end
|
|
end
|
|
return true
|
|
end
|
|
|
|
def inspect
|
|
puts '### DIFF TABLE ###'
|
|
puts "file : #{file_name}"
|
|
self.each do |d|
|
|
d.inspect
|
|
end
|
|
end
|
|
|
|
private
|
|
# Test if is a Side By Side type
|
|
def sbs?(type, func)
|
|
if @start and type == "sbs"
|
|
if @before == func and @second
|
|
tmp_nb_line = @nb_line
|
|
self[tmp_nb_line] = Diff.new
|
|
else
|
|
@second = false
|
|
tmp_nb_line = @start
|
|
@start += 1
|
|
@nb_line -= 1
|
|
end
|
|
else
|
|
tmp_nb_line = @nb_line
|
|
@start = @nb_line
|
|
self[tmp_nb_line] = Diff.new
|
|
@second = true
|
|
end
|
|
unless self[tmp_nb_line]
|
|
@nb_line += 1
|
|
self[tmp_nb_line] = Diff.new
|
|
else
|
|
self[tmp_nb_line]
|
|
end
|
|
end
|
|
|
|
# Escape the HTML for the diff
|
|
def escapeHTML(line)
|
|
CGI.escapeHTML(line)
|
|
end
|
|
|
|
def parse_line(line, type="inline")
|
|
if line[0, 1] == "+"
|
|
diff = sbs? type, 'add'
|
|
@before = 'add'
|
|
diff.line_right = escapeHTML line[1..-1]
|
|
diff.nb_line_right = @line_num_r
|
|
diff.type_diff_right = 'diff_in'
|
|
@line_num_r += 1
|
|
true
|
|
elsif line[0, 1] == "-"
|
|
diff = sbs? type, 'remove'
|
|
@before = 'remove'
|
|
diff.line_left = escapeHTML line[1..-1]
|
|
diff.nb_line_left = @line_num_l
|
|
diff.type_diff_left = 'diff_out'
|
|
@line_num_l += 1
|
|
true
|
|
elsif line[0, 1] =~ /\s/
|
|
@before = 'same'
|
|
@start = false
|
|
diff = Diff.new
|
|
diff.line_right = escapeHTML line[1..-1]
|
|
diff.nb_line_right = @line_num_r
|
|
diff.line_left = escapeHTML line[1..-1]
|
|
diff.nb_line_left = @line_num_l
|
|
self[@nb_line] = diff
|
|
@line_num_l += 1
|
|
@line_num_r += 1
|
|
true
|
|
elsif line[0, 1] = "\\"
|
|
true
|
|
else
|
|
false
|
|
end
|
|
end
|
|
end
|
|
|
|
# A line of diff
|
|
class Diff
|
|
attr_accessor :nb_line_left
|
|
attr_accessor :line_left
|
|
attr_accessor :nb_line_right
|
|
attr_accessor :line_right
|
|
attr_accessor :type_diff_right
|
|
attr_accessor :type_diff_left
|
|
|
|
def initialize()
|
|
self.nb_line_left = ''
|
|
self.nb_line_right = ''
|
|
self.line_left = ''
|
|
self.line_right = ''
|
|
self.type_diff_right = ''
|
|
self.type_diff_left = ''
|
|
end
|
|
|
|
def inspect
|
|
puts '### Start Line Diff ###'
|
|
puts self.nb_line_left
|
|
puts self.line_left
|
|
puts self.nb_line_right
|
|
puts self.line_right
|
|
end
|
|
end
|
|
end
|