kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scm: subversion: set svn:eol-style=native adapter source. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5731 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-05-10 17:52:56 +00:00
parent ed6618a4eb
commit d778281881
1 changed files with 291 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

582
lib/redmine/scm/adapters/subversion_adapter.rb
View File

@ -1,291 +1,291 @@
# Redmine - project management software # Redmine - project management software
# Copyright (C) 2006-2011 Jean-Philippe Lang # Copyright (C) 2006-2011 Jean-Philippe Lang
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2 # as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. # of the License, or (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
require 'redmine/scm/adapters/abstract_adapter' require 'redmine/scm/adapters/abstract_adapter'
require 'uri' require 'uri'
module Redmine module Redmine
module Scm module Scm
module Adapters module Adapters
class SubversionAdapter < AbstractAdapter class SubversionAdapter < AbstractAdapter
# SVN executable name # SVN executable name
SVN_BIN = Redmine::Configuration['scm_subversion_command'] || "svn" SVN_BIN = Redmine::Configuration['scm_subversion_command'] || "svn"
class << self class << self
def client_command def client_command
@@bin ||= SVN_BIN @@bin ||= SVN_BIN
end end
def sq_bin def sq_bin
@@sq_bin ||= shell_quote(SVN_BIN) @@sq_bin ||= shell_quote(SVN_BIN)
end end
def client_version def client_version
@@client_version ||= (svn_binary_version || []) @@client_version ||= (svn_binary_version || [])
end end
def client_available def client_available
# --xml options are introduced in 1.3. # --xml options are introduced in 1.3.
# http://subversion.apache.org/docs/release-notes/1.3.html # http://subversion.apache.org/docs/release-notes/1.3.html
client_version_above?([1, 3]) client_version_above?([1, 3])
end end
def svn_binary_version def svn_binary_version
scm_version = scm_version_from_command_line.dup scm_version = scm_version_from_command_line.dup
if scm_version.respond_to?(:force_encoding) if scm_version.respond_to?(:force_encoding)
scm_version.force_encoding('ASCII-8BIT') scm_version.force_encoding('ASCII-8BIT')
end end
if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)}) if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)})
m[2].scan(%r{\d+}).collect(&:to_i) m[2].scan(%r{\d+}).collect(&:to_i)
end end
end end
def scm_version_from_command_line def scm_version_from_command_line
shellout("#{sq_bin} --version") { |io| io.read }.to_s shellout("#{sq_bin} --version") { |io| io.read }.to_s
end end
end end
# Get info about the svn repository # Get info about the svn repository
def info def info
cmd = "#{self.class.sq_bin} info --xml #{target}" cmd = "#{self.class.sq_bin} info --xml #{target}"
cmd << credentials_string cmd << credentials_string
info = nil info = nil
shellout(cmd) do |io| shellout(cmd) do |io|
output = io.read output = io.read
if output.respond_to?(:force_encoding) if output.respond_to?(:force_encoding)
output.force_encoding('UTF-8') output.force_encoding('UTF-8')
end end
begin begin
doc = ActiveSupport::XmlMini.parse(output) doc = ActiveSupport::XmlMini.parse(output)
# root_url = doc.elements["info/entry/repository/root"].text # root_url = doc.elements["info/entry/repository/root"].text
info = Info.new({:root_url => doc['info']['entry']['repository']['root']['__content__'], info = Info.new({:root_url => doc['info']['entry']['repository']['root']['__content__'],
:lastrev => Revision.new({ :lastrev => Revision.new({
:identifier => doc['info']['entry']['commit']['revision'], :identifier => doc['info']['entry']['commit']['revision'],
:time => Time.parse(doc['info']['entry']['commit']['date']['__content__']).localtime, :time => Time.parse(doc['info']['entry']['commit']['date']['__content__']).localtime,
:author => (doc['info']['entry']['commit']['author'] ? doc['info']['entry']['commit']['author']['__content__'] : "") :author => (doc['info']['entry']['commit']['author'] ? doc['info']['entry']['commit']['author']['__content__'] : "")
}) })
}) })
rescue rescue
end end
end end
return nil if $? && $?.exitstatus != 0 return nil if $? && $?.exitstatus != 0
info info
rescue CommandFailed rescue CommandFailed
return nil return nil
end end
# Returns an Entries collection # Returns an Entries collection
# or nil if the given path doesn't exist in the repository # or nil if the given path doesn't exist in the repository
def entries(path=nil, identifier=nil, options={}) def entries(path=nil, identifier=nil, options={})
path ||= '' path ||= ''
identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD" identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
entries = Entries.new entries = Entries.new
cmd = "#{self.class.sq_bin} list --xml #{target(path)}@#{identifier}" cmd = "#{self.class.sq_bin} list --xml #{target(path)}@#{identifier}"
cmd << credentials_string cmd << credentials_string
shellout(cmd) do |io| shellout(cmd) do |io|
output = io.read output = io.read
if output.respond_to?(:force_encoding) if output.respond_to?(:force_encoding)
output.force_encoding('UTF-8') output.force_encoding('UTF-8')
end end
begin begin
doc = ActiveSupport::XmlMini.parse(output) doc = ActiveSupport::XmlMini.parse(output)
each_xml_element(doc['lists']['list'], 'entry') do |entry| each_xml_element(doc['lists']['list'], 'entry') do |entry|
commit = entry['commit'] commit = entry['commit']
commit_date = commit['date'] commit_date = commit['date']
# Skip directory if there is no commit date (usually that # Skip directory if there is no commit date (usually that
# means that we don't have read access to it) # means that we don't have read access to it)
next if entry['kind'] == 'dir' && commit_date.nil? next if entry['kind'] == 'dir' && commit_date.nil?
name = entry['name']['__content__'] name = entry['name']['__content__']
entries << Entry.new({:name => URI.unescape(name), entries << Entry.new({:name => URI.unescape(name),
:path => ((path.empty? ? "" : "#{path}/") + name), :path => ((path.empty? ? "" : "#{path}/") + name),
:kind => entry['kind'], :kind => entry['kind'],
:size => ((s = entry['size']) ? s['__content__'].to_i : nil), :size => ((s = entry['size']) ? s['__content__'].to_i : nil),
:lastrev => Revision.new({ :lastrev => Revision.new({
:identifier => commit['revision'], :identifier => commit['revision'],
:time => Time.parse(commit_date['__content__'].to_s).localtime, :time => Time.parse(commit_date['__content__'].to_s).localtime,
:author => ((a = commit['author']) ? a['__content__'] : nil) :author => ((a = commit['author']) ? a['__content__'] : nil)
}) })
}) })
end end
rescue Exception => e rescue Exception => e
logger.error("Error parsing svn output: #{e.message}") logger.error("Error parsing svn output: #{e.message}")
logger.error("Output was:\n #{output}") logger.error("Output was:\n #{output}")
end end
end end
return nil if $? && $?.exitstatus != 0 return nil if $? && $?.exitstatus != 0
logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug? logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
entries.sort_by_name entries.sort_by_name
end end
def properties(path, identifier=nil) def properties(path, identifier=nil)
# proplist xml output supported in svn 1.5.0 and higher # proplist xml output supported in svn 1.5.0 and higher
return nil unless self.class.client_version_above?([1, 5, 0]) return nil unless self.class.client_version_above?([1, 5, 0])
identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD" identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
cmd = "#{self.class.sq_bin} proplist --verbose --xml #{target(path)}@#{identifier}" cmd = "#{self.class.sq_bin} proplist --verbose --xml #{target(path)}@#{identifier}"
cmd << credentials_string cmd << credentials_string
properties = {} properties = {}
shellout(cmd) do |io| shellout(cmd) do |io|
output = io.read output = io.read
if output.respond_to?(:force_encoding) if output.respond_to?(:force_encoding)
output.force_encoding('UTF-8') output.force_encoding('UTF-8')
end end
begin begin
doc = ActiveSupport::XmlMini.parse(output) doc = ActiveSupport::XmlMini.parse(output)
each_xml_element(doc['properties']['target'], 'property') do |property| each_xml_element(doc['properties']['target'], 'property') do |property|
properties[ property['name'] ] = property['__content__'].to_s properties[ property['name'] ] = property['__content__'].to_s
end end
rescue rescue
end end
end end
return nil if $? && $?.exitstatus != 0 return nil if $? && $?.exitstatus != 0
properties properties
end end
def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={}) def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
path ||= '' path ||= ''
identifier_from = (identifier_from && identifier_from.to_i > 0) ? identifier_from.to_i : "HEAD" 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 identifier_to = (identifier_to && identifier_to.to_i > 0) ? identifier_to.to_i : 1
revisions = Revisions.new revisions = Revisions.new
cmd = "#{self.class.sq_bin} log --xml -r #{identifier_from}:#{identifier_to}" cmd = "#{self.class.sq_bin} log --xml -r #{identifier_from}:#{identifier_to}"
cmd << credentials_string cmd << credentials_string
cmd << " --verbose " if options[:with_paths] cmd << " --verbose " if options[:with_paths]
cmd << " --limit #{options[:limit].to_i}" if options[:limit] cmd << " --limit #{options[:limit].to_i}" if options[:limit]
cmd << ' ' + target(path) cmd << ' ' + target(path)
shellout(cmd) do |io| shellout(cmd) do |io|
output = io.read output = io.read
if output.respond_to?(:force_encoding) if output.respond_to?(:force_encoding)
output.force_encoding('UTF-8') output.force_encoding('UTF-8')
end end
begin begin
doc = ActiveSupport::XmlMini.parse(output) doc = ActiveSupport::XmlMini.parse(output)
each_xml_element(doc['log'], 'logentry') do |logentry| each_xml_element(doc['log'], 'logentry') do |logentry|
paths = [] paths = []
each_xml_element(logentry['paths'], 'path') do |path| each_xml_element(logentry['paths'], 'path') do |path|
paths << {:action => path['action'], paths << {:action => path['action'],
:path => path['__content__'], :path => path['__content__'],
:from_path => path['copyfrom-path'], :from_path => path['copyfrom-path'],
:from_revision => path['copyfrom-rev'] :from_revision => path['copyfrom-rev']
} }
end if logentry['paths'] && logentry['paths']['path'] end if logentry['paths'] && logentry['paths']['path']
paths.sort! { |x,y| x[:path] <=> y[:path] } paths.sort! { |x,y| x[:path] <=> y[:path] }
revisions << Revision.new({:identifier => logentry['revision'], revisions << Revision.new({:identifier => logentry['revision'],
:author => (logentry['author'] ? logentry['author']['__content__'] : ""), :author => (logentry['author'] ? logentry['author']['__content__'] : ""),
:time => Time.parse(logentry['date']['__content__'].to_s).localtime, :time => Time.parse(logentry['date']['__content__'].to_s).localtime,
:message => logentry['msg']['__content__'], :message => logentry['msg']['__content__'],
:paths => paths :paths => paths
}) })
end end
rescue rescue
end end
end end
return nil if $? && $?.exitstatus != 0 return nil if $? && $?.exitstatus != 0
revisions revisions
end end
def diff(path, identifier_from, identifier_to=nil, type="inline") def diff(path, identifier_from, identifier_to=nil, type="inline")
path ||= '' path ||= ''
identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : '' 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) identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : (identifier_from.to_i - 1)
cmd = "#{self.class.sq_bin} diff -r " cmd = "#{self.class.sq_bin} diff -r "
cmd << "#{identifier_to}:" cmd << "#{identifier_to}:"
cmd << "#{identifier_from}" cmd << "#{identifier_from}"
cmd << " #{target(path)}@#{identifier_from}" cmd << " #{target(path)}@#{identifier_from}"
cmd << credentials_string cmd << credentials_string
diff = [] diff = []
shellout(cmd) do |io| shellout(cmd) do |io|
io.each_line do |line| io.each_line do |line|
diff << line diff << line
end end
end end
return nil if $? && $?.exitstatus != 0 return nil if $? && $?.exitstatus != 0
diff diff
end end
def cat(path, identifier=nil) def cat(path, identifier=nil)
identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD" identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
cmd = "#{self.class.sq_bin} cat #{target(path)}@#{identifier}" cmd = "#{self.class.sq_bin} cat #{target(path)}@#{identifier}"
cmd << credentials_string cmd << credentials_string
cat = nil cat = nil
shellout(cmd) do |io| shellout(cmd) do |io|
io.binmode io.binmode
cat = io.read cat = io.read
end end
return nil if $? && $?.exitstatus != 0 return nil if $? && $?.exitstatus != 0
cat cat
end end
def annotate(path, identifier=nil) def annotate(path, identifier=nil)
identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD" identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
cmd = "#{self.class.sq_bin} blame #{target(path)}@#{identifier}" cmd = "#{self.class.sq_bin} blame #{target(path)}@#{identifier}"
cmd << credentials_string cmd << credentials_string
blame = Annotate.new blame = Annotate.new
shellout(cmd) do |io| shellout(cmd) do |io|
io.each_line do |line| io.each_line do |line|
next unless line =~ %r{^\s*(\d+)\s*(\S+)\s(.*)$} next unless line =~ %r{^\s*(\d+)\s*(\S+)\s(.*)$}
rev = $1 rev = $1
blame.add_line($3.rstrip, blame.add_line($3.rstrip,
Revision.new( Revision.new(
:identifier => rev, :identifier => rev,
:revision => rev, :revision => rev,
:author => $2.strip :author => $2.strip
)) ))
end end
end end
return nil if $? && $?.exitstatus != 0 return nil if $? && $?.exitstatus != 0
blame blame
end end
private private
def credentials_string def credentials_string
str = '' str = ''
str << " --username #{shell_quote(@login)}" unless @login.blank? str << " --username #{shell_quote(@login)}" unless @login.blank?
str << " --password #{shell_quote(@password)}" unless @login.blank? || @password.blank? str << " --password #{shell_quote(@password)}" unless @login.blank? || @password.blank?
str << " --no-auth-cache --non-interactive" str << " --no-auth-cache --non-interactive"
str str
end end
# Helper that iterates over the child elements of a xml node # Helper that iterates over the child elements of a xml node
# MiniXml returns a hash when a single child is found # MiniXml returns a hash when a single child is found
# or an array of hashes for multiple children # or an array of hashes for multiple children
def each_xml_element(node, name) def each_xml_element(node, name)
if node && node[name] if node && node[name]
if node[name].is_a?(Hash) if node[name].is_a?(Hash)
yield node[name] yield node[name]
else else
node[name].each do |element| node[name].each do |element|
yield element yield element
end end
end end
end end
end end
def target(path = '') def target(path = '')
base = path.match(/^\//) ? root_url : url base = path.match(/^\//) ? root_url : url
uri = "#{base}/#{path}" uri = "#{base}/#{path}"
uri = URI.escape(URI.escape(uri), '[]') uri = URI.escape(URI.escape(uri), '[]')
shell_quote(uri.gsub(/[?<>\*]/, '')) shell_quote(uri.gsub(/[?<>\*]/, ''))
end end
end end
end end
end end
end end