BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
f386d7a7
Commit
f386d7a7
authored
May 16, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some changes based on MR feedback
parent
2dff04f2
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
12 deletions
+16
-12
command_line_util.rb
lib/gitlab/import_export/command_line_util.rb
+6
-2
import_export_reader.rb
lib/gitlab/import_export/import_export_reader.rb
+1
-0
repo_bundler.rb
lib/gitlab/import_export/repo_bundler.rb
+1
-1
wiki_repo_bundler.rb
lib/gitlab/import_export/wiki_repo_bundler.rb
+5
-6
import_export_reader_spec.rb
spec/lib/gitlab/import_export/import_export_reader_spec.rb
+3
-3
No files found.
lib/gitlab/import_export/command_line_util.rb
View file @
f386d7a7
...
...
@@ -9,11 +9,11 @@ module Gitlab
untar_with_options
(
archive:
archive
,
dir:
dir
,
options:
'zxf'
)
end
def
git_bundle
(
git_bin_path:
Gitlab
.
config
.
git
.
bin_path
,
repo_path
:,
bundle_path
:)
def
git_bundle
(
repo_path
:,
bundle_path
:)
execute
(
%W(
#{
git_bin_path
}
--git-dir=
#{
repo_path
}
bundle create
#{
bundle_path
}
--all)
)
end
def
git_unbundle
(
git_bin_path:
Gitlab
.
config
.
git
.
bin_path
,
repo_path
:,
bundle_path
:)
def
git_unbundle
(
repo_path
:,
bundle_path
:)
execute
(
%W(
#{
git_bin_path
}
clone --bare
#{
bundle_path
}
#{
repo_path
}
)
)
end
...
...
@@ -31,6 +31,10 @@ module Gitlab
_output
,
status
=
Gitlab
::
Popen
.
popen
(
cmd
)
status
.
zero?
end
def
git_bin_path
Gitlab
.
config
.
git
.
bin_path
end
end
end
end
lib/gitlab/import_export/import_export_reader.rb
View file @
f386d7a7
...
...
@@ -14,6 +14,7 @@ module Gitlab
@attributes_parser
.
find_included
(
:project
).
merge
(
include:
build_hash
(
@tree
))
rescue
=>
e
@shared
.
error
(
e
.
message
)
false
end
private
...
...
lib/gitlab/import_export/repo_bundler.rb
View file @
f386d7a7
...
...
@@ -5,7 +5,7 @@ module Gitlab
attr_reader
:full_path
def
initialize
(
project:
,
shared:
)
def
initialize
(
project
:
,
shared
:
)
@project
=
project
@shared
=
shared
end
...
...
lib/gitlab/import_export/wiki_repo_bundler.rb
View file @
f386d7a7
...
...
@@ -3,14 +3,13 @@ module Gitlab
class
WikiRepoBundler
<
RepoBundler
def
bundle
@wiki
=
ProjectWiki
.
new
(
@project
)
return
true
if
!
wiki?
# it's okay to have no Wiki
@full_path
=
File
.
join
(
@shared
.
export_path
,
project_filename
)
bundle_to_disk
return
true
unless
wiki_repository_exists?
# it's okay to have no Wiki
bundle_to_disk
(
File
.
join
(
@shared
.
export_path
,
project_filename
))
end
def
bundle_to_disk
def
bundle_to_disk
(
full_path
)
FileUtils
.
mkdir_p
(
@shared
.
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
=>
e
@shared
.
error
(
e
.
message
)
false
...
...
@@ -26,7 +25,7 @@ module Gitlab
@wiki
.
repository
.
path_to_repo
end
def
wiki?
def
wiki
_repository_exists
?
File
.
exists?
(
@wiki
.
repository
.
path_to_repo
)
&&
!
@wiki
.
repository
.
empty?
end
end
...
...
spec/lib/gitlab/import_export/import_export_reader_spec.rb
View file @
f386d7a7
require
'spec_helper'
describe
Gitlab
::
ImportExport
::
ImportExportReader
do
describe
Gitlab
::
ImportExport
::
ImportExportReader
,
lib:
true
do
let
(
:shared
)
{
Gitlab
::
ImportExport
::
Shared
.
new
(
relative_path
:''
)
}
let
(
:test_config
)
{
'spec/support/import_export/import_export.yml'
}
let
(
:project_tree_hash
)
do
...
...
@@ -16,7 +16,7 @@ describe Gitlab::ImportExport::ImportExportReader do
}
end
it
'
should generate
hash from project tree config'
do
expect
(
described_class
.
new
(
config:
test_config
,
shared:
shared
).
project_tree
)
=~
(
project_tree_hash
)
it
'
generates
hash from project tree config'
do
expect
(
described_class
.
new
(
config:
test_config
,
shared:
shared
).
project_tree
)
.
to
match
(
project_tree_hash
)
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment