comparison lib/redmine/scm/adapters/abstract_adapter.rb @ 909:cbb26bc654de redmine-1.3

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)

     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

         def retrieve_root_url
           info = self.info
           info ? info.root_url : nil
         end
 
-        def target(path)
+        def target(path, sq=true)
           path ||= ''
           base = path.match(/^\//) ? root_url : url
-          shell_quote("#{base}/#{path}".gsub(/[?<>\*]/, ''))
+          str = "#{base}/#{path}".gsub(/[?<>\*]/, '')
+          if sq
+            str = shell_quote(str)
+          end
+          str
         end
 
         def logger
           self.class.logger
         end

         def shellout(cmd, &block)
           self.class.shellout(cmd, &block)
         end
 
         def self.logger
-          RAILS_DEFAULT_LOGGER
+          Rails.logger
         end
 
         def self.shellout(cmd, &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>>#{RAILS_ROOT}/log/scm.stderr.log"
+            cmd = "#{cmd} 2>>#{Rails.root}/log/scm.stderr.log"
           end
           begin
             if RUBY_VERSION < '1.9'
               mode = "r+"
             else

             end
             IO.popen(cmd, mode) do |io|
               io.close_write
               block.call(io) if block_given?
             end
-          rescue Errno::ENOENT => e
+          ## 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"

         end
       end
 
       class Revision
         attr_accessor :scmid, :name, :author, :time, :message,
-                      :paths, :revision, :branch, :identifier
+                      :paths, :revision, :branch, :identifier,
+                      :parents
 
         def initialize(attributes={})
           self.identifier = attributes[:identifier]
           self.scmid      = attributes[:scmid]
           self.name       = attributes[:name] || self.identifier

           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

 
         def empty?
           lines.empty?
         end
       end
+
+      class Branch < String
+        attr_accessor :revision, :scmid
+      end
     end
   end
 end