allow empty repos on import/export
This commit is contained in:
parent
240a4aa62a
commit
60a2b3eff2
4 changed files with 5 additions and 10 deletions
|
@ -44,8 +44,7 @@ module Gitlab
|
|||
def wiki_restorer
|
||||
Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: wiki_repo_path,
|
||||
shared: @shared,
|
||||
project: ProjectWiki.new(project_tree.restored_project),
|
||||
wiki: true)
|
||||
project: ProjectWiki.new(project_tree.restored_project))
|
||||
end
|
||||
|
||||
def uploads_restorer
|
||||
|
|
|
@ -3,15 +3,14 @@ module Gitlab
|
|||
class RepoRestorer
|
||||
include Gitlab::ImportExport::CommandLineUtil
|
||||
|
||||
def initialize(project:, shared:, path_to_bundle:, wiki: false)
|
||||
def initialize(project:, shared:, path_to_bundle:)
|
||||
@project = project
|
||||
@path_to_bundle = path_to_bundle
|
||||
@shared = shared
|
||||
@wiki = wiki
|
||||
end
|
||||
|
||||
def restore
|
||||
return wiki? unless File.exist?(@path_to_bundle)
|
||||
return true unless File.exist?(@path_to_bundle)
|
||||
|
||||
FileUtils.mkdir_p(path_to_repo)
|
||||
|
||||
|
@ -30,10 +29,6 @@ module Gitlab
|
|||
def path_to_repo
|
||||
@project.repository.path_to_repo
|
||||
end
|
||||
|
||||
def wiki?
|
||||
@wiki
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -11,7 +11,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def save
|
||||
return false if @project.empty_repo?
|
||||
return true if @project.empty_repo? # it's ok to have no repo
|
||||
|
||||
@full_path = File.join(@shared.export_path, ImportExport.project_bundle_filename)
|
||||
bundle_to_disk
|
||||
|
|
|
@ -4,6 +4,7 @@ module Gitlab
|
|||
def save
|
||||
@wiki = ProjectWiki.new(@project)
|
||||
return true unless wiki_repository_exists? # it's okay to have no Wiki
|
||||
|
||||
bundle_to_disk(File.join(@shared.export_path, project_filename))
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue