jro_apps/redmine Commit - r10245:f18edc4e1c04

use git diff format for all diff (#11868)...

Toshi MARUYAMA -

r10245:f18edc4e1c04

parent child

Context file:

r10245:f18edc4e1c04

Collapse all files

lib/redmine/unified_diff.rb +12 -5

             # Redmine - project management software
             # Copyright (C) 2006-2012  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
                 attr_reader :diff_type, :diff_style
                 def initialize(diff, options={})
                   options.assert_valid_keys(:type, :style, :max_lines)
                   diff = diff.split("\n") if diff.is_a?(String)
                   @diff_type = options[:type] || 'inline'
                   @diff_style = options[:style]
                   lines = 0
                   @truncated = false
                   diff_table = DiffTable.new(diff_type, diff_style)
                   diff.each do |line|
                     line_encoding = nil
                     if line.respond_to?(:force_encoding)
                       line_encoding = line.encoding
                       # TODO: UTF-16 and Japanese CP932 which is imcompatible with ASCII
                       #       In Japan, diffrence between file path encoding
                       #       and file contents encoding is popular.
                       line.force_encoding('ASCII-8BIT')
                     end
                     unless diff_table.add_line line
                       line.force_encoding(line_encoding) if line_encoding
                       self << diff_table if diff_table.length > 0
                       diff_table = DiffTable.new(diff_type, diff_style)
                     end
                     lines += 1
                     if options[:max_lines] && lines > options[:max_lines]
                       @truncated = true
                       break
                     end
                   end
                   self << diff_table unless diff_table.empty?
                   self
                 end
                 def truncated?; @truncated; end
               end
               # Class that represents a file diff
               class DiffTable < Array
                 attr_reader :file_name
                 # 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", style=nil)
                   @parsing = false
                   @added = 0
                   @removed = 0
                   @type = type
                   @style = style
                   @file_name = nil
+                  @git_diff = false
                 end
                 # Function for add a line of this Diff
                 # Returns false when the diff ends
                 def add_line(line)
                   unless @parsing
                     if line =~ /^(---|\+\+\+) (.*)$/
                       self.file_name = $2
                     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
                       parse_line(line, @type)
                     end
                   end
                   return true
                 end
                 def each_line
                   prev_line_left, prev_line_right = nil, nil
                   each do |line|
                     spacing = prev_line_left && prev_line_right && (line.nb_line_left != prev_line_left+1) && (line.nb_line_right != prev_line_right+1)
                     yield spacing, line
                     prev_line_left = line.nb_line_left.to_i if line.nb_line_left.to_i > 0
                     prev_line_right = line.nb_line_right.to_i if line.nb_line_right.to_i > 0
                   end
                 end
                 def inspect
                   puts '### DIFF TABLE ###'
                   puts "file : #{file_name}"
                   self.each do |d|
                     d.inspect
                   end
                 end
                 private
                 def file_name=(arg)
-                  case @style
+                  both_git_diff = false
-                  when "Git"
+                  if file_name.nil?
+                    @git_diff = true if arg =~ %r{^(a/|/dev/null)}
+                  else
+                    both_git_diff = (@git_diff && arg =~ %r{^(b/|/dev/null)})
+                  end
+                  if both_git_diff
                     if file_name && arg == "/dev/null"
                       # keep the original file name
+                      @file_name = file_name.sub(%r{^a/}, '')
                     else
-                      # remove leading a/ b/
+                      # remove leading b/
-                      @file_name = arg.sub(%r{^(a|b)/}, '')
+                      @file_name = arg.sub(%r{^b/}, '')
                     end
-                  when "Subversion"
+                  elsif @style == "Subversion"
                     # removing trailing "(revision nn)"
                     @file_name = arg.sub(%r{\t+\(.*\)$}, '')
                   else
                     @file_name = arg
                   end
                 end
                 def diff_for_added_line
                   if @type == 'sbs' && @removed > 0 && @added < @removed
                     self[-(@removed - @added)]
                   else
                     diff = Diff.new
                     self << diff
                     diff
                   end
                 end
                 def parse_line(line, type="inline")
                   if line[0, 1] == "+"
                     diff = diff_for_added_line
                     diff.line_right = line[1..-1]
                     diff.nb_line_right = @line_num_r
                     diff.type_diff_right = 'diff_in'
                     @line_num_r += 1
                     @added += 1
                     true
                   elsif line[0, 1] == "-"
                     diff = Diff.new
                     diff.line_left = line[1..-1]
                     diff.nb_line_left = @line_num_l
                     diff.type_diff_left = 'diff_out'
                     self << diff
                     @line_num_l += 1
                     @removed += 1
                     true
                   else
                     write_offsets
                     if line[0, 1] =~ /\s/
                       diff = Diff.new
                       diff.line_right = line[1..-1]
                       diff.nb_line_right = @line_num_r
                       diff.line_left = line[1..-1]
                       diff.nb_line_left = @line_num_l
                       self << diff
                       @line_num_l += 1
                       @line_num_r += 1
                       true
                     elsif line[0, 1] = "\\"
                       true
                     else
                       false
                     end
                   end
                 end
                 def write_offsets
                   if @added > 0 && @added == @removed
                     @added.times do |i|
                       line = self[-(1 + i)]
                       removed = (@type == 'sbs') ? line : self[-(1 + @added + i)]
                       offsets = offsets(removed.line_left, line.line_right)
                       removed.offsets = line.offsets = offsets
                     end
                   end
                   @added = 0
                   @removed = 0
                 end
                 def offsets(line_left, line_right)
                   if line_left.present? && line_right.present? && line_left != line_right
                     max = [line_left.size, line_right.size].min
                     starting = 0
                     while starting < max && line_left[starting] == line_right[starting]
                       starting += 1
                     end
                     ending = -1
                     while ending >= -(max - starting) && line_left[ending] == line_right[ending]
                       ending -= 1
                     end
                     unless starting == 0 && ending == -1
                       [starting, ending]
                     end
                   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
                 attr_accessor :offsets
                 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 type_diff
                   type_diff_right == 'diff_in' ? type_diff_right : type_diff_left
                 end
                 def line
                   type_diff_right == 'diff_in' ? line_right : line_left
                 end
                 def html_line_left
                   line_to_html(line_left, offsets)
                 end
                 def html_line_right
                   line_to_html(line_right, offsets)
                 end
                 def html_line
                   line_to_html(line, offsets)
                 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
                 private
                 def line_to_html(line, offsets)
                   if offsets
                     s = ''
                     unless offsets.first == 0
                       s << CGI.escapeHTML(line[0..offsets.first-1])
                     end
                     s << '<span>' + CGI.escapeHTML(line[offsets.first..offsets.last]) + '</span>'
                     unless offsets.last == -1
                       s << CGI.escapeHTML(line[offsets.last+1..-1])
                     end
                     s
                   else
                     CGI.escapeHTML(line)
                   end
                 end
               end
             end

test/functional/repositories_mercurial_controller_test.rb +14 0

             # Redmine - project management software
             # Copyright (C) 2006-2012  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.
             require File.expand_path('../../test_helper', __FILE__)
             class RepositoriesMercurialControllerTest < ActionController::TestCase
               tests RepositoriesController
               fixtures :projects, :users, :roles, :members, :member_roles,
                        :repositories, :enabled_modules
               REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository').to_s
               CHAR_1_HEX = "\xc3\x9c"
               PRJ_ID     = 3
               NUM_REV    = 32
               ruby19_non_utf8_pass =
                  (RUBY_VERSION >= '1.9' && Encoding.default_external.to_s != 'UTF-8')
               def setup
                 User.current = nil
                 @project    = Project.find(PRJ_ID)
                 @repository = Repository::Mercurial.create(
                                   :project => @project,
                                   :url     => REPOSITORY_PATH,
                                   :path_encoding => 'ISO-8859-1'
                                   )
                 assert @repository
                 @diff_c_support = true
                 @char_1        = CHAR_1_HEX.dup
                 @tag_char_1    = "tag-#{CHAR_1_HEX}-00"
                 @branch_char_0 = "branch-#{CHAR_1_HEX}-00"
                 @branch_char_1 = "branch-#{CHAR_1_HEX}-01"
                 if @char_1.respond_to?(:force_encoding)
                   @char_1.force_encoding('UTF-8')
                   @tag_char_1.force_encoding('UTF-8')
                   @branch_char_0.force_encoding('UTF-8')
                   @branch_char_1.force_encoding('UTF-8')
                 end
               end
               if ruby19_non_utf8_pass
                 puts "TODO: Mercurial functional test fails in Ruby 1.9 " +
                      "and Encoding.default_external is not UTF-8. " +
                      "Current value is '#{Encoding.default_external.to_s}'"
                 def test_fake; assert true end
               elsif File.directory?(REPOSITORY_PATH)
                 def test_get_new
                   @request.session[:user_id] = 1
                   @project.repository.destroy
                   get :new, :project_id => 'subproject1', :repository_scm => 'Mercurial'
                   assert_response :success
                   assert_template 'new'
                   assert_kind_of Repository::Mercurial, assigns(:repository)
                   assert assigns(:repository).new_record?
                 end
                 def test_show_root
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal 4, assigns(:entries).size
                   assert assigns(:entries).detect {|e| e.name == 'images'  && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'README'  && e.kind == 'file'}
                   assert_not_nil assigns(:changesets)
                   assert assigns(:changesets).size > 0
                 end
                 def test_show_directory
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param]
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
                   entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
                   assert_not_nil entry
                   assert_equal 'file', entry.kind
                   assert_equal 'images/edit.png', entry.path
                   assert_not_nil assigns(:changesets)
                   assert assigns(:changesets).size > 0
                 end
                 def test_show_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [0, '0', '0885933ad4f6'].each do |r1|
                     get :show, :id => PRJ_ID, :path => repository_path_hash(['images'])[:param],
                         :rev => r1
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert_equal ['delete.png'], assigns(:entries).collect(&:name)
                     assert_not_nil assigns(:changesets)
                     assert assigns(:changesets).size > 0
                   end
                 end
                 def test_show_directory_sql_escape_percent
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [13, '13', '3a330eb32958'].each do |r1|
                     get :show, :id => PRJ_ID,
                         :path => repository_path_hash(['sql_escape', 'percent%dir'])[:param],
                         :rev => r1
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert_equal ['percent%file1.txt', 'percentfile1.txt'],
                                  assigns(:entries).collect(&:name)
                     changesets = assigns(:changesets)
                     assert_not_nil changesets
                     assert assigns(:changesets).size > 0
                     assert_equal %w(13 11 10 9), changesets.collect(&:revision)
                   end
                 end
                 def test_show_directory_latin_1_path
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [21, '21', 'adf805632193'].each do |r1|
                     get :show, :id => PRJ_ID,
                         :path => repository_path_hash(['latin-1-dir'])[:param],
                         :rev => r1
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert_equal ["make-latin-1-file.rb",
                                   "test-#{@char_1}-1.txt",
                                   "test-#{@char_1}-2.txt",
                                   "test-#{@char_1}.txt"], assigns(:entries).collect(&:name)
                     changesets = assigns(:changesets)
                     assert_not_nil changesets
                     assert_equal %w(21 20 19 18 17), changesets.collect(&:revision)
                   end
                 end
                 def show_should_show_branch_selection_form
                   @repository.fetch_changesets
                   @project.reload
                   get :show, :id => PRJ_ID
                   assert_tag 'form', :attributes => {:id => 'revision_selector', :action => '/projects/subproject1/repository/show'}
                   assert_tag 'select', :attributes => {:name => 'branch'},
                     :child => {:tag => 'option', :attributes => {:value => 'test-branch-01'}},
                     :parent => {:tag => 'form', :attributes => {:id => 'revision_selector'}}
                 end
                 def test_show_branch
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                    [
                       'default',
                       @branch_char_1,
                       'branch (1)[2]&,%.-3_4',
                       @branch_char_0,
                       'test_branch.latin-1',
                       'test-branch-00',
                   ].each do |bra|
                     get :show, :id => PRJ_ID, :rev => bra
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert assigns(:entries).size > 0
                     assert_not_nil assigns(:changesets)
                     assert assigns(:changesets).size > 0
                   end
                 end
                 def test_show_tag
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                    [
                     @tag_char_1,
                     'tag_test.00',
                     'tag-init-revision'
                   ].each do |tag|
                     get :show, :id => PRJ_ID, :rev => tag
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert assigns(:entries).size > 0
                     assert_not_nil assigns(:changesets)
                     assert assigns(:changesets).size > 0
                   end
                 end
                 def test_changes
                   get :changes, :id => PRJ_ID,
                       :path => repository_path_hash(['images', 'edit.png'])[:param]
                   assert_response :success
                   assert_template 'changes'
                   assert_tag :tag => 'h2', :content => 'edit.png'
                 end
                 def test_entry_show
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                   assert_response :success
                   assert_template 'entry'
                   # Line 10
                   assert_tag :tag => 'th',
                              :content => '10',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
                 end
                 def test_entry_show_latin_1_path
                   [21, '21', 'adf805632193'].each do |r1|
                     get :entry, :id => PRJ_ID,
                         :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}-2.txt"])[:param],
                         :rev => r1
                     assert_response :success
                     assert_template 'entry'
                     assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td',
                                            :content => /Mercurial is a distributed version control system/ }
                   end
                 end
                 def test_entry_show_latin_1_contents
                   with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                     [27, '27', '7bbf4c738e71'].each do |r1|
                       get :entry, :id => PRJ_ID,
                           :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
                           :rev => r1
                       assert_response :success
                       assert_template 'entry'
                       assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td',
                                            :content => /test-#{@char_1}.txt/ }
                     end
                   end
                 end
                 def test_entry_download
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param],
                       :format => 'raw'
                   assert_response :success
                   # File content
                   assert @response.body.include?('WITHOUT ANY WARRANTY')
                 end
                 def test_entry_binary_force_download
                   get :entry, :id => PRJ_ID, :rev => 1,
                       :path => repository_path_hash(['images', 'edit.png'])[:param]
                   assert_response :success
                   assert_equal 'image/png', @response.content_type
                 end
                 def test_directory_entry
                   get :entry, :id => PRJ_ID,
                       :path => repository_path_hash(['sources'])[:param]
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'sources', assigns(:entry).name
                 end
                 def test_diff
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [4, '4', 'def6d2f1254a'].each do |r1|
                     # Full diff of changeset 4
                     ['inline', 'sbs'].each do |dt|
                       get :diff, :id => PRJ_ID, :rev => r1, :type => dt
                       assert_response :success
                       assert_template 'diff'
                       if @diff_c_support
                         # Line 22 removed
                         assert_tag :tag => 'th',
                                    :content => '22',
                                    :sibling => { :tag => 'td',
                                                  :attributes => { :class => /diff_out/ },
                                                  :content => /def remove/ }
                         assert_tag :tag => 'h2', :content => /4:def6d2f1254a/
                       end
                     end
                   end
                 end
                 def test_diff_two_revs
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [2, '400bb8672109', '400', 400].each do |r1|
                     [4, 'def6d2f1254a'].each do |r2|
                       ['inline', 'sbs'].each do |dt|
                         get :diff,
                             :id     => PRJ_ID,
                             :rev    => r1,
                             :rev_to => r2,
                             :type => dt
                         assert_response :success
                         assert_template 'diff'
                         diff = assigns(:diff)
                         assert_not_nil diff
                         assert_tag :tag => 'h2',
                                    :content => /4:def6d2f1254a 2:400bb8672109/
                       end
                     end
                   end
                 end
                 def test_diff_latin_1_path
                   with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                     [21, 'adf805632193'].each do |r1|
                       ['inline', 'sbs'].each do |dt|
                         get :diff, :id => PRJ_ID, :rev => r1, :type => dt
                         assert_response :success
                         assert_template 'diff'
                         assert_tag :tag => 'thead',
                                    :descendant => {
                                      :tag => 'th',
                                      :attributes => { :class => 'filename' } ,
                                      :content => /latin-1-dir\/test-#{@char_1}-2.txt/ ,
                                     },
                                    :sibling => {
                                      :tag => 'tbody',
                                      :descendant => {
                                         :tag => 'td',
                                         :attributes => { :class => /diff_in/ },
                                         :content => /It is written in Python/
                                      }
                                    }
                       end
                     end
                   end
                 end
