diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2018-01-18 17:33:35 +0000 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2018-01-24 12:10:31 +0100 |
| commit | 24625323a826d70991fdf27fbbe1f39bee845c03 (patch) | |
| tree | 8c7b3e7c949638ae1be4d655345f798e2d9bea9e /lib/gitlab/import_export | |
| parent | e2a56af930f9f7d17a6a9b638f52007a60e4cc60 (diff) | |
| download | gitlab-ce-24625323a826d70991fdf27fbbe1f39bee845c03.tar.gz | |
Migrate repository bundling to Gitalyfeature/migrate-bundle-to-disk-to-gitaly
Closes gitaly#929
Diffstat (limited to 'lib/gitlab/import_export')
| -rw-r--r-- | lib/gitlab/import_export/command_line_util.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/import_export/repo_saver.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/import_export/wiki_repo_saver.rb | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/lib/gitlab/import_export/command_line_util.rb b/lib/gitlab/import_export/command_line_util.rb index dd5d35feab9..25399f307f2 100644 --- a/lib/gitlab/import_export/command_line_util.rb +++ b/lib/gitlab/import_export/command_line_util.rb @@ -11,10 +11,6 @@ module Gitlab untar_with_options(archive: archive, dir: dir, options: 'zxf') end - def git_bundle(repo_path:, bundle_path:) - execute(%W(#{git_bin_path} --git-dir=#{repo_path} bundle create #{bundle_path} --all)) - end - def git_clone_bundle(repo_path:, bundle_path:) execute(%W(#{git_bin_path} clone --bare -- #{bundle_path} #{repo_path})) Gitlab::Git::Repository.create_hooks(repo_path, File.expand_path(Gitlab.config.gitlab_shell.hooks_path)) diff --git a/lib/gitlab/import_export/repo_saver.rb b/lib/gitlab/import_export/repo_saver.rb index a7028a32570..695462c7dd2 100644 --- a/lib/gitlab/import_export/repo_saver.rb +++ b/lib/gitlab/import_export/repo_saver.rb @@ -21,7 +21,7 @@ module Gitlab def bundle_to_disk mkdir_p(@shared.export_path) - git_bundle(repo_path: path_to_repo, bundle_path: @full_path) + @project.repository.bundle_to_disk(@full_path) rescue => e @shared.error(e) false diff --git a/lib/gitlab/import_export/wiki_repo_saver.rb b/lib/gitlab/import_export/wiki_repo_saver.rb index 1e6722a7bba..5fa2e101e29 100644 --- a/lib/gitlab/import_export/wiki_repo_saver.rb +++ b/lib/gitlab/import_export/wiki_repo_saver.rb @@ -10,7 +10,7 @@ module Gitlab def bundle_to_disk(full_path) mkdir_p(@shared.export_path) - git_bundle(repo_path: path_to_repo, bundle_path: full_path) + @wiki.repository.bundle_to_disk(full_path) rescue => e @shared.error(e) false |