Commit 6612ca09 authored by James Lopez's avatar James Lopez

update repo and wiki repo bundler to use git bundle instead of compressing via tar

parent 773c39cc
...@@ -4,8 +4,10 @@ module Projects ...@@ -4,8 +4,10 @@ module Projects
def execute(options = {}) def execute(options = {})
@shared = Gitlab::ImportExport::Shared.new(relative_path: File.join(project.path_with_namespace, 'work')) @shared = Gitlab::ImportExport::Shared.new(relative_path: File.join(project.path_with_namespace, 'work'))
# TODO handle errors
save_project_tree save_project_tree
bundle_repo bundle_repo
bundle_wiki_repo
save_all save_all
end end
...@@ -19,6 +21,10 @@ module Projects ...@@ -19,6 +21,10 @@ module Projects
Gitlab::ImportExport::RepoBundler.new(project: project, shared: @shared).bundle Gitlab::ImportExport::RepoBundler.new(project: project, shared: @shared).bundle
end end
def bundle_wiki_repo
Gitlab::ImportExport::WikiRepoBundler.new(project: project, shared: @shared).bundle
end
def save_all def save_all
Gitlab::ImportExport::Saver.save(storage_path: @shared.export_path) Gitlab::ImportExport::Saver.save(storage_path: @shared.export_path)
end end
......
...@@ -20,9 +20,8 @@ module Gitlab ...@@ -20,9 +20,8 @@ module Gitlab
def bundle_to_disk def bundle_to_disk
FileUtils.mkdir_p(@export_path) FileUtils.mkdir_p(@export_path)
tar_cf(archive: full_path, dir: path_to_repo) git_bundle(repo_path: path_to_repo, bundle_path: @full_path)
rescue rescue
#TODO: handle error
false false
end end
......
...@@ -3,7 +3,7 @@ module Gitlab ...@@ -3,7 +3,7 @@ module Gitlab
class WikiRepoBundler < RepoBundler class WikiRepoBundler < RepoBundler
def bundle def bundle
@wiki = ProjectWiki.new(@project) @wiki = ProjectWiki.new(@project)
return false if !wiki? return true if !wiki? # it's okay to have no Wiki
@full_path = File.join(@export_path, project_filename) @full_path = File.join(@export_path, project_filename)
bundle_to_disk bundle_to_disk
end end
...@@ -12,7 +12,6 @@ module Gitlab ...@@ -12,7 +12,6 @@ module Gitlab
FileUtils.mkdir_p(@export_path) FileUtils.mkdir_p(@export_path)
git_bundle(repo_path: path_to_repo, bundle_path: @full_path) git_bundle(repo_path: path_to_repo, bundle_path: @full_path)
rescue rescue
#TODO: handle error
false false
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment