]> source.dussan.org Git - redmine.git/commitdiff
scm: subversion: change newlines LF to CRLF at lib/redmine/scm/adapters/subversion_ad...
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Tue, 15 Feb 2011 05:33:25 +0000 (05:33 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Tue, 15 Feb 2011 05:33:25 +0000 (05:33 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4827 e93f8b46-1217-0410-a6f0-8f06a7374b81

lib/redmine/scm/adapters/subversion_adapter.rb

index 802dc4a167ccd7355f15adc380d2f25b85c4a4a2..37d5bcf4dd2762bb0123dfc2ffd96ab32f457e50 100644 (file)
@@ -38,21 +38,21 @@ module Redmine
           def client_version\r
             @@client_version ||= (svn_binary_version || [])\r
           end\r
-
-          def client_available
-            !client_version.empty?
-          end
+\r
+          def client_available\r
+            !client_version.empty?\r
+          end\r
 \r
           def svn_binary_version\r
-            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\r
+            if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)})\r
+              m[2].scan(%r{\d+}).collect(&:to_i)\r
+            end\r
+          end\r
+\r
+          def scm_version_from_command_line\r
+            shellout("#{sq_bin} --version") { |io| io.read }.to_s\r
           end\r
-
-          def scm_version_from_command_line
-            shellout("#{sq_bin} --version") { |io| io.read }.to_s
-          end
         end\r
 \r
         # Get info about the svn repository\r
@@ -185,6 +185,7 @@ module Redmine
         def diff(path, identifier_from, identifier_to=nil, type="inline")\r
           path ||= ''\r
           identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : ''\r
+\r
           identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : (identifier_from.to_i - 1)\r
 \r
           cmd = "#{self.class.sq_bin} diff -r "\r