Patches to aid initial migration, suggested by Greg Thornton

Author: kubitron

Diff for: app/models/git_hosting_settings_observer.rb

@@ -1,7 +1,7 @@
 class GitHostingSettingsObserver < ActiveRecord::Observer
     observe :setting
 
-    @@old_valuehash = (Setting.plugin_redmine_git_hosting).clone
+    @@old_valuehash = ((Setting.plugin_redmine_git_hosting).clone rescue {})
 
     def reload_this_observer
 	observed_classes.each do |klass|
@@ -31,14 +31,14 @@ def before_save(object)
 
 		# Script directory either absolute or relative to redmine root
 		stripped = valuehash['gitScriptDir'].lstrip.rstrip
-		normalizedFile = File.expand_path(stripped,"/")	 # Get rid of extra path components
+		normalizedFile = File.expand_path(stripped,"/")  # Get rid of extra path components
 		if (normalizedFile == "/")
 		    # Assume that we are relative bin directory ("/" and "" => "")
 		    valuehash['gitScriptDir'] = ""
 		elsif (stripped[0,1] != "/")
-		    valuehash['gitScriptDir'] = normalizedFile[1..-1] + "/"	 # Clobber leading '/' add trailing '/'
+		    valuehash['gitScriptDir'] = normalizedFile[1..-1] + "/"      # Clobber leading '/' add trailing '/'
 		else
-		    valuehash['gitScriptDir'] = normalizedFile + "/"	 # Add trailing '/'
+		    valuehash['gitScriptDir'] = normalizedFile + "/"     # Add trailing '/'
 		end
 	    elsif valuehash['gitUser'] != @@old_valuehash['gitUser'] ||
 		    valuehash['gitoliteIdentityFile'] != @@old_valuehash['gitoliteIdentityFile'] ||
@@ -53,12 +53,12 @@ def before_save(object)
 		%x[ rm -rf '#{ GitHosting.get_tmp_dir }' ]
 
 		stripped = valuehash['gitTempDataDir'].lstrip.rstrip
-		normalizedFile = File.expand_path(stripped,"/")	 # Get rid of extra path components
+		normalizedFile = File.expand_path(stripped,"/")  # Get rid of extra path components
 		if (normalizedFile == "/" || stripped[0,1] != "/")
 		    # Don't allow either root-level (absolute) or relative
 		    valuehash['gitTempDataDir'] = "/tmp/redmine_git_hosting/"
 		else
-		    valuehash['gitTempDataDir'] = normalizedFile + "/"	   # Add trailing '/'
+		    valuehash['gitTempDataDir'] = normalizedFile + "/"     # Add trailing '/'
 		end
 	    end
 
@@ -86,7 +86,7 @@ def before_save(object)
 	    if valuehash['httpServerSubdir']
 		normalizedFile	= File.expand_path(valuehash['httpServerSubdir'].lstrip.rstrip,"/")
 		if (normalizedFile != "/")
-		    valuehash['httpServerSubdir'] = normalizedFile[1..-1] + "/"	 # Clobber leading '/' add trailing '/'
+		    valuehash['httpServerSubdir'] = normalizedFile[1..-1] + "/"  # Clobber leading '/' add trailing '/'
 		else
 		    valuehash['httpServerSubdir'] = ''
 		end
@@ -122,7 +122,7 @@ def before_save(object)
 	    if valuehash['gitRedmineSubdir']
 		normalizedFile	= File.expand_path(valuehash['gitRedmineSubdir'].lstrip.rstrip,"/")
 		if (normalizedFile != "/")
-		    valuehash['gitRedmineSubdir'] = normalizedFile[1..-1] + "/"	 # Clobber leading '/' add trailing '/'
+		    valuehash['gitRedmineSubdir'] = normalizedFile[1..-1] + "/"  # Clobber leading '/' add trailing '/'
 		else
 		    valuehash['gitRedmineSubdir'] = ''
 		end
@@ -144,7 +144,7 @@ def before_save(object)
 			h[x]+=1 unless x.blank?
 			h
 		    end.values.max) || 0) > 1
-		    # Oops -- have duplication.	 Force to false.
+		    # Oops -- have duplication.  Force to false.
 		    GitHosting.logger.error "Detected non-unique repository identifiers.  Setting gitRepositoryIdentUnique => 'false'."
 		    valuehash['gitRepositoryIdentUnique'] = "false"
 		end

Diff for: config/routes.rb

@@ -1,8 +1,8 @@
 def install_redmine_git_hosting_routes(map)
-    # URL for items of type httpServer/XXX.git.	 Some versions of rails has problems with multiple regex expressions, so avoid...
+    # URL for items of type httpServer/XXX.git.  Some versions of rails has problems with multiple regex expressions, so avoid...
     # Note that 'http_server_subdir' is either empty (default case) or ends in '/'.
     map.connect ":repo_path/*path",
-    :prefix => Setting.plugin_redmine_git_hosting['httpServerSubdir'], :repo_path => /([^\/]+\/)*?[^\/]+\.git/, :controller => 'git_http'
+	:prefix => (Setting.plugin_redmine_git_hosting['httpServerSubdir'] rescue ""), :repo_path => /([^\/]+\/)*?[^\/]+\.git/, :controller => 'git_http'
 
     # Handle the public keys plugin to my/account.
     map.resources :public_keys, :controller => 'gitolite_public_keys', :path_prefix => 'my'

Diff for: init.rb

@@ -89,8 +89,10 @@ class GitRepoUrlHook < Redmine::Hook::ViewListener
 Redmine::Scm::Base.all.unshift("Git").uniq!
 
 # initialize observer
+# Don't initialize this while doing migration of primary system (i.e. Redmine/Chiliproject)
+migrating_primary = (File.basename($0) == "rake" && ARGV.include?("db:migrate"))
 config.after_initialize do
-    if config.action_controller.perform_caching
+    if config.action_controller.perform_caching && !migrating_primary
 	ActiveRecord::Base.observers = ActiveRecord::Base.observers << GitHostingObserver
 	ActiveRecord::Base.observers = ActiveRecord::Base.observers << GitHostingSettingsObserver
 
@@ -102,4 +104,3 @@ class GitRepoUrlHook < Redmine::Hook::ViewListener
 	end
     end
 end
-