jro_apps/redmine Commit - r4677:3ee203ef0c2b

scm: change key name of configurable command name (#7517, #6159, #7047)....

Toshi MARUYAMA -

r4677:3ee203ef0c2b

parent child

Context file:

r4677:3ee203ef0c2b

Collapse all files

config/configuration.yml.example +5 -5

             # = Redmine configuration file
             #
             # Each environment has it's own configuration options.  If you are only
             # running in production, only the production block needs to be configured.
             # Environment specific configuration options override the default ones.
             #
             # Note that this file needs to be a valid YAML file.
             #
             # == Outgoing email settings (email_delivery setting)
             #
             # === Common configurations
             #
             # ==== Sendmail command
             #
             # production:
             #   email_delivery:
             #     delivery_method: :sendmail
             #
             # ==== Simple SMTP server at localhost
             #
             # production:
             #   email_delivery:
             #     delivery_method: :smtp
             #     smtp_settings:
             #       address: "localhost"
             #       port: 25
             #
             # ==== SMTP server at example.com using LOGIN authentication and checking HELO for foo.com
             #
             # production:
             #   email_delivery:
             #     delivery_method: :smtp
             #     smtp_settings:
             #       address: "example.com"
             #       port: 25
             #       authentication: :login
             #       domain: 'foo.com'
             #       user_name: 'myaccount'
             #       password: 'password'
             #
             # ==== SMTP server at example.com using PLAIN authentication
             #
             # production:
             #   email_delivery:
             #     delivery_method: :smtp
             #     smtp_settings:
             #       address: "example.com"
             #       port: 25
             #       authentication: :plain
             #       domain: 'example.com'
             #       user_name: 'myaccount'
             #       password: 'password'
             #
             # ==== SMTP server at using TLS (GMail)
             #
             # This requires some additional configuration.  See the article at:
             # http://redmineblog.com/articles/setup-redmine-to-send-email-using-gmail/
             #
             # production:
             #   email_delivery:
             #     delivery_method: :smtp
             #     smtp_settings:
             #       tls: true
             #       address: "smtp.gmail.com"
             #       port: 587
             #       domain: "smtp.gmail.com" # 'your.domain.com' for GoogleApps
             #       authentication: :plain
             #       user_name: "your_email@gmail.com"
             #       password: "your_password"
             #
             #
             # === More configuration options
             #
             # See the "Configuration options" at the following website for a list of the
             # full options allowed:
             #
             # http://wiki.rubyonrails.org/rails/pages/HowToSendEmailsWithActionMailer
             # default configuration options for all environments
             default:
               # Outgoing emails configuration (see examples above)
               email_delivery:
                 delivery_method: :smtp
                 smtp_settings:
                   address: smtp.example.net
                   port: 25
                   domain: example.net
                   authentication: :login
                   user_name: "redmine@example.net"
                   password: "redmine"
               # Absolute path to the directory where attachments are stored.
               # The default is the 'files' directory in your Redmine instance.
               # Your Redmine instance needs to have write permission on this
               # directory.
               # Examples:
               # attachments_storage_path: /var/redmine/files
               # attachments_storage_path: D:/redmine/files
               attachments_storage_path:
               # Configuration of the autologin cookie.
               # autologin_cookie_name: the name of the cookie (default: autologin)
               # autologin_cookie_path: the cookie path (default: /)
               # autologin_cookie_secure: true sets the cookie secure flag (default: false)
               autologin_cookie_name:
               autologin_cookie_path:
               autologin_cookie_secure:
               # Configuration of SCM executable command.
               # Absolute path (e.g. /usr/local/bin/hg) or command name (e.g. hg.exe, bzr.exe)
               # On Windows, *.cmd, *.bat (e.g. hg.cmd, bzr.bat) does not work.
-              scm_command_subversion: svn                                       # (default: svn)
+              scm_subversion_command: svn                                       # (default: svn)
-              scm_command_mercurial:  "\"C:\Program Files\TortoiseHg\hg.exe\""  # (default: hg)
+              scm_mercurial_command:  "\"C:\Program Files\TortoiseHg\hg.exe\""  # (default: hg)
-              scm_command_git:        /usr/local/bin/git                        # (default: git)
+              scm_git_command:        /usr/local/bin/git                        # (default: git)
-              scm_command_bazaar:     bzr.exe                                   # (default: bzr)
+              scm_bazaar_command:     bzr.exe                                   # (default: bzr)
-              scm_command_darcs:      darcs-1.0.9-i386-linux                    # (default: darcs)
+              scm_darcs_command:      darcs-1.0.9-i386-linux                    # (default: darcs)
             # specific configuration options for production environment
             # that overrides the default ones
             production:
             # specific configuration options for development environment
             # that overrides the default ones
             development:

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

             # redMine - project management software
             # Copyright (C) 2006-2007  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 'redmine/scm/adapters/abstract_adapter'
             module Redmine
               module Scm
                 module Adapters
                   class BazaarAdapter < AbstractAdapter
                     # Bazaar executable name
-                    BZR_BIN = Redmine::Configuration['scm_command_bazaar'] || "bzr"
+                    BZR_BIN = Redmine::Configuration['scm_bazaar_command'] || "bzr"
                     # Get info about the repository
                     def info
                       cmd = "#{BZR_BIN} revno #{target('')}"
                       info = nil
                       shellout(cmd) do |io|
                         if io.read =~ %r{^(\d+)\r?$}
                           info = Info.new({:root_url => url,
                                            :lastrev => Revision.new({
                                              :identifier => $1
                                            })
                                          })
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       info
                     rescue CommandFailed
                       return nil
                     end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     def entries(path=nil, identifier=nil)
                       path ||= ''
                       entries = Entries.new
                       cmd = "#{BZR_BIN} ls -v --show-ids"
                       identifier = -1 unless identifier && identifier.to_i > 0
                       cmd << " -r#{identifier.to_i}"
                       cmd << " #{target(path)}"
                       shellout(cmd) do |io|
                         prefix = "#{url}/#{path}".gsub('\\', '/')
                         logger.debug "PREFIX: #{prefix}"
                         re = %r{^V\s+(#{Regexp.escape(prefix)})?(\/?)([^\/]+)(\/?)\s+(\S+)\r?$}
                         io.each_line do |line|
                           next unless line =~ re
                           entries << Entry.new({:name => $3.strip,
                                                 :path => ((path.empty? ? "" : "#{path}/") + $3.strip),
                                                 :kind => ($4.blank? ? 'file' : 'dir'),
                                                 :size => nil,
                                                 :lastrev => Revision.new(:revision => $5.strip)
                                               })
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
                       entries.sort_by_name
                     end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       path ||= ''
                       identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : 'last:1'
                       identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : 1
                       revisions = Revisions.new
                       cmd = "#{BZR_BIN} log -v --show-ids -r#{identifier_to}..#{identifier_from} #{target(path)}"
                       shellout(cmd) do |io|
                         revision = nil
                         parsing = nil
                         io.each_line do |line|
                           if line =~ /^----/
                             revisions << revision if revision
                             revision = Revision.new(:paths => [], :message => '')
                             parsing = nil
                           else
                             next unless revision
                             if line =~ /^revno: (\d+)($|\s\[merge\]$)/
                               revision.identifier = $1.to_i
                             elsif line =~ /^committer: (.+)$/
                               revision.author = $1.strip
                             elsif line =~ /^revision-id:(.+)$/
                               revision.scmid = $1.strip
                             elsif line =~ /^timestamp: (.+)$/
                               revision.time = Time.parse($1).localtime
                             elsif line =~ /^    -----/
                               # partial revisions
                               parsing = nil unless parsing == 'message'
                             elsif line =~ /^(message|added|modified|removed|renamed):/
                               parsing = $1
                             elsif line =~ /^  (.*)$/
                               if parsing == 'message'
                                 revision.message << "#{$1}\n"
                               else
                                 if $1 =~ /^(.*)\s+(\S+)$/
                                   path = $1.strip
                                   revid = $2
                                   case parsing
                                   when 'added'
                                     revision.paths << {:action => 'A', :path => "/#{path}", :revision => revid}
                                   when 'modified'
                                     revision.paths << {:action => 'M', :path => "/#{path}", :revision => revid}
                                   when 'removed'
                                     revision.paths << {:action => 'D', :path => "/#{path}", :revision => revid}
                                   when 'renamed'
                                     new_path = path.split('=>').last
                                     revision.paths << {:action => 'M', :path => "/#{new_path.strip}", :revision => revid} if new_path
                                   end
                                 end
                               end
                             else
                               parsing = nil
                             end
                           end
                         end
                         revisions << revision if revision
                       end
                       return nil if $? && $?.exitstatus != 0
                       revisions
                     end
                     def diff(path, identifier_from, identifier_to=nil)
                       path ||= ''
                       if identifier_to
                         identifier_to = identifier_to.to_i
                       else
                         identifier_to = identifier_from.to_i - 1
                       end
                       if identifier_from
                         identifier_from = identifier_from.to_i
                       end
                       cmd = "#{BZR_BIN} diff -r#{identifier_to}..#{identifier_from} #{target(path)}"
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       #return nil if $? && $?.exitstatus != 0
                       diff
                     end
                     def cat(path, identifier=nil)
                       cmd = "#{BZR_BIN} cat"
                       cmd << " -r#{identifier.to_i}" if identifier && identifier.to_i > 0
                       cmd << " #{target(path)}"
                       cat = nil
                       shellout(cmd) do |io|
                         io.binmode
                         cat = io.read
                       end
                       return nil if $? && $?.exitstatus != 0
                       cat
                     end
                     def annotate(path, identifier=nil)
                       cmd = "#{BZR_BIN} annotate --all"
                       cmd << " -r#{identifier.to_i}" if identifier && identifier.to_i > 0
                       cmd << " #{target(path)}"
                       blame = Annotate.new
                       shellout(cmd) do |io|
                         author = nil
                         identifier = nil
                         io.each_line do |line|
                           next unless line =~ %r{^(\d+) ([^|]+)\| (.*)$}
                           blame.add_line($3.rstrip, Revision.new(:identifier => $1.to_i, :author => $2.strip))
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       blame
                     end
                   end
                 end
               end
             end

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

             # redMine - project management software
             # Copyright (C) 2006-2007  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 'redmine/scm/adapters/abstract_adapter'
             module Redmine
               module Scm
                 module Adapters
                   class CvsAdapter < AbstractAdapter
                     # CVS executable name
-                    CVS_BIN = Redmine::Configuration['scm_command_cvs'] || "cvs"
+                    CVS_BIN = Redmine::Configuration['scm_cvs_command'] || "cvs"
                     # Guidelines for the input:
                     #  url -> the project-path, relative to the cvsroot (eg. module name)
                     #  root_url -> the good old, sometimes damned, CVSROOT
                     #  login -> unnecessary
                     #  password -> unnecessary too
                     def initialize(url, root_url=nil, login=nil, password=nil)
                       @url = url
                       @login = login if login && !login.empty?
                       @password = (password || "") if @login
                       #TODO: better Exception here (IllegalArgumentException)
                       raise CommandFailed if root_url.blank?
                       @root_url = root_url
                     end
                     def root_url
                       @root_url
                     end
                     def url
                       @url
                     end
                     def info
                       logger.debug "<cvs> info"
                       Info.new({:root_url => @root_url, :lastrev => nil})
                     end
                     def get_previous_revision(revision)
                       CvsRevisionHelper.new(revision).prevRev
                     end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     # this method is used by the repository-browser (aka LIST)
                     def entries(path=nil, identifier=nil)
                       logger.debug "<cvs> entries '#{path}' with identifier '#{identifier}'"
                       path_with_project="#{url}#{with_leading_slash(path)}"
                       entries = Entries.new
                       cmd = "#{CVS_BIN} -d #{shell_quote root_url} rls -e"
                       cmd << " -D \"#{time_to_cvstime(identifier)}\"" if identifier
                       cmd << " #{shell_quote path_with_project}"
                       shellout(cmd) do |io|
                         io.each_line(){|line|
                           fields=line.chop.split('/',-1)
                           logger.debug(">>InspectLine #{fields.inspect}")
                           if fields[0]!="D"
                             entries << Entry.new({:name => fields[-5],
                               #:path => fields[-4].include?(path)?fields[-4]:(path + "/"+ fields[-4]),
                               :path => "#{path}/#{fields[-5]}",
                               :kind => 'file',
                               :size => nil,
                               :lastrev => Revision.new({
                                 :revision => fields[-4],
                                 :name => fields[-4],
                                 :time => Time.parse(fields[-3]),
                                 :author => ''
                               })
                             })
                           else
                             entries << Entry.new({:name => fields[1],
                               :path => "#{path}/#{fields[1]}",
                               :kind => 'dir',
                               :size => nil,
                               :lastrev => nil
                             })
                           end
                         }
                       end
                       return nil if $? && $?.exitstatus != 0
                       entries.sort_by_name
                     end
                     STARTLOG="----------------------------"
                     ENDLOG  ="============================================================================="
                     # Returns all revisions found between identifier_from and identifier_to
                     # in the repository. both identifier have to be dates or nil.
                     # these method returns nothing but yield every result in block
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={}, &block)
                       logger.debug "<cvs> revisions path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
                       path_with_project="#{url}#{with_leading_slash(path)}"
                       cmd = "#{CVS_BIN} -d #{shell_quote root_url} rlog"
                       cmd << " -d\">#{time_to_cvstime_rlog(identifier_from)}\"" if identifier_from
                       cmd << " #{shell_quote path_with_project}"
                       shellout(cmd) do |io|
                         state="entry_start"
                         commit_log=String.new
                         revision=nil
                         date=nil
                         author=nil
                         entry_path=nil
                         entry_name=nil
                         file_state=nil
                         branch_map=nil
                         io.each_line() do |line|
                           if state!="revision" && /^#{ENDLOG}/ =~ line
                             commit_log=String.new
                             revision=nil
                             state="entry_start"
                           end
                           if state=="entry_start"
                             branch_map=Hash.new
                             if /^RCS file: #{Regexp.escape(root_url_path)}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line
                               entry_path = normalize_cvs_path($1)
                               entry_name = normalize_path(File.basename($1))
                               logger.debug("Path #{entry_path} <=> Name #{entry_name}")
                             elsif /^head: (.+)$/ =~ line
                               entry_headRev = $1 #unless entry.nil?
                             elsif /^symbolic names:/ =~ line
                               state="symbolic" #unless entry.nil?
                             elsif /^#{STARTLOG}/ =~ line
                               commit_log=String.new
                               state="revision"
                             end
                             next
                           elsif state=="symbolic"
                             if /^(.*):\s(.*)/ =~ (line.strip)
                               branch_map[$1]=$2
                             else
                               state="tags"
                               next
                             end
                           elsif state=="tags"
                             if /^#{STARTLOG}/ =~ line
                               commit_log = ""
                               state="revision"
                             elsif /^#{ENDLOG}/ =~ line
                               state="head"
                             end
                             next
                           elsif state=="revision"
                             if /^#{ENDLOG}/ =~ line || /^#{STARTLOG}/ =~ line
                               if revision
                                 revHelper=CvsRevisionHelper.new(revision)
                                 revBranch="HEAD"
                                 branch_map.each() do |branch_name,branch_point|
                                   if revHelper.is_in_branch_with_symbol(branch_point)
                                     revBranch=branch_name
                                   end
                                 end
                                 logger.debug("********** YIELD Revision #{revision}::#{revBranch}")
                                 yield Revision.new({
                                   :time => date,
                                   :author => author,
                                   :message=>commit_log.chomp,
                                   :paths => [{
                                     :revision => revision,
                                     :branch=> revBranch,
                                     :path=>entry_path,
                                     :name=>entry_name,
                                     :kind=>'file',
                                     :action=>file_state
                                   }]
                                 })
                               end
                               commit_log=String.new
                               revision=nil
                               if /^#{ENDLOG}/ =~ line
                                 state="entry_start"
                               end
                               next
                             end
                             if /^branches: (.+)$/ =~ line
                               #TODO: version.branch = $1
                             elsif /^revision (\d+(?:\.\d+)+).*$/ =~ line
                               revision = $1
                             elsif /^date:\s+(\d+.\d+.\d+\s+\d+:\d+:\d+)/ =~ line
                               date      = Time.parse($1)
                               author    = /author: ([^;]+)/.match(line)[1]
                               file_state     = /state: ([^;]+)/.match(line)[1]
                               #TODO: linechanges only available in CVS.... maybe a feature our SVN implementation. i'm sure, they are
                               #    useful for stats or something else
                               #                linechanges =/lines: \+(\d+) -(\d+)/.match(line)
                               #                unless linechanges.nil?
                               #                  version.line_plus  = linechanges[1]
                               #                  version.line_minus = linechanges[2]
                               #                else
                               #                  version.line_plus  = 0
                               #                  version.line_minus = 0
                               #                end
                             else
                               commit_log << line unless line =~ /^\*\*\* empty log message \*\*\*/
                             end
                           end
                         end
                       end
                     end
                     def diff(path, identifier_from, identifier_to=nil)
                       logger.debug "<cvs> diff path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
                       path_with_project="#{url}#{with_leading_slash(path)}"
                       cmd = "#{CVS_BIN} -d #{shell_quote root_url} rdiff -u -r#{identifier_to} -r#{identifier_from} #{shell_quote path_with_project}"
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       diff
                     end
                     def cat(path, identifier=nil)
                       identifier = (identifier) ? identifier : "HEAD"
                       logger.debug "<cvs> cat path:'#{path}',identifier #{identifier}"
                       path_with_project="#{url}#{with_leading_slash(path)}"
                       cmd = "#{CVS_BIN} -d #{shell_quote root_url} co"
                       cmd << " -D \"#{time_to_cvstime(identifier)}\"" if identifier
                       cmd << " -p #{shell_quote path_with_project}"
                       cat = nil
                       shellout(cmd) do |io|
                         cat = io.read
                       end
                       return nil if $? && $?.exitstatus != 0
                       cat
                     end
                     def annotate(path, identifier=nil)
                       identifier = (identifier) ? identifier.to_i : "HEAD"
                       logger.debug "<cvs> annotate path:'#{path}',identifier #{identifier}"
                       path_with_project="#{url}#{with_leading_slash(path)}"
                       cmd = "#{CVS_BIN} -d #{shell_quote root_url} rannotate -r#{identifier} #{shell_quote path_with_project}"
                       blame = Annotate.new
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           next unless line =~ %r{^([\d\.]+)\s+\(([^\)]+)\s+[^\)]+\):\s(.*)$}
                           blame.add_line($3.rstrip, Revision.new(:revision => $1, :author => $2.strip))
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       blame
                     end
                     private
                     # Returns the root url without the connexion string
                     # :pserver:anonymous@foo.bar:/path => /path
                     # :ext:cvsservername:/path => /path
                     def root_url_path
                       root_url.to_s.gsub(/^:.+:\d*/, '')
                     end
                     # convert a date/time into the CVS-format
                     def time_to_cvstime(time)
                       return nil if time.nil?
                       return Time.now if time == 'HEAD'
                       unless time.kind_of? Time
                         time = Time.parse(time)
                       end
                       return time.strftime("%Y-%m-%d %H:%M:%S")
                     end
                     def time_to_cvstime_rlog(time)
                       return nil if time.nil?
                       t1 = time.clone.localtime
                       return t1.strftime("%Y-%m-%d %H:%M:%S")
                     end
                     def normalize_cvs_path(path)
                       normalize_path(path.gsub(/Attic\//,''))
                     end
                     def normalize_path(path)
                       path.sub(/^(\/)*(.*)/,'\2').sub(/(.*)(,v)+/,'\1')
                     end
                   end
                   class CvsRevisionHelper
                     attr_accessor :complete_rev, :revision, :base, :branchid
                     def initialize(complete_rev)
                       @complete_rev = complete_rev
                       parseRevision()
                     end
                     def branchPoint
                       return @base
                     end
                     def branchVersion
                       if isBranchRevision
                         return @base+"."+@branchid
                       end
                       return @base
                     end
                     def isBranchRevision
                       !@branchid.nil?
                     end
                     def prevRev
                       unless @revision==0
                         return buildRevision(@revision-1)
                       end
                       return buildRevision(@revision)
                     end
                     def is_in_branch_with_symbol(branch_symbol)
                       bpieces=branch_symbol.split(".")
                       branch_start="#{bpieces[0..-3].join(".")}.#{bpieces[-1]}"
                       return (branchVersion==branch_start)
                     end
                     private
                     def buildRevision(rev)
                       if rev== 0
                         @base
                       elsif @branchid.nil?
                         @base+"."+rev.to_s
                       else
                         @base+"."+@branchid+"."+rev.to_s
                       end
                     end
                     # Interpretiert die cvs revisionsnummern wie z.b. 1.14 oder 1.3.0.15
                     def parseRevision()
                       pieces=@complete_rev.split(".")
                       @revision=pieces.last.to_i
                       baseSize=1
                       baseSize+=(pieces.size/2)
                       @base=pieces[0..-baseSize].join(".")
                       if baseSize > 2
                         @branchid=pieces[-2]
                       end
                     end
                   end
                 end
               end
             end

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

             # redMine - project management software
             # Copyright (C) 2006-2007  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 'redmine/scm/adapters/abstract_adapter'
             require 'rexml/document'
             module Redmine
               module Scm
                 module Adapters
                   class DarcsAdapter < AbstractAdapter
                     # Darcs executable name
-                    DARCS_BIN = Redmine::Configuration['scm_command_darcs'] || "darcs"
+                    DARCS_BIN = Redmine::Configuration['scm_darcs_command'] || "darcs"
                     class << self
                       def client_version
                         @@client_version ||= (darcs_binary_version || [])
                       end
                       def darcs_binary_version
                         darcsversion = darcs_binary_version_from_command_line
                         if m = darcsversion.match(%r{\A(.*?)((\d+\.)+\d+)})
                           m[2].scan(%r{\d+}).collect(&:to_i)
                         end
                       end
                       def darcs_binary_version_from_command_line
                         shellout("#{DARCS_BIN} --version") { |io| io.read }.to_s
                       end
                     end
                     def initialize(url, root_url=nil, login=nil, password=nil)
                       @url = url
                       @root_url = url
                     end
                     def supports_cat?
                       # cat supported in darcs 2.0.0 and higher
                       self.class.client_version_above?([2, 0, 0])
                     end
                     # Get info about the darcs repository
                     def info
                       rev = revisions(nil,nil,nil,{:limit => 1})
                       rev ? Info.new({:root_url => @url, :lastrev => rev.last}) : nil
                     end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     def entries(path=nil, identifier=nil)
                       path_prefix = (path.blank? ? '' : "#{path}/")
                       if path.blank?
                         path = ( self.class.client_version_above?([2, 2, 0]) ? @url : '.' )
                       end
                       entries = Entries.new
                       cmd = "#{DARCS_BIN} annotate --repodir #{shell_quote @url} --xml-output"
                       cmd << " --match #{shell_quote("hash #{identifier}")}" if identifier
                       cmd << " #{shell_quote path}"
                       shellout(cmd) do |io|
                         begin
                           doc = REXML::Document.new(io)
                           if doc.root.name == 'directory'
                             doc.elements.each('directory/*') do |element|
                               next unless ['file', 'directory'].include? element.name
                               entries << entry_from_xml(element, path_prefix)
                             end
                           elsif doc.root.name == 'file'
                             entries << entry_from_xml(doc.root, path_prefix)
                           end
                         rescue
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       entries.compact.sort_by_name
                     end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       path = '.' if path.blank?
                       revisions = Revisions.new
                       cmd = "#{DARCS_BIN} changes --repodir #{shell_quote @url} --xml-output"
                       cmd << " --from-match #{shell_quote("hash #{identifier_from}")}" if identifier_from
                       cmd << " --last #{options[:limit].to_i}" if options[:limit]
                       shellout(cmd) do |io|
                         begin
                           doc = REXML::Document.new(io)
                           doc.elements.each("changelog/patch") do |patch|
                             message = patch.elements['name'].text
                             message << "\n" + patch.elements['comment'].text.gsub(/\*\*\*END OF DESCRIPTION\*\*\*.*\z/m, '') if patch.elements['comment']
                             revisions << Revision.new({:identifier => nil,
                                           :author => patch.attributes['author'],
                                           :scmid => patch.attributes['hash'],
                                           :time => Time.parse(patch.attributes['local_date']),
                                           :message => message,
                                           :paths => (options[:with_path] ? get_paths_for_patch(patch.attributes['hash']) : nil)
                                         })
                           end
                         rescue
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       revisions
                     end
                     def diff(path, identifier_from, identifier_to=nil)
                       path = '*' if path.blank?
                       cmd = "#{DARCS_BIN} diff --repodir #{shell_quote @url}"
                       if identifier_to.nil?
                         cmd << " --match #{shell_quote("hash #{identifier_from}")}"
                       else
                         cmd << " --to-match #{shell_quote("hash #{identifier_from}")}"
                         cmd << " --from-match #{shell_quote("hash #{identifier_to}")}"
                       end
                       cmd << " -u #{shell_quote path}"
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       diff
                     end
                     def cat(path, identifier=nil)
                       cmd = "#{DARCS_BIN} show content --repodir #{shell_quote @url}"
                       cmd << " --match #{shell_quote("hash #{identifier}")}" if identifier
                       cmd << " #{shell_quote path}"
                       cat = nil
                       shellout(cmd) do |io|
                         io.binmode
                         cat = io.read
                       end
                       return nil if $? && $?.exitstatus != 0
                       cat
                     end
                     private
                     # Returns an Entry from the given XML element
                     # or nil if the entry was deleted
                     def entry_from_xml(element, path_prefix)
                       modified_element = element.elements['modified']
                       if modified_element.elements['modified_how'].text.match(/removed/)
                         return nil
                       end
                       Entry.new({:name => element.attributes['name'],
                                  :path => path_prefix + element.attributes['name'],
                                  :kind => element.name == 'file' ? 'file' : 'dir',
                                  :size => nil,
                                  :lastrev => Revision.new({
                                    :identifier => nil,
                                    :scmid => modified_element.elements['patch'].attributes['hash']
                                    })
                                  })
                     end
                     def get_paths_for_patch(hash)
                       paths = get_paths_for_patch_raw(hash)
                       if self.class.client_version_above?([2, 4])
                         orig_paths = paths
                         paths = []
                         add_paths = []
                         add_paths_name = []
                         mod_paths = []
                         other_paths = []
                         orig_paths.each do |path|
                           if path[:action] == 'A'
                             add_paths << path
                             add_paths_name << path[:path]
                           elsif path[:action] == 'M'
                             mod_paths << path
                           else
                             other_paths << path
                           end
                         end
                         add_paths_name.each do |add_path|
                           mod_paths.delete_if { |m| m[:path] == add_path }
                         end
                         paths.concat add_paths
                         paths.concat mod_paths
                         paths.concat other_paths
                       end
                       paths
                     end
                     # Retrieve changed paths for a single patch
                     def get_paths_for_patch_raw(hash)
                       cmd = "#{DARCS_BIN} annotate --repodir #{shell_quote @url} --summary --xml-output"
                       cmd << " --match #{shell_quote("hash #{hash}")} "
                       paths = []
                       shellout(cmd) do |io|
                         begin
                           # Darcs xml output has multiple root elements in this case (tested with darcs 1.0.7)
                           # A root element is added so that REXML doesn't raise an error
                           doc = REXML::Document.new("<fake_root>" + io.read + "</fake_root>")
                           doc.elements.each('fake_root/summary/*') do |modif|
                             paths << {:action => modif.name[0,1].upcase,
                                       :path => "/" + modif.text.chomp.gsub(/^\s*/, '')
                                      }
                           end
                         rescue
                         end
                       end
                       paths
                     rescue CommandFailed
                       paths
                     end
                   end
                 end
               end
             end

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

             # redMine - project management software
             # Copyright (C) 2006-2007  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 'redmine/scm/adapters/abstract_adapter'
             module Redmine
               module Scm
                 module Adapters
                   class GitAdapter < AbstractAdapter
                     # Git executable name
-                    GIT_BIN = Redmine::Configuration['scm_command_git'] || "git"
+                    GIT_BIN = Redmine::Configuration['scm_git_command'] || "git"
                     def info
                       begin
                         Info.new(:root_url => url, :lastrev => lastrev('',nil))
                       rescue
                         nil
                       end
                     end
                     def branches
                       return @branches if @branches
                       @branches = []
                       cmd = "#{GIT_BIN} --git-dir #{target('')} branch --no-color"
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           @branches << line.match('\s*\*?\s*(.*)$')[1]
                         end
                       end
                       @branches.sort!
                     end
                     def tags
                       return @tags if @tags
                       cmd = "#{GIT_BIN} --git-dir #{target('')} tag"
                       shellout(cmd) do |io|
                         @tags = io.readlines.sort!.map{|t| t.strip}
                       end
                     end
                     def default_branch
                       branches.include?('master') ? 'master' : branches.first
                     end
                     def entries(path=nil, identifier=nil)
                       path ||= ''
                       entries = Entries.new
                       cmd = "#{GIT_BIN} --git-dir #{target('')} ls-tree -l "
                       cmd << shell_quote("HEAD:" + path) if identifier.nil?
                       cmd << shell_quote(identifier + ":" + path) if identifier
                       shellout(cmd)  do |io|
                         io.each_line do |line|
                           e = line.chomp.to_s
                           if e =~ /^\d+\s+(\w+)\s+([0-9a-f]{40})\s+([0-9-]+)\t(.+)$/
                             type = $1
                             sha = $2
                             size = $3
                             name = $4
                             full_path = path.empty? ? name : "#{path}/#{name}"
                             entries << Entry.new({:name => name,
                              :path => full_path,
                              :kind => (type == "tree") ? 'dir' : 'file',
                              :size => (type == "tree") ? nil : size,
                              :lastrev => lastrev(full_path,identifier)
                             }) unless entries.detect{|entry| entry.name == name}
                           end
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       entries.sort_by_name
                     end
                     def lastrev(path,rev)
                       return nil if path.nil?
                       cmd = "#{GIT_BIN} --git-dir #{target('')} log --no-color --date=iso --pretty=fuller --no-merges -n 1 "
                       cmd << " #{shell_quote rev} " if rev
                       cmd <<  "-- #{shell_quote path} " unless path.empty?
                       lines = []
                       shellout(cmd) { |io| lines = io.readlines }
                       return nil if $? && $?.exitstatus != 0
                       begin
                           id = lines[0].split[1]
                           author = lines[1].match('Author:\s+(.*)$')[1]
                           time = Time.parse(lines[4].match('CommitDate:\s+(.*)$')[1]).localtime
                           Revision.new({
                             :identifier => id,
                             :scmid => id,
                             :author => author,
                             :time => time,
                             :message => nil,
                             :paths => nil
                           })
                       rescue NoMethodError => e
                           logger.error("The revision '#{path}' has a wrong format")
                           return nil
                       end
                     end
                     def revisions(path, identifier_from, identifier_to, options={})
                       revisions = Revisions.new
                       cmd = "#{GIT_BIN} --git-dir #{target('')} log --no-color --raw --date=iso --pretty=fuller "
                       cmd << " --reverse " if options[:reverse]
                       cmd << " --all " if options[:all]
                       cmd << " -n #{options[:limit].to_i} " if options[:limit]
                       cmd << "#{shell_quote(identifier_from + '..')}" if identifier_from
                       cmd << "#{shell_quote identifier_to}" if identifier_to
                       cmd << " --since=#{shell_quote(options[:since].strftime("%Y-%m-%d %H:%M:%S"))}" if options[:since]
                       cmd << " -- #{shell_quote path}" if path && !path.empty?
                       shellout(cmd) do |io|
                         files=[]
                         changeset = {}
                         parsing_descr = 0  #0: not parsing desc or files, 1: parsing desc, 2: parsing files
                         revno = 1
                         io.each_line do |line|
                           if line =~ /^commit ([0-9a-f]{40})$/
                             key = "commit"
                             value = $1
                             if (parsing_descr == 1 || parsing_descr == 2)
                               parsing_descr = 0
                               revision = Revision.new({
                                 :identifier => changeset[:commit],
                                 :scmid => changeset[:commit],
                                 :author => changeset[:author],
                                 :time => Time.parse(changeset[:date]),
                                 :message => changeset[:description],
                                 :paths => files
                               })
                               if block_given?
                                 yield revision
                               else
                                 revisions << revision
                               end
                               changeset = {}
                               files = []
                               revno = revno + 1
                             end
                             changeset[:commit] = $1
                           elsif (parsing_descr == 0) && line =~ /^(\w+):\s*(.*)$/
                             key = $1
                             value = $2
                             if key == "Author"
                               changeset[:author] = value
                             elsif key == "CommitDate"
                               changeset[:date] = value
                             end
                           elsif (parsing_descr == 0) && line.chomp.to_s == ""
                             parsing_descr = 1
                             changeset[:description] = ""
                           elsif (parsing_descr == 1 || parsing_descr == 2) \
                           && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\t(.+)$/
                             parsing_descr = 2
                             fileaction = $1
                             filepath = $2
                             files << {:action => fileaction, :path => filepath}
                           elsif (parsing_descr == 1 || parsing_descr == 2) \
                           && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\d+\s+(\S+)\t(.+)$/
                             parsing_descr = 2
                             fileaction = $1
                             filepath = $3
                             files << {:action => fileaction, :path => filepath}
                           elsif (parsing_descr == 1) && line.chomp.to_s == ""
                             parsing_descr = 2
                           elsif (parsing_descr == 1)
                             changeset[:description] << line[4..-1]
                           end
                         end
                         if changeset[:commit]
                           revision = Revision.new({
                             :identifier => changeset[:commit],
                             :scmid => changeset[:commit],
                             :author => changeset[:author],
                             :time => Time.parse(changeset[:date]),
                             :message => changeset[:description],
                             :paths => files
                           })
                           if block_given?
                             yield revision
                           else
                             revisions << revision
                           end
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       revisions
                     end
                     def diff(path, identifier_from, identifier_to=nil)
                       path ||= ''
                       if identifier_to
                         cmd = "#{GIT_BIN} --git-dir #{target('')} diff --no-color #{shell_quote identifier_to} #{shell_quote identifier_from}"
                       else
                         cmd = "#{GIT_BIN} --git-dir #{target('')} show --no-color #{shell_quote identifier_from}"
                       end
                       cmd << " -- #{shell_quote path}" unless path.empty?
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       diff
                     end
                     def annotate(path, identifier=nil)
                       identifier = 'HEAD' if identifier.blank?
                       cmd = "#{GIT_BIN} --git-dir #{target('')} blame -p #{shell_quote identifier} -- #{shell_quote path}"
                       blame = Annotate.new
                       content = nil
                       shellout(cmd) { |io| io.binmode; content = io.read }
                       return nil if $? && $?.exitstatus != 0
                       # git annotates binary files
                       return nil if content.is_binary_data?
                       identifier = ''
                       # git shows commit author on the first occurrence only
                       authors_by_commit = {}
                       content.split("\n").each do |line|
                         if line =~ /^([0-9a-f]{39,40})\s.*/
                           identifier = $1
                         elsif line =~ /^author (.+)/
                           authors_by_commit[identifier] = $1.strip
                         elsif line =~ /^\t(.*)/
                           blame.add_line($1, Revision.new(:identifier => identifier, :author => authors_by_commit[identifier]))
                           identifier = ''
                           author = ''
                         end
                       end
                       blame
                     end
                     def cat(path, identifier=nil)
                       if identifier.nil?
                         identifier = 'HEAD'
                       end
                       cmd = "#{GIT_BIN} --git-dir #{target('')} show --no-color #{shell_quote(identifier + ':' + path)}"
                       cat = nil
                       shellout(cmd) do |io|
                         io.binmode
                         cat = io.read
                       end
                       return nil if $? && $?.exitstatus != 0
                       cat
                     end
                     class Revision < Redmine::Scm::Adapters::Revision
                       # Returns the readable identifier
                       def format_identifier
                         identifier[0,8]
                       end
                     end
                   end
                 end
               end
             end

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

             # redMine - project management software
             # Copyright (C) 2006-2007  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 'redmine/scm/adapters/abstract_adapter'
             require 'cgi'
             module Redmine
               module Scm
                 module Adapters
                   class MercurialAdapter < AbstractAdapter
                     # Mercurial executable name
-                    HG_BIN = Redmine::Configuration['scm_command_mercurial'] || "hg"
+                    HG_BIN = Redmine::Configuration['scm_mercurial_command'] || "hg"
                     TEMPLATES_DIR = File.dirname(__FILE__) + "/mercurial"
                     TEMPLATE_NAME = "hg-template"
                     TEMPLATE_EXTENSION = "tmpl"
                     class << self
                       def client_version
                         @@client_version ||= (hgversion || [])
                       end
                       def hgversion
                         # The hg version is expressed either as a
                         # release number (eg 0.9.5 or 1.0) or as a revision
                         # id composed of 12 hexa characters.
                         theversion = hgversion_from_command_line
                         if m = theversion.match(%r{\A(.*?)((\d+\.)+\d+)})
                           m[2].scan(%r{\d+}).collect(&:to_i)
                         end
                       end
                       def hgversion_from_command_line
                         shellout("#{HG_BIN} --version") { |io| io.read }.to_s
                       end
                       def template_path
                         @@template_path ||= template_path_for(client_version)
                       end
                       def template_path_for(version)
                         if ((version <=> [0,9,5]) > 0) || version.empty?
                           ver = "1.0"
                         else
                           ver = "0.9.5"
                         end
                         "#{TEMPLATES_DIR}/#{TEMPLATE_NAME}-#{ver}.#{TEMPLATE_EXTENSION}"
                       end
                     end
                     def info
                       cmd = "#{HG_BIN} -R #{target('')} root"
                       root_url = nil
                       shellout(cmd) do |io|
                         root_url = io.read
                       end
                       return nil if $? && $?.exitstatus != 0
                       info = Info.new({:root_url => root_url.chomp,
                                         :lastrev => revisions(nil,nil,nil,{:limit => 1}).last
                                       })
                       info
                     rescue CommandFailed
                       return nil
                     end
                     def entries(path=nil, identifier=nil)
                       path ||= ''
                       entries = Entries.new
                       cmd = "#{HG_BIN} -R #{target('')} --cwd #{target('')} locate"
                       cmd << " -r #{hgrev(identifier)}"
                       cmd << " " + shell_quote("path:#{path}") unless path.empty?
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           # HG uses antislashs as separator on Windows
                           line = line.gsub(/\\/, "/")
                           if path.empty? or e = line.gsub!(%r{^#{with_trailling_slash(path)}},'')
                             e ||= line
                             e = e.chomp.split(%r{[\/\\]})
                             entries << Entry.new({:name => e.first,
                                                    :path => (path.nil? or path.empty? ? e.first : "#{with_trailling_slash(path)}#{e.first}"),
                                                    :kind => (e.size > 1 ? 'dir' : 'file'),
                                                    :lastrev => Revision.new
                                                  }) unless e.empty? || entries.detect{|entry| entry.name == e.first}
                           end
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       entries.sort_by_name
                     end
                     # Fetch the revisions by using a template file that
                     # makes Mercurial produce a xml output.
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       revisions = Revisions.new
                       cmd = "#{HG_BIN} --debug --encoding utf8 -R #{target('')} log -C --style #{shell_quote self.class.template_path}"
                       if identifier_from && identifier_to
                         cmd << " -r #{hgrev(identifier_from)}:#{hgrev(identifier_to)}"
                       elsif identifier_from
                         cmd << " -r #{hgrev(identifier_from)}:"
                       end
                       cmd << " --limit #{options[:limit].to_i}" if options[:limit]
                       cmd << " #{shell_quote path}" unless path.blank?
                       shellout(cmd) do |io|
                         begin
                           # HG doesn't close the XML Document...
                           doc = REXML::Document.new(io.read << "</log>")
                           doc.elements.each("log/logentry") do |logentry|
                             paths = []
                             copies = logentry.get_elements('paths/path-copied')
                             logentry.elements.each("paths/path") do |path|
                               # Detect if the added file is a copy
                               if path.attributes['action'] == 'A' and c = copies.find{ |e| e.text == path.text }
                                 from_path = c.attributes['copyfrom-path']
                                 from_rev = logentry.attributes['revision']
                               end
                               paths << {:action => path.attributes['action'],
                                 :path => "/#{CGI.unescape(path.text)}",
                                 :from_path => from_path ? "/#{CGI.unescape(from_path)}" : nil,
                                 :from_revision => from_rev ? from_rev : nil
                               }
                             end
                             paths.sort! { |x,y| x[:path] <=> y[:path] }
                             revisions << Revision.new({:identifier => logentry.attributes['revision'],
                                                         :scmid => logentry.attributes['node'],
                                                         :author => (logentry.elements['author'] ? logentry.elements['author'].text : ""),
                                                         :time => Time.parse(logentry.elements['date'].text).localtime,
                                                         :message => logentry.elements['msg'].text,
                                                         :paths => paths
                                                       })
                           end
                         rescue
                           logger.debug($!)
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       revisions
                     end
                     def diff(path, identifier_from, identifier_to=nil)
                       path ||= ''
                       diff_args = ''
                       diff = []
                       if identifier_to
                         diff_args = "-r #{hgrev(identifier_to)} -r #{hgrev(identifier_from)}"
                       else
                         if self.class.client_version_above?([1, 2])
                           diff_args = "-c #{hgrev(identifier_from)}"
                         else
                           return []
                         end
                       end
                       cmd = "#{HG_BIN} -R #{target('')} --config diff.git=false diff --nodates #{diff_args}"
                       cmd << " -I #{target(path)}" unless path.empty?
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       diff
                     end
                     def cat(path, identifier=nil)
                       cmd = "#{HG_BIN} -R #{target('')} cat"
                       cmd << " -r #{hgrev(identifier)}"
                       cmd << " #{target(path)}"
                       cat = nil
                       shellout(cmd) do |io|
                         io.binmode
                         cat = io.read
                       end
                       return nil if $? && $?.exitstatus != 0
                       cat
                     end
                     def annotate(path, identifier=nil)
                       path ||= ''
                       cmd = "#{HG_BIN} -R #{target('')}"
                       cmd << " annotate -ncu"
                       cmd << " -r #{hgrev(identifier)}"
                       cmd << " #{target(path)}"
                       blame = Annotate.new
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           next unless line =~ %r{^([^:]+)\s(\d+)\s([0-9a-f]+):\s(.*)$}
                           r = Revision.new(:author => $1.strip, :revision => $2, :scmid => $3,
                                            :identifier => $3)
                           blame.add_line($4.rstrip, r)
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       blame
                     end
                     class Revision < Redmine::Scm::Adapters::Revision
                       # Returns the readable identifier
                       def format_identifier
                         "#{revision}:#{scmid}"
                       end
                     end
                     # Returns correct revision identifier
                     def hgrev(identifier)
                       shell_quote(identifier.blank? ? 'tip' : identifier.to_s)
                     end
                     private :hgrev
                   end
                 end
               end
             end

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

             # Redmine - project management software
             # Copyright (C) 2006-2010  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 'redmine/scm/adapters/abstract_adapter'
             require 'uri'
             module Redmine
               module Scm
                 module Adapters
                   class SubversionAdapter < AbstractAdapter
                     # SVN executable name
-                    SVN_BIN = Redmine::Configuration['scm_command_subversion'] || "svn"
+                    SVN_BIN = Redmine::Configuration['scm_subversion_command'] || "svn"
                     class << self
                       def client_version
                         @@client_version ||= (svn_binary_version || [])
                       end
                       def svn_binary_version
                         cmd = "#{SVN_BIN} --version"
                         version = nil
                         shellout(cmd) do |io|
                           # Read svn version in first returned line
                           if m = io.read.to_s.match(%r{\A(.*?)((\d+\.)+\d+)})
                             version = m[2].scan(%r{\d+}).collect(&:to_i)
                           end
                         end
                         return nil if $? && $?.exitstatus != 0
                         version
                       end
                     end
                     # Get info about the svn repository
                     def info
                       cmd = "#{SVN_BIN} info --xml #{target}"
                       cmd << credentials_string
                       info = nil
                       shellout(cmd) do |io|
                         output = io.read
                         begin
                           doc = ActiveSupport::XmlMini.parse(output)
                           #root_url = doc.elements["info/entry/repository/root"].text
                           info = Info.new({:root_url => doc['info']['entry']['repository']['root']['__content__'],
                                            :lastrev => Revision.new({
                                              :identifier => doc['info']['entry']['commit']['revision'],
                                              :time => Time.parse(doc['info']['entry']['commit']['date']['__content__']).localtime,
                                              :author => (doc['info']['entry']['commit']['author'] ? doc['info']['entry']['commit']['author']['__content__'] : "")
                                            })
                                          })
                         rescue
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       info
                     rescue CommandFailed
                       return nil
                     end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     def entries(path=nil, identifier=nil)
                       path ||= ''
                       identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
                       entries = Entries.new
                       cmd = "#{SVN_BIN} list --xml #{target(path)}@#{identifier}"
                       cmd << credentials_string
                       shellout(cmd) do |io|
                         output = io.read
                         begin
                           doc = ActiveSupport::XmlMini.parse(output)
                           each_xml_element(doc['lists']['list'], 'entry') do |entry|
                             commit = entry['commit']
                             commit_date = commit['date']
                             # Skip directory if there is no commit date (usually that
                             # means that we don't have read access to it)
                             next if entry['kind'] == 'dir' && commit_date.nil?
                             name = entry['name']['__content__']
                             entries << Entry.new({:name => URI.unescape(name),
                                         :path => ((path.empty? ? "" : "#{path}/") + name),
                                         :kind => entry['kind'],
                                         :size => ((s = entry['size']) ? s['__content__'].to_i : nil),
                                         :lastrev => Revision.new({
                                           :identifier => commit['revision'],
                                           :time => Time.parse(commit_date['__content__'].to_s).localtime,
                                           :author => ((a = commit['author']) ? a['__content__'] : nil)
                                           })
                                         })
                           end
                         rescue Exception => e
                           logger.error("Error parsing svn output: #{e.message}")
                           logger.error("Output was:\n #{output}")
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
                       entries.sort_by_name
                     end
                     def properties(path, identifier=nil)
                       # proplist xml output supported in svn 1.5.0 and higher
                       return nil unless self.class.client_version_above?([1, 5, 0])
                       identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
                       cmd = "#{SVN_BIN} proplist --verbose --xml #{target(path)}@#{identifier}"
                       cmd << credentials_string
                       properties = {}
                       shellout(cmd) do |io|
                         output = io.read
                         begin
                           doc = ActiveSupport::XmlMini.parse(output)
                           each_xml_element(doc['properties']['target'], 'property') do |property|
                             properties[ property['name'] ] = property['__content__'].to_s
                           end
                         rescue
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       properties
                     end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       path ||= ''
                       identifier_from = (identifier_from && identifier_from.to_i > 0) ? identifier_from.to_i : "HEAD"
                       identifier_to = (identifier_to && identifier_to.to_i > 0) ? identifier_to.to_i : 1
                       revisions = Revisions.new
                       cmd = "#{SVN_BIN} log --xml -r #{identifier_from}:#{identifier_to}"
                       cmd << credentials_string
                       cmd << " --verbose " if  options[:with_paths]
                       cmd << " --limit #{options[:limit].to_i}" if options[:limit]
                       cmd << ' ' + target(path)
                       shellout(cmd) do |io|
                         output = io.read
                         begin
                           doc = ActiveSupport::XmlMini.parse(output)
                           each_xml_element(doc['log'], 'logentry') do |logentry|
                             paths = []
                             each_xml_element(logentry['paths'], 'path') do |path|
                               paths << {:action => path['action'],
                                         :path => path['__content__'],
                                         :from_path => path['copyfrom-path'],
                                         :from_revision => path['copyfrom-rev']
                                         }
                             end if logentry['paths'] && logentry['paths']['path']
                             paths.sort! { |x,y| x[:path] <=> y[:path] }
                             revisions << Revision.new({:identifier => logentry['revision'],
                                           :author => (logentry['author'] ? logentry['author']['__content__'] : ""),
                                           :time => Time.parse(logentry['date']['__content__'].to_s).localtime,
                                           :message => logentry['msg']['__content__'],
                                           :paths => paths
                                         })
                           end
                         rescue
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       revisions
                     end
                     def diff(path, identifier_from, identifier_to=nil, type="inline")
                       path ||= ''
                       identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : ''
                       identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : (identifier_from.to_i - 1)
                       cmd = "#{SVN_BIN} diff -r "
                       cmd << "#{identifier_to}:"
                       cmd << "#{identifier_from}"
                       cmd << " #{target(path)}@#{identifier_from}"
                       cmd << credentials_string
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       diff
                     end
                     def cat(path, identifier=nil)
                       identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
                       cmd = "#{SVN_BIN} cat #{target(path)}@#{identifier}"
                       cmd << credentials_string
                       cat = nil
                       shellout(cmd) do |io|
                         io.binmode
                         cat = io.read
                       end
                       return nil if $? && $?.exitstatus != 0
                       cat
                     end
                     def annotate(path, identifier=nil)
                       identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
                       cmd = "#{SVN_BIN} blame #{target(path)}@#{identifier}"
                       cmd << credentials_string
                       blame = Annotate.new
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           next unless line =~ %r{^\s*(\d+)\s*(\S+)\s(.*)$}
                           blame.add_line($3.rstrip, Revision.new(:identifier => $1.to_i, :author => $2.strip))
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       blame
                     end
                     private
                     def credentials_string
                       str = ''
                       str << " --username #{shell_quote(@login)}" unless @login.blank?
                       str << " --password #{shell_quote(@password)}" unless @login.blank? || @password.blank?
                       str << " --no-auth-cache --non-interactive"
                       str
                     end
                     # Helper that iterates over the child elements of a xml node
                     # MiniXml returns a hash when a single child is found or an array of hashes for multiple children
                     def each_xml_element(node, name)
                       if node && node[name]
                         if node[name].is_a?(Hash)
                           yield node[name]
                         else
                           node[name].each do |element|
                             yield element
                           end
                         end
                       end
                     end
                     def target(path = '')
                       base = path.match(/^\//) ? root_url : url
                       uri = "#{base}/#{path}"
                       uri = URI.escape(URI.escape(uri), '[]')
                       shell_quote(uri.gsub(/[?<>\*]/, ''))
                     end
                   end
                 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