+                def test_diff_should_show_modified_filenames
+                  get :diff, :id => PRJ_ID, :rev => '400bb8672109', :type => 'inline'
+                  assert_response :success
+                  assert_template 'diff'
+                  assert_select 'th.filename', :text => 'sources/watchers_controller.rb'
+                end
+                def test_diff_should_show_deleted_filenames
+                  get :diff, :id => PRJ_ID, :rev => 'b3a615152df8', :type => 'inline'
+                  assert_response :success
+                  assert_template 'diff'
+                  assert_select 'th.filename', :text => 'sources/welcome_controller.rb'
+                end
                 def test_annotate
                   get :annotate, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                   assert_response :success
                   assert_template 'annotate'
                   # Line 22, revision 4:def6d2f1254a
                   assert_select 'tr' do
                     assert_select 'th.line-num', :text => '22'
                     assert_select 'td.revision', :text => '4:def6d2f1254a'
                     assert_select 'td.author', :text => 'jsmith'
                     assert_select 'td', :text => /remove_watcher/
                   end
                 end
                 def test_annotate_not_in_tip
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :annotate, :id => PRJ_ID,
                       :path => repository_path_hash(['sources', 'welcome_controller.rb'])[:param]
                   assert_response 404
                   assert_error_tag :content => /was not found/
                 end
                 def test_annotate_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [2, '400bb8672109', '400', 400].each do |r1|
                     get :annotate, :id => PRJ_ID, :rev => r1,
                         :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
                     assert_response :success
                     assert_template 'annotate'
                     assert_tag :tag => 'h2', :content => /@ 2:400bb8672109/
                   end
                 end
                 def test_annotate_latin_1_path
                   [21, '21', 'adf805632193'].each do |r1|
                     get :annotate, :id => PRJ_ID,
                         :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}-2.txt"])[:param],
                         :rev => r1
                     assert_response :success
                     assert_template 'annotate'
                     assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling =>
                                    {
                                      :tag => 'td',
                                      :attributes => { :class => 'revision' },
                                      :child => { :tag => 'a', :content => '20:709858aafd1b' }
                                    }
                     assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling =>
                                    {
                                       :tag     => 'td'    ,
                                       :content => 'jsmith' ,
                                       :attributes => { :class   => 'author' },
                                     }
                     assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td',
                                            :content => /Mercurial is a distributed version control system/ }
                   end
                 end
                 def test_annotate_latin_1_contents
                   with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                     [27, '7bbf4c738e71'].each do |r1|
                       get :annotate, :id => PRJ_ID,
                           :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
                           :rev => r1
                       assert_tag :tag => 'th',
                                  :content => '1',
                                  :attributes => { :class => 'line-num' },
                                  :sibling => { :tag => 'td',
                                                :content => /test-#{@char_1}.txt/ }
                     end
                   end
                 end
                 def test_empty_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['', ' ', nil].each do |r|
                     get :revision, :id => PRJ_ID, :rev => r
                     assert_response 404
                     assert_error_tag :content => /was not found/
                   end
                 end
                 def test_destroy_valid_repository
                   @request.session[:user_id] = 1 # admin
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   assert_equal NUM_REV, @repository.changesets.count
                   assert_difference 'Repository.count', -1 do
                     delete :destroy, :id => @repository.id
                   end
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
                 def test_destroy_invalid_repository
                   @request.session[:user_id] = 1 # admin
                   @project.repository.destroy
                   @repository = Repository::Mercurial.create!(
                                   :project => Project.find(PRJ_ID),
                                   :url     => "/invalid",
                                   :path_encoding => 'ISO-8859-1'
                                   )
                   @repository.fetch_changesets
                   assert_equal 0, @repository.changesets.count
                   assert_difference 'Repository.count', -1 do
                     delete :destroy, :id => @repository.id
                   end
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
               else
                 puts "Mercurial test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

test/unit/lib/redmine/unified_diff_test.rb +54 0

             # Redmine - project management software
             # Copyright (C) 2006-2012  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.
             require File.expand_path('../../../../test_helper', __FILE__)
             class Redmine::UnifiedDiffTest < ActiveSupport::TestCase
               def setup
               end
               def test_subversion_diff
                 diff = Redmine::UnifiedDiff.new(read_diff_fixture('subversion.diff'))
                 # number of files
                 assert_equal 4, diff.size
                 assert diff.detect {|file| file.file_name =~ %r{^config/settings.yml}}
               end
               def test_truncate_diff
                 diff = Redmine::UnifiedDiff.new(read_diff_fixture('subversion.diff'), :max_lines => 20)
                 assert_equal 2, diff.size
               end
               def test_inline_partials
                 diff = Redmine::UnifiedDiff.new(read_diff_fixture('partials.diff'))
                 assert_equal 1, diff.size
                 diff = diff.first
                 assert_equal 43, diff.size
                 assert_equal [51, -1], diff[0].offsets
                 assert_equal [51, -1], diff[1].offsets
                 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>elit</span>', diff[0].html_line
                 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>xx</span>', diff[1].html_line
                 assert_nil diff[2].offsets
                 assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[2].html_line
                 assert_equal [0, -14], diff[3].offsets
                 assert_equal [0, -14], diff[4].offsets
                 assert_equal '<span>Ut sed</span> auctor justo', diff[3].html_line
                 assert_equal '<span>xxx</span> auctor justo', diff[4].html_line
                 assert_equal [13, -19], diff[6].offsets
                 assert_equal [13, -19], diff[7].offsets
                 assert_equal [24, -8], diff[9].offsets
                 assert_equal [24, -8], diff[10].offsets
                 assert_equal [37, -1], diff[12].offsets
                 assert_equal [37, -1], diff[13].offsets
                 assert_equal [0, -38], diff[15].offsets
                 assert_equal [0, -38], diff[16].offsets
               end
               def test_side_by_side_partials
                 diff = Redmine::UnifiedDiff.new(read_diff_fixture('partials.diff'), :type => 'sbs')
                 assert_equal 1, diff.size
                 diff = diff.first
                 assert_equal 32, diff.size
                 assert_equal [51, -1], diff[0].offsets
                 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>elit</span>', diff[0].html_line_left
                 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>xx</span>', diff[0].html_line_right
                 assert_nil diff[1].offsets
                 assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[1].html_line_left
                 assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[1].html_line_right
                 assert_equal [0, -14], diff[2].offsets
                 assert_equal '<span>Ut sed</span> auctor justo', diff[2].html_line_left
                 assert_equal '<span>xxx</span> auctor justo', diff[2].html_line_right
                 assert_equal [13, -19], diff[4].offsets
                 assert_equal [24, -8], diff[6].offsets
                 assert_equal [37, -1], diff[8].offsets
                 assert_equal [0, -38], diff[10].offsets
               end
               def test_partials_with_html_entities
                 raw = <<-DIFF
             --- test.orig.txt Wed Feb 15 16:10:39 2012
             +++ test.new.txt  Wed Feb 15 16:11:25 2012
             @@ -1,5 +1,5 @@
              Semicolons were mysteriously appearing in code diffs in the repository
             -void DoSomething(std::auto_ptr<MyClass> myObj)
             +void DoSomething(const MyClass& myObj)
             DIFF
                 diff = Redmine::UnifiedDiff.new(raw, :type => 'sbs')
                 assert_equal 1, diff.size
                 assert_equal 'void DoSomething(<span>std::auto_ptr&lt;MyClass&gt;</span> myObj)', diff.first[2].html_line_left
                 assert_equal 'void DoSomething(<span>const MyClass&amp;</span> myObj)', diff.first[2].html_line_right
                 diff = Redmine::UnifiedDiff.new(raw, :type => 'inline')
                 assert_equal 1, diff.size
                 assert_equal 'void DoSomething(<span>std::auto_ptr&lt;MyClass&gt;</span> myObj)', diff.first[2].html_line
                 assert_equal 'void DoSomething(<span>const MyClass&amp;</span> myObj)', diff.first[3].html_line
               end
               def test_line_starting_with_dashes
                 diff = Redmine::UnifiedDiff.new(<<-DIFF
             --- old.txt Wed Nov 11 14:24:58 2009
             +++ new.txt Wed Nov 11 14:25:02 2009
             @@ -1,8 +1,4 @@
             -Lines that starts with dashes:
             -
             -------------------------
             --- file.c
             -------------------------
             +A line that starts with dashes:
              and removed.
             @@ -23,4 +19,4 @@
             -Another chunk of change
             +Another chunk of changes
             DIFF
                 )
                 assert_equal 1, diff.size
               end
               def test_one_line_new_files
                 diff = Redmine::UnifiedDiff.new(<<-DIFF
             diff -r 000000000000 -r ea98b14f75f0 README1
             --- /dev/null
             +++ b/README1
             @@ -0,0 +1,1 @@
             +test1
             diff -r 000000000000 -r ea98b14f75f0 README2
             --- /dev/null
             +++ b/README2
             @@ -0,0 +1,1 @@
             +test2
             diff -r 000000000000 -r ea98b14f75f0 README3
             --- /dev/null
             +++ b/README3
             @@ -0,0 +1,3 @@
             +test4
             +test5
             +test6
             diff -r 000000000000 -r ea98b14f75f0 README4
             --- /dev/null
             +++ b/README4
             @@ -0,0 +1,3 @@
             +test4
             +test5
             +test6
             DIFF
                 )
                 assert_equal 4, diff.size
+                assert_equal "README1", diff[0].file_name
+              end
+              def test_both_git_diff
+                diff = Redmine::UnifiedDiff.new(<<-DIFF
+            # HG changeset patch
+            # User test
+            # Date 1348014182 -32400
+            # Node ID d1c871b8ef113df7f1c56d41e6e3bfbaff976e1f
+            # Parent  180b6605936cdc7909c5f08b59746ec1a7c99b3e
+            modify test1.txt
+            diff -r 180b6605936c -r d1c871b8ef11 test1.txt
+            --- a/test1.txt
+            +++ b/test1.txt
+            @@ -1,1 +1,1 @@
+            -test1
+            +modify test1
+            DIFF
+                )
+                assert_equal 1, diff.size
+                assert_equal "test1.txt", diff[0].file_name
+              end
+              def test_include_a_b_slash
+                diff = Redmine::UnifiedDiff.new(<<-DIFF
+            --- test1.txt
+            +++ b/test02.txt
+            @@ -1 +0,0 @@
+            -modify test1
+            DIFF
+                )
+                assert_equal 1, diff.size
+                assert_equal "b/test02.txt", diff[0].file_name
+                diff = Redmine::UnifiedDiff.new(<<-DIFF
+            --- a/test1.txt
+            +++ a/test02.txt
+            @@ -1 +0,0 @@
+            -modify test1
+            DIFF
+                )
+                assert_equal 1, diff.size
+                assert_equal "a/test02.txt", diff[0].file_name
+                diff = Redmine::UnifiedDiff.new(<<-DIFF
+            --- a/test1.txt
+            +++ test02.txt
+            @@ -1 +0,0 @@
+            -modify test1
+            DIFF
+                )
+                assert_equal 1, diff.size
+                assert_equal "test02.txt", diff[0].file_name
               end
               private
               def read_diff_fixture(filename)
                 File.new(File.join(File.dirname(__FILE__), '/../../../fixtures/diffs', filename)).read
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages