jro_apps/redmine Commit - r10526:123d2b318f18

fix scm_iconv local variable name (#12228)...

Toshi MARUYAMA -

r10526:123d2b318f18

parent child

Context file:

r10526:123d2b318f18

Collapse all files

lib/redmine/scm/adapters/abstract_adapter.rb +1 -1

             # 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 'cgi'
             module Redmine
               module Scm
                 module Adapters
                   class CommandFailed < StandardError #:nodoc:
                   end
                   class AbstractAdapter #:nodoc:
                     # raised if scm command exited with error, e.g. unknown revision.
                     class ScmCommandAborted < CommandFailed; end
                     class << self
                       def client_command
                         ""
                       end
                       def shell_quote_command
                         if Redmine::Platform.mswin? && RUBY_PLATFORM == 'java'
                           client_command
                         else
                           shell_quote(client_command)
                         end
                       end
                       # Returns the version of the scm client
                       # Eg: [1, 5, 0] or [] if unknown
                       def client_version
                         []
                       end
                       # Returns the version string of the scm client
                       # Eg: '1.5.0' or 'Unknown version' if unknown
                       def client_version_string
                         v = client_version || 'Unknown version'
                         v.is_a?(Array) ? v.join('.') : v.to_s
                       end
                       # Returns true if the current client version is above
                       # or equals the given one
                       # If option is :unknown is set to true, it will return
                       # true if the client version is unknown
                       def client_version_above?(v, options={})
                         ((client_version <=> v) >= 0) || (client_version.empty? && options[:unknown])
                       end
                       def client_available
                         true
                       end
                       def shell_quote(str)
                         if Redmine::Platform.mswin?
                           '"' + str.gsub(/"/, '\\"') + '"'
                         else
                           "'" + str.gsub(/'/, "'\"'\"'") + "'"
                         end
                       end
                     end
                     def initialize(url, root_url=nil, login=nil, password=nil,
                                    path_encoding=nil)
                       @url = url
                       @login = login if login && !login.empty?
                       @password = (password || "") if @login
                       @root_url = root_url.blank? ? retrieve_root_url : root_url
                     end
                     def adapter_name
                       'Abstract'
                     end
                     def supports_cat?
                       true
                     end
                     def supports_annotate?
                       respond_to?('annotate')
                     end
                     def root_url
                       @root_url
                     end
                     def url
                       @url
                     end
                     def path_encoding
                       nil
                     end
                     # get info about the svn repository
                     def info
                       return nil
                     end
                     # Returns the entry identified by path and revision identifier
                     # or nil if entry doesn't exist in the repository
                     def entry(path=nil, identifier=nil)
                       parts = path.to_s.split(%r{[\/\\]}).select {|n| !n.blank?}
                       search_path = parts[0..-2].join('/')
                       search_name = parts[-1]
                       if search_path.blank? && search_name.blank?
                         # Root entry
                         Entry.new(:path => '', :kind => 'dir')
                       else
                         # Search for the entry in the parent directory
                         es = entries(search_path, identifier)
                         es ? es.detect {|e| e.name == search_name} : nil
                       end
                     end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     def entries(path=nil, identifier=nil, options={})
                       return nil
                     end
                     def branches
                       return nil
                     end
                     def tags
                       return nil
                     end
                     def default_branch
                       return nil
                     end
                     def properties(path, identifier=nil)
                       return nil
                     end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       return nil
                     end
                     def diff(path, identifier_from, identifier_to=nil)
                       return nil
                     end
                     def cat(path, identifier=nil)
                       return nil
                     end
                     def with_leading_slash(path)
                       path ||= ''
                       (path[0,1]!="/") ? "/#{path}" : path
                     end
                     def with_trailling_slash(path)
                       path ||= ''
                       (path[-1,1] == "/") ? path : "#{path}/"
                     end
                     def without_leading_slash(path)
                       path ||= ''
                       path.gsub(%r{^/+}, '')
                     end
                     def without_trailling_slash(path)
                       path ||= ''
                       (path[-1,1] == "/") ? path[0..-2] : path
                      end
                     def shell_quote(str)
                       self.class.shell_quote(str)
                     end
                   private
                     def retrieve_root_url
                       info = self.info
                       info ? info.root_url : nil
                     end
                     def target(path, sq=true)
                       path ||= ''
                       base = path.match(/^\//) ? root_url : url
                       str = "#{base}/#{path}".gsub(/[?<>\*]/, '')
                       if sq
                         str = shell_quote(str)
                       end
                       str
                     end
                     def logger
                       self.class.logger
                     end
                     def shellout(cmd, options = {}, &block)
                       self.class.shellout(cmd, options, &block)
                     end
                     def self.logger
                       Rails.logger
                     end
                     def self.shellout(cmd, options = {}, &block)
                       if logger && logger.debug?
                         logger.debug "Shelling out: #{strip_credential(cmd)}"
                       end
                       if Rails.env == 'development'
                         # Capture stderr when running in dev environment
                         cmd = "#{cmd} 2>>#{shell_quote(Rails.root.join('log/scm.stderr.log').to_s)}"
                       end
                       begin
                         mode = "r+"
                         IO.popen(cmd, mode) do |io|
                           io.set_encoding("ASCII-8BIT") if io.respond_to?(:set_encoding)
                           io.close_write unless options[:write_stdin]
                           block.call(io) if block_given?
                         end
                       ## If scm command does not exist,
                       ## Linux JRuby 1.6.2 (ruby-1.8.7-p330) raises java.io.IOException
                       ## in production environment.
                       # rescue Errno::ENOENT => e
                       rescue Exception => e
                         msg = strip_credential(e.message)
                         # The command failed, log it and re-raise
                         logmsg = "SCM command failed, "
                         logmsg += "make sure that your SCM command (e.g. svn) is "
                         logmsg += "in PATH (#{ENV['PATH']})\n"
                         logmsg += "You can configure your scm commands in config/configuration.yml.\n"
                         logmsg += "#{strip_credential(cmd)}\n"
                         logmsg += "with: #{msg}"
                         logger.error(logmsg)
                         raise CommandFailed.new(msg)
                       end
                     end
                     # Hides username/password in a given command
                     def self.strip_credential(cmd)
                       q = (Redmine::Platform.mswin? ? '"' : "'")
                       cmd.to_s.gsub(/(\-\-(password|username))\s+(#{q}[^#{q}]+#{q}|[^#{q}]\S+)/, '\\1 xxxx')
                     end
                     def strip_credential(cmd)
                       self.class.strip_credential(cmd)
                     end
                     def scm_iconv(to, from, str)
                       return nil if str.nil?
                       return str if to == from
                       if str.respond_to?(:force_encoding)
                         str.force_encoding(from)
                         begin
                           s = str.encode(to)
-                        rescue Exception => e
+                        rescue Exception => err
                           logger.error("failed to convert from #{from} to #{to}. #{err}")
                           nil
                         end
                       else
                         begin
                           Iconv.conv(to, from, str)
                         rescue Iconv::Failure => err
                           logger.error("failed to convert from #{from} to #{to}. #{err}")
                           nil
                         end
                       end
                     end
                     def parse_xml(xml)
                       if RUBY_PLATFORM == 'java'
                         xml = xml.sub(%r{<\?xml[^>]*\?>}, '')
                       end
                       ActiveSupport::XmlMini.parse(xml)
                     end
                   end
                   class Entries < Array
                     def sort_by_name
                       dup.sort! {|x,y|
                         if x.kind == y.kind
                           x.name.to_s <=> y.name.to_s
                         else
                           x.kind <=> y.kind
                         end
                       }
                     end
                     def revisions
                       revisions ||= Revisions.new(collect{|entry| entry.lastrev}.compact)
                     end
                   end
                   class Info
                     attr_accessor :root_url, :lastrev
                     def initialize(attributes={})
                       self.root_url = attributes[:root_url] if attributes[:root_url]
                       self.lastrev = attributes[:lastrev]
                     end
                   end
                   class Entry
                     attr_accessor :name, :path, :kind, :size, :lastrev, :changeset
                     def initialize(attributes={})
                       self.name = attributes[:name] if attributes[:name]
                       self.path = attributes[:path] if attributes[:path]
                       self.kind = attributes[:kind] if attributes[:kind]
                       self.size = attributes[:size].to_i if attributes[:size]
                       self.lastrev = attributes[:lastrev]
                     end
                     def is_file?
                       'file' == self.kind
                     end
                     def is_dir?
                       'dir' == self.kind
                     end
                     def is_text?
                       Redmine::MimeType.is_type?('text', name)
                     end
                     def author
                       if changeset
                         changeset.author.to_s
                       elsif lastrev
                         Redmine::CodesetUtil.replace_invalid_utf8(lastrev.author.to_s.split('<').first)
                       end
                     end
                   end
                   class Revisions < Array
                     def latest
                       sort {|x,y|
                         unless x.time.nil? or y.time.nil?
                           x.time <=> y.time
                         else
                         end
                       }.last
                     end
                   end
                   class Revision
                     attr_accessor :scmid, :name, :author, :time, :message,
                                   :paths, :revision, :branch, :identifier,
                                   :parents
                     def initialize(attributes={})
                       self.identifier = attributes[:identifier]
                       self.scmid      = attributes[:scmid]
                       self.name       = attributes[:name] || self.identifier
                       self.author     = attributes[:author]
                       self.time       = attributes[:time]
                       self.message    = attributes[:message] || ""
                       self.paths      = attributes[:paths]
                       self.revision   = attributes[:revision]
                       self.branch     = attributes[:branch]
                       self.parents    = attributes[:parents]
                     end
                     # Returns the readable identifier.
                     def format_identifier
                       self.identifier.to_s
                     end
                     def ==(other)
                       if other.nil?
                         false
                       elsif scmid.present?
                         scmid == other.scmid
                       elsif identifier.present?
                         identifier == other.identifier
                       elsif revision.present?
                         revision == other.revision
                       end
                     end
                   end
                   class Annotate
                     attr_reader :lines, :revisions
                     def initialize
                       @lines = []
                       @revisions = []
                     end
                     def add_line(line, revision)
                       @lines << line
                       @revisions << revision
                     end
                     def content
                       content = lines.join("\n")
                     end
                     def empty?
                       lines.empty?
                     end
                   end
                   class Branch < String
                     attr_accessor :revision, :scmid
                   end
                 end
               end
             end

test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +17 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__)
             begin
               require 'mocha'
               class GitAdapterTest < ActiveSupport::TestCase
                 REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s
                 FELIX_HEX  = "Felix Sch\xC3\xA4fer"
                 CHAR_1_HEX = "\xc3\x9c"
                 ## Git, Mercurial and CVS path encodings are binary.
                 ## Subversion supports URL encoding for path.
                 ## Redmine Mercurial adapter and extension use URL encoding.
                 ## Git accepts only binary path in command line parameter.
                 ## So, there is no way to use binary command line parameter in JRuby.
                 JRUBY_SKIP     = (RUBY_PLATFORM == 'java')
                 JRUBY_SKIP_STR = "TODO: This test fails in JRuby"
                 if File.directory?(REPOSITORY_PATH)
                   ## Ruby uses ANSI api to fork a process on Windows.
                   ## Japanese Shift_JIS and Traditional Chinese Big5 have 0x5c(backslash) problem
                   ## and these are incompatible with ASCII.
                   ## Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10
                   ## http://code.google.com/p/msysgit/issues/detail?id=80
                   ## So, Latin-1 path tests fail on Japanese Windows
                   WINDOWS_PASS = (Redmine::Platform.mswin? &&
                                   Redmine::Scm::Adapters::GitAdapter.client_version_above?([1, 7, 10]))
                   WINDOWS_SKIP_STR = "TODO: This test fails in Git for Windows above 1.7.10"
                   def setup
                     adapter_class = Redmine::Scm::Adapters::GitAdapter
                     assert adapter_class
                     assert adapter_class.client_command
                     assert_equal true, adapter_class.client_available
                     assert_equal true, adapter_class.client_version_above?([1])
                     assert_equal true, adapter_class.client_version_above?([1, 0])
                     @adapter = Redmine::Scm::Adapters::GitAdapter.new(
                                   REPOSITORY_PATH,
                                   nil,
                                   nil,
                                   nil,
                                   'ISO-8859-1'
                                )
                     assert @adapter
                     @char_1 = CHAR_1_HEX.dup
                     if @char_1.respond_to?(:force_encoding)
                       @char_1.force_encoding('UTF-8')
                     end
                   end
                   def test_scm_version
                     to_test = { "git version 1.7.3.4\n"             => [1,7,3,4],
                                 "1.6.1\n1.7\n1.8"                   => [1,6,1],
                                 "1.6.2\r\n1.8.1\r\n1.9.1"           => [1,6,2]}
                     to_test.each do |s, v|
                       test_scm_version_for(s, v)
                     end
                   end
                   def test_branches
                     brs = []
                     @adapter.branches.each do |b|
                       brs << b
                     end
                     assert_equal 6, brs.length
                     br_issue_8857 = brs[0]
                     assert_equal 'issue-8857', br_issue_8857.to_s
                     assert_equal '2a682156a3b6e77a8bf9cd4590e8db757f3c6c78', br_issue_8857.revision
                     assert_equal br_issue_8857.scmid, br_issue_8857.revision
                     assert_equal false, br_issue_8857.is_default
                     br_latin_1_path = brs[1]
                     assert_equal 'latin-1-path-encoding', br_latin_1_path.to_s
                     assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', br_latin_1_path.revision
                     assert_equal br_latin_1_path.scmid, br_latin_1_path.revision
                     assert_equal false, br_latin_1_path.is_default
                     br_master = brs[2]
                     assert_equal 'master', br_master.to_s
                     assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', br_master.revision
                     assert_equal br_master.scmid, br_master.revision
                     assert_equal false, br_master.is_default
                     br_master_20120212 = brs[3]
                     assert_equal 'master-20120212', br_master_20120212.to_s
                     assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', br_master_20120212.revision
                     assert_equal br_master_20120212.scmid, br_master_20120212.revision
                     assert_equal true, br_master_20120212.is_default
                     br_latin_1 = brs[-2]
                     assert_equal 'test-latin-1', br_latin_1.to_s
                     assert_equal '67e7792ce20ccae2e4bb73eed09bb397819c8834', br_latin_1.revision
                     assert_equal br_latin_1.scmid, br_latin_1.revision
                     assert_equal false, br_latin_1.is_default
                     br_test = brs[-1]
                     assert_equal 'test_branch', br_test.to_s
                     assert_equal 'fba357b886984ee71185ad2065e65fc0417d9b92', br_test.revision
                     assert_equal br_test.scmid, br_test.revision
                     assert_equal false, br_test.is_default
                   end
                   def test_default_branch
                     assert_equal 'master-20120212', @adapter.default_branch
                   end
                   def test_tags
                     assert_equal  [
                           "tag00.lightweight",
                           "tag01.annotated",
                         ], @adapter.tags
                   end
                   def test_revisions_master_all
                     revs1 = []
                     @adapter.revisions('', nil, "master",{}) do |rev|
                       revs1 << rev
                     end
                     assert_equal 15, revs1.length
                     assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs1[ 0].identifier
                     assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518', revs1[-1].identifier
                     revs2 = []
                     @adapter.revisions('', nil, "master",
                                        {:reverse => true}) do |rev|
                       revs2 << rev
                     end
                     assert_equal 15, revs2.length
                     assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs2[-1].identifier
                     assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518', revs2[ 0].identifier
                   end
                   def test_revisions_master_merged_rev
                     revs1 = []
                     @adapter.revisions('',
                                        "713f4944648826f558cf548222f813dabe7cbb04",
                                        "master",
                                        {:reverse => true}) do |rev|
                       revs1 << rev
                     end
                     assert_equal 8, revs1.length
                     assert_equal 'fba357b886984ee71185ad2065e65fc0417d9b92', revs1[ 0].identifier
                     assert_equal '7e61ac704deecde634b51e59daa8110435dcb3da', revs1[ 1].identifier
                     # 4a07fe31b is not a child of 713f49446
                     assert_equal '4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8', revs1[ 2].identifier
                     # Merged revision
                     assert_equal '32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf', revs1[ 3].identifier
                     assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs1[-1].identifier
                     revs2 = []
                     @adapter.revisions('',
                                        "fba357b886984ee71185ad2065e65fc0417d9b92",
                                        "master",
                                        {:reverse => true}) do |rev|
                       revs2 << rev
                     end
                     assert_equal 7, revs2.length
                     assert_equal '7e61ac704deecde634b51e59daa8110435dcb3da', revs2[ 0].identifier
                     # 4a07fe31b is not a child of fba357b8869
                     assert_equal '4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8', revs2[ 1].identifier
                     # Merged revision
                     assert_equal '32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf', revs2[ 2].identifier
                     assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs2[-1].identifier
                   end
                   def test_revisions_branch_latin_1_path_encoding_all
                     revs1 = []
                     @adapter.revisions('', nil, "latin-1-path-encoding",{}) do |rev|
                       revs1 << rev
                     end
                     assert_equal 8, revs1.length
                     assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', revs1[ 0].identifier
                     assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518', revs1[-1].identifier
                     revs2 = []
                     @adapter.revisions('', nil, "latin-1-path-encoding",
                                        {:reverse => true}) do |rev|
                       revs2 << rev
                     end
                     assert_equal 8, revs2.length
                     assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', revs2[-1].identifier
                     assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518', revs2[ 0].identifier
                   end
                   def test_revisions_branch_latin_1_path_encoding_with_rev
                     revs1 = []
                     @adapter.revisions('',
                                        '7234cb2750b63f47bff735edc50a1c0a433c2518',
                                        "latin-1-path-encoding",
                                        {:reverse => true}) do |rev|
                       revs1 << rev
                     end
                     assert_equal 7, revs1.length
                     assert_equal '899a15dba03a3b350b89c3f537e4bbe02a03cdc9', revs1[ 0].identifier
                     assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', revs1[-1].identifier
                     revs2 = []
                     @adapter.revisions('',
                                        '57ca437c0acbbcb749821fdf3726a1367056d364',
                                        "latin-1-path-encoding",
                                        {:reverse => true}) do |rev|
                       revs2 << rev
                     end
                     assert_equal 3, revs2.length
                     assert_equal '4fc55c43bf3d3dc2efb66145365ddc17639ce81e', revs2[ 0].identifier
                     assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', revs2[-1].identifier
                   end
                   def test_revisions_invalid_rev
                     assert_equal [], @adapter.revisions('', '1234abcd', "master")
                     assert_raise Redmine::Scm::Adapters::CommandFailed do
                       revs1 = []
                       @adapter.revisions('',
                                        '1234abcd',
                                        "master",
                                        {:reverse => true}) do |rev|
                         revs1 << rev
                       end
                     end
                   end
                   def test_revisions_includes_master_two_revs
                     revs1 = []
                     @adapter.revisions('', nil, nil,
                                        {:reverse => true,
                                         :includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c'],
                                         :excludes => ['4f26664364207fa8b1af9f8722647ab2d4ac5d43']}) do |rev|
                       revs1 << rev
                     end
                     assert_equal 2, revs1.length
                     assert_equal 'ed5bb786bbda2dee66a2d50faf51429dbc043a7b', revs1[ 0].identifier
                     assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs1[-1].identifier
                   end
                   def test_revisions_includes_master_two_revs_from_origin
                     revs1 = []
                     @adapter.revisions('', nil, nil,
                                        {:reverse => true,
                                         :includes => ['899a15dba03a3b350b89c3f537e4bbe02a03cdc9'],
                                         :excludes => []}) do |rev|
                       revs1 << rev
                     end
                     assert_equal 2, revs1.length
                     assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518', revs1[ 0].identifier
                     assert_equal '899a15dba03a3b350b89c3f537e4bbe02a03cdc9', revs1[ 1].identifier
                   end
                   def test_revisions_includes_merged_revs
                     revs1 = []
                     @adapter.revisions('', nil, nil,
                                        {:reverse => true,
                                         :includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c'],
                                         :excludes => ['fba357b886984ee71185ad2065e65fc0417d9b92']}) do |rev|
                       revs1 << rev
                     end
                     assert_equal 7, revs1.length
                     assert_equal '7e61ac704deecde634b51e59daa8110435dcb3da', revs1[ 0].identifier
                     assert_equal '4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8', revs1[ 1].identifier
                     assert_equal '32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf', revs1[ 2].identifier
                     assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs1[-1].identifier
                   end
                   def test_revisions_includes_two_heads
                     revs1 = []
                     @adapter.revisions('', nil, nil,
                                        {:reverse => true,
                                         :includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c',
                                                       '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127'],
                                         :excludes => ['4f26664364207fa8b1af9f8722647ab2d4ac5d43',
                                                       '4fc55c43bf3d3dc2efb66145365ddc17639ce81e']}) do |rev|
                       revs1 << rev
                     end
                     assert_equal 4, revs1.length
                     assert_equal 'ed5bb786bbda2dee66a2d50faf51429dbc043a7b', revs1[ 0].identifier
                     assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs1[ 1].identifier
                     assert_equal '64f1f3e89ad1cb57976ff0ad99a107012ba3481d', revs1[-2].identifier
                     assert_equal '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127', revs1[-1].identifier
                   end
                   def test_revisions_disjointed_histories_revisions
                     revs1 = []
                     @adapter.revisions('', nil, nil,
                                        {:reverse => true,
                                         :includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c',
                                                       '92397af84d22f27389c822848ecd5b463c181583'],
                                         :excludes => ['95488a44bc25f7d1f97d775a31359539ff333a63',
                                                       '4f26664364207fa8b1af9f8722647ab2d4ac5d43'] }) do |rev|
                       revs1 << rev
                     end
                     assert_equal 4, revs1.length
                     assert_equal 'ed5bb786bbda2dee66a2d50faf51429dbc043a7b', revs1[ 0].identifier
                     assert_equal '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c', revs1[ 1].identifier
                     assert_equal 'bc201c95999c4f10d018b0aa03b541cd6a2ff0ee', revs1[-2].identifier
                     assert_equal '92397af84d22f27389c822848ecd5b463c181583', revs1[-1].identifier
                   end
                   def test_revisions_invalid_rev_excludes
                     assert_equal [],
                                  @adapter.revisions('', nil, nil,
                                                     {:reverse => true,
                                                      :includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c'],
                                                      :excludes => ['0123abcd4567']})
                     assert_raise Redmine::Scm::Adapters::CommandFailed do
                       revs1 = []
                       @adapter.revisions('', nil, nil,
                                          {:reverse => true,
                                           :includes => ['83ca5fd546063a3c7dc2e568ba3355661a9e2b2c'],
                                           :excludes => ['0123abcd4567']}) do |rev|
                         revs1 << rev
                       end
                     end
                   end
                   def test_getting_revisions_with_spaces_in_filename
                     assert_equal 1, @adapter.revisions("filemane with spaces.txt",
                                                        nil, "master").length
                   end
                   def test_parents
                     revs1 = []
                     @adapter.revisions('',
                                        nil,
                                        "master",
                                        {:reverse => true}) do |rev|
                       revs1 << rev
                     end
                     assert_equal 15, revs1.length
                     assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518",
                                  revs1[0].identifier
                     assert_equal nil, revs1[0].parents
                     assert_equal "899a15dba03a3b350b89c3f537e4bbe02a03cdc9",
                                  revs1[1].identifier
                     assert_equal 1, revs1[1].parents.length
                     assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518",
                                  revs1[1].parents[0]
                     assert_equal "32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf",
                                  revs1[10].identifier
                     assert_equal 2, revs1[10].parents.length
                     assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8",
                                  revs1[10].parents[0]
                     assert_equal "7e61ac704deecde634b51e59daa8110435dcb3da",
                                  revs1[10].parents[1]
                   end
                   def test_getting_revisions_with_leading_and_trailing_spaces_in_filename
                     assert_equal " filename with a leading space.txt ",
                        @adapter.revisions(" filename with a leading space.txt ",
                                            nil, "master")[0].paths[0][:path]
                   end
                   def test_getting_entries_with_leading_and_trailing_spaces_in_filename
                     assert_equal " filename with a leading space.txt ",
                        @adapter.entries('',
                                '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c')[3].name
                   end
                   def test_annotate
                     annotate = @adapter.annotate('sources/watchers_controller.rb')
                     assert_kind_of Redmine::Scm::Adapters::Annotate, annotate
                     assert_equal 41, annotate.lines.size
                     assert_equal "# This program is free software; you can redistribute it and/or",
                                  annotate.lines[4].strip
                     assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518",
                                   annotate.revisions[4].identifier
                     assert_equal "jsmith", annotate.revisions[4].author
                   end
                   def test_annotate_moved_file
                     annotate = @adapter.annotate('renamed_test.txt')
                     assert_kind_of Redmine::Scm::Adapters::Annotate, annotate
                     assert_equal 2, annotate.lines.size
                   end
                   def test_last_rev
                     last_rev = @adapter.lastrev("README",
                                                 "4f26664364207fa8b1af9f8722647ab2d4ac5d43")
                     assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8", last_rev.scmid
                     assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8", last_rev.identifier
                     assert_equal "Adam Soltys <asoltys@gmail.com>", last_rev.author
                     assert_equal "2009-06-24 05:27:38".to_time, last_rev.time
                   end
                   def test_last_rev_with_spaces_in_filename
                     last_rev = @adapter.lastrev("filemane with spaces.txt",
                                                 "ed5bb786bbda2dee66a2d50faf51429dbc043a7b")
                     str_felix_hex  = FELIX_HEX.dup
                     last_rev_author = last_rev.author
                     if last_rev_author.respond_to?(:force_encoding)
                       str_felix_hex.force_encoding('ASCII-8BIT')
                     end
                     assert_equal "ed5bb786bbda2dee66a2d50faf51429dbc043a7b", last_rev.scmid
                     assert_equal "ed5bb786bbda2dee66a2d50faf51429dbc043a7b", last_rev.identifier
                     assert_equal "#{str_felix_hex} <felix@fachschaften.org>",
                                    last_rev.author
                     assert_equal "2010-09-18 19:59:46".to_time, last_rev.time
                   end
                   def test_latin_1_path
                     if WINDOWS_PASS
                       puts WINDOWS_SKIP_STR
                     elsif JRUBY_SKIP
                       puts JRUBY_SKIP_STR
                     else
                       p2 = "latin-1-dir/test-#{@char_1}-2.txt"
                       ['4fc55c43bf3d3dc2efb66145365ddc17639ce81e', '4fc55c43bf3'].each do |r1|
                         assert @adapter.diff(p2, r1)
                         assert @adapter.cat(p2, r1)
                         assert_equal 1, @adapter.annotate(p2, r1).lines.length
                         ['64f1f3e89ad1cb57976ff0ad99a107012ba3481d', '64f1f3e89ad1cb5797'].each do |r2|
                           assert @adapter.diff(p2, r1, r2)
                         end
                       end
                     end
                   end
                   def test_entries_tag
                     entries1 = @adapter.entries(nil, 'tag01.annotated',
                                                 options = {:report_last_commit => true})
                     assert entries1
                     assert_equal 3, entries1.size
                     assert_equal 'sources', entries1[1].name
                     assert_equal 'sources', entries1[1].path
                     assert_equal 'dir', entries1[1].kind
                     readme = entries1[2]
                     assert_equal 'README', readme.name
                     assert_equal 'README', readme.path
                     assert_equal 'file', readme.kind
                     assert_equal 27, readme.size
                     assert_equal '899a15dba03a3b350b89c3f537e4bbe02a03cdc9', readme.lastrev.identifier
                     assert_equal Time.gm(2007, 12, 14, 9, 24, 1), readme.lastrev.time
                   end
                   def test_entries_branch
                     entries1 = @adapter.entries(nil, 'test_branch',
                                                 options = {:report_last_commit => true})
                     assert entries1
                     assert_equal 4, entries1.size
                     assert_equal 'sources', entries1[1].name
                     assert_equal 'sources', entries1[1].path
                     assert_equal 'dir', entries1[1].kind
                     readme = entries1[2]
                     assert_equal 'README', readme.name
                     assert_equal 'README', readme.path
                     assert_equal 'file', readme.kind
                     assert_equal 159, readme.size
                     assert_equal '713f4944648826f558cf548222f813dabe7cbb04', readme.lastrev.identifier
                     assert_equal Time.gm(2009, 6, 19, 4, 37, 23), readme.lastrev.time
                   end
+                  def test_entries_wrong_path_encoding
+                    adpt = Redmine::Scm::Adapters::GitAdapter.new(
+                                  REPOSITORY_PATH,
+                                  nil,
+                                  nil,
+                                  nil,
+                                  'EUC-JP'
+                               )
+                    entries1 = adpt.entries('latin-1-dir', '64f1f3e8')
+                    assert entries1
+                    assert_equal 3, entries1.size
+                    f1 = entries1[1]
+                    assert_equal nil, f1.name
+                    assert_equal nil, f1.path
+                    assert_equal 'file', f1.kind
+                  end
                   def test_entries_latin_1_files
                     entries1 = @adapter.entries('latin-1-dir', '64f1f3e8')
                     assert entries1
                     assert_equal 3, entries1.size
                     f1 = entries1[1]
                     assert_equal "test-#{@char_1}-2.txt", f1.name
                     assert_equal "latin-1-dir/test-#{@char_1}-2.txt", f1.path
                     assert_equal 'file', f1.kind
                   end
                   def test_entries_latin_1_dir
                     if WINDOWS_PASS
                       puts WINDOWS_SKIP_STR
                     elsif JRUBY_SKIP
                       puts JRUBY_SKIP_STR
                     else
                       entries1 = @adapter.entries("latin-1-dir/test-#{@char_1}-subdir",
                                                   '1ca7f5ed')
                       assert entries1
                       assert_equal 3, entries1.size
                       f1 = entries1[1]
                       assert_equal "test-#{@char_1}-2.txt", f1.name
                       assert_equal "latin-1-dir/test-#{@char_1}-subdir/test-#{@char_1}-2.txt", f1.path
                       assert_equal 'file', f1.kind
                     end
                   end
                   def test_entry
                     entry = @adapter.entry()
                     assert_equal "", entry.path
                     assert_equal "dir", entry.kind
                     entry = @adapter.entry('')
                     assert_equal "", entry.path
                     assert_equal "dir", entry.kind
                     assert_nil @adapter.entry('invalid')
                     assert_nil @adapter.entry('/invalid')
                     assert_nil @adapter.entry('/invalid/')
                     assert_nil @adapter.entry('invalid/invalid')
                     assert_nil @adapter.entry('invalid/invalid/')
                     assert_nil @adapter.entry('/invalid/invalid')
                     assert_nil @adapter.entry('/invalid/invalid/')
                     ["README", "/README"].each do |path|
                       entry = @adapter.entry(path, '7234cb2750b63f')
                       assert_equal "README", entry.path
                       assert_equal "file", entry.kind
                     end
                     ["sources", "/sources", "/sources/"].each do |path|
                       entry = @adapter.entry(path, '7234cb2750b63f')
                       assert_equal "sources", entry.path
                       assert_equal "dir", entry.kind
                     end
                     ["sources/watchers_controller.rb", "/sources/watchers_controller.rb"].each do |path|
                       entry = @adapter.entry(path, '7234cb2750b63f')
                       assert_equal "sources/watchers_controller.rb", entry.path
                       assert_equal "file", entry.kind
                     end
                   end
                   def test_path_encoding_default_utf8
                     adpt1 = Redmine::Scm::Adapters::GitAdapter.new(
                                               REPOSITORY_PATH
                                             )
                     assert_equal "UTF-8", adpt1.path_encoding
                     adpt2 = Redmine::Scm::Adapters::GitAdapter.new(
                                               REPOSITORY_PATH,
                                               nil,
                                               nil,
                                               nil,
                                               ""
                                             )
                     assert_equal "UTF-8", adpt2.path_encoding
                   end
                   def test_cat_path_invalid
                     assert_nil @adapter.cat('invalid')
                   end
                   def test_cat_revision_invalid
                     assert     @adapter.cat('README')
                     assert_nil @adapter.cat('README', '1234abcd5678')
                   end
                   def test_diff_path_invalid
                     assert_equal [], @adapter.diff('invalid', '713f4944648826f5')
                   end
                   def test_diff_revision_invalid
                     assert_nil @adapter.diff(nil, '1234abcd5678')
                     assert_nil @adapter.diff(nil, '713f4944648826f5', '1234abcd5678')
                     assert_nil @adapter.diff(nil, '1234abcd5678', '713f4944648826f5')
                   end
                   def test_annotate_path_invalid
                     assert_nil @adapter.annotate('invalid')
                   end
                   def test_annotate_revision_invalid
                     assert     @adapter.annotate('README')
                     assert_nil @adapter.annotate('README', '1234abcd5678')
                   end
                   private
                   def test_scm_version_for(scm_command_version, version)
                     @adapter.class.expects(:scm_version_from_command_line).returns(scm_command_version)
                     assert_equal version, @adapter.class.scm_command_version
                   end
                 else
                   puts "Git test repository NOT FOUND. Skipping unit tests !!!"
                   def test_fake; assert true end
                 end
               end
             rescue LoadError
               class GitMochaFake < ActiveSupport::TestCase
                 def test_fake; assert(false, "Requires mocha to run those tests")  end
               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