Fixed other cases that looked at repo identifiers in single-repo mode

Author: kubitron

Diff for: lib/git_adapter_hooks.rb

@@ -202,7 +202,7 @@ def self.setup_hooks_for_repository(repo,value_hash=nil)
 	    # if no value_hash given, go fetch
 	    value_hash = get_local_config_params(repo) if value_hash.nil?
 	    hook_key = repo.extra.key
-	    if value_hash["hooks.redmine_gitolite.key"] != hook_key || value_hash["hooks.redmine_gitolite.projectid"] != repo.project.identifier || value_hash["hooks.redmine_gitolite.repositoryid"] != (repo.identifier || "")
+	    if value_hash["hooks.redmine_gitolite.key"] != hook_key || value_hash["hooks.redmine_gitolite.projectid"] != repo.project.identifier || GitHosting.multi_repos? && (value_hash["hooks.redmine_gitolite.repositoryid"] != (repo.identifier || ""))
 		if value_hash["hooks.redmine_gitolite.key"]
 		    logger.info "Repairing hooks for repository '#{GitHosting.repository_name(repo)}' (in gitolite repository at '#{GitHosting.repository_path(repo)}')"
 		else
@@ -213,7 +213,9 @@ def self.setup_hooks_for_repository(repo,value_hash=nil)
 		    repo_path = GitHosting.repository_path(repo)
 		    GitHosting.shell %[#{GitHosting.git_exec} --git-dir='#{repo_path}' config hooks.redmine_gitolite.key "#{hook_key}"]
 		    GitHosting.shell %[#{GitHosting.git_exec} --git-dir='#{repo_path}' config hooks.redmine_gitolite.projectid "#{repo.project.identifier}"]
-		    GitHosting.shell %[#{GitHosting.git_exec} --git-dir='#{repo_path}' config hooks.redmine_gitolite.repositoryid "#{repo.identifier||''}"]
+		    if GitHosting.multi_repos?
+			GitHosting.shell %[#{GitHosting.git_exec} --git-dir='#{repo_path}' config hooks.redmine_gitolite.repositoryid "#{repo.identifier||''}"]
+		    end
 		rescue
 		    logger.error "setup_hooks_for_repository(#{repo.git_label}) failed!"
 		end

Diff for: lib/git_hosting.rb

@@ -1102,7 +1102,7 @@ def self.closest_path(path_list,repo_name,repo)
 	    #
 	    # Make sure that there isn't another repo who owns this path (only possible if we have non-unique
 	    # repository identifiers--verify case #3, i.e. that we are not about to create non-unique identifier)
-	    if repo.identifier.blank? || Repository.repo_ident_unique? || path_list.first && (path_list.first.match(/^(.*\/)?#{repo.git_label}$/))
+	    if !GitHosting.multi_repos? || repo.identifier.blank? || Repository.repo_ident_unique? || path_list.first && (path_list.first.match(/^(.*\/)?#{repo.git_label}$/))
 		return path_list.first
 	    else
 		return nil
@@ -1132,7 +1132,7 @@ def self.closest_path(path_list,repo_name,repo)
 	path_list.each {|test_path| return test_path if test_path==repo_name}
 
 	# Special handling if repository name could change with Repository.repo_ident_unique?
-	if !repo.identifier.blank? && GitHosting.multi_repos?
+	if GitHosting.multi_repos? && !repo.identifier.blank?
 	    # See if we find match by merely changing value of Repository.repo_ident_unique?
 	    repo_name_alt = repository_name(repo,:assume_unique => !Repository.repo_ident_unique?)
 	    path_list.each {|test_path| return test_path if test_path==repo_name_alt}