Skip to content

O
OHR Support
Commit 8b3a8d73 authored by Toshi MARUYAMA's avatar Toshi MARUYAMA Committed by Eric Davis
Browse files
Options

scm: subversion: change newlines LF to CRLF at lib/redmine/scm/adapters/subversion_adapter.rb. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4827 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 2e85bd62
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 12 deletions
lib/redmine/scm/adapters/subversion_adapter.rb
View file @ 8b3a8d73
......@@ -38,21 +38,21 @@ module Redmine
def client_version
@@client_version ||= (svn_binary_version || [])
end
def client_available
!client_version.empty?
end
def client_available
!client_version.empty?
end
def svn_binary_version
scm_version = scm_version_from_command_line
if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)})
m[2].scan(%r{\d+}).collect(&:to_i)
end
scm_version = scm_version_from_command_line
if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)})
m[2].scan(%r{\d+}).collect(&:to_i)
end
end
def scm_version_from_command_line
shellout("#{sq_bin} --version") { |io| io.read }.to_s
end
def scm_version_from_command_line
shellout("#{sq_bin} --version") { |io| io.read }.to_s
end
end
# Get info about the svn repository
......@@ -185,6 +185,7 @@ module Redmine
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 = "#{self.class.sq_bin} diff -r "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment