jro_apps/redmine Commit - r1904:fdbe52a2f77a

* use svnsync instead of checkout for subversion cache...

Nicolas Chuche -

r1904:fdbe52a2f77a

parent child

Context file:

r1904:fdbe52a2f77a

Collapse all files

app/models/repository.rb +5 -2

               private
               def repositories_cache_directory
-                dir = Setting.repositories_cache_directory.gsub(/^([^#{File::SEPARATOR}].*)/, RAILS_ROOT + '/\1')
+                unless @cache_directory
-                return dir if File.directory?(dir)
+                  @cache_directory = Setting.repositories_cache_directory.gsub(/^([^#{File::SEPARATOR}].*)/, RAILS_ROOT + '/\1/')
+                  Dir.mkdir(@cache_directory, File.umask(0077)) unless File.directory?(@cache_directory)
+                end
+                @cache_directory
               end
               def before_save

lib/redmine/scm/adapters/subversion_adapter.rb +22 -3

                     # SVN executable name
                     SVN_BIN = "svn"
+                    def initialize(url, root_url=nil, login=nil, password=nil, cache_path=nil)
+                      super(url, root_url, login, password, cache_path)
+                      @url = 'file://' + @url unless cache_path.blank?
+                    end
                     class << self
                       def client_version
                         @@client_version ||= (svn_binary_version || [])
                     def create_cache
                       return if @orig_url.blank?
-                      cmd = "#{SVN_BIN} checkout --non-interactive #{@orig_url} #{@root_url}"
+                      cmd = "svnadmin create #{@root_url}"
+                      shellout(cmd) { |io| io.read }
+                      File.open("#{@root_url}/hooks/pre-revprop-change", "w") do |io|
+                        io.puts <<'EOF'
+            #!/bin/sh
+            USER="$3"
+            if [ "$USER" = "svnsync" ]; then exit 0; fi
+            echo "Only the svnsync user can change revprops" >&2
+            exit 1
+            EOF
+            end
+                      File.chmod 0500, "#{root_url}/hooks/pre-revprop-change"
+                      cmd = "svnsync init --username svnsync #{@url} #{@orig_url}"
                       shellout(cmd) { |io| io.read }
+                      synchronize
                     end
                     def synchronize
                       return if @orig_url.blank?
-                      cmd = "#{SVN_BIN} update --non-interactive"
+                      cmd = "svnsync sync #{@url}"
-                      Dir.chdir(@root_url) { shellout(cmd) { |io| io.read } }
+                      shellout(cmd) { |io| io.read }
                     end
                     private

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