Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
b67d1d64
Commit
b67d1d64
authored
Jul 04, 2017
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate #submodule_url_for to Gitaly
parent
75ac425c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
52 additions
and
5 deletions
+52
-5
lib/gitlab/git/repository.rb
lib/gitlab/git/repository.rb
+20
-5
spec/lib/gitlab/git/repository_spec.rb
spec/lib/gitlab/git/repository_spec.rb
+32
-0
No files found.
lib/gitlab/git/repository.rb
View file @
b67d1d64
...
@@ -554,11 +554,14 @@ module Gitlab
...
@@ -554,11 +554,14 @@ module Gitlab
# # => git@localhost:rack.git
# # => git@localhost:rack.git
#
#
def
submodule_url_for
(
ref
,
path
)
def
submodule_url_for
(
ref
,
path
)
Gitlab
::
GitalyClient
.
migrate
(
:submodule_url_for
)
do
|
is_enabled
|
if
is_enabled
gitaly_submodule_url_for
(
ref
,
path
)
else
if
submodules
(
ref
).
any?
if
submodules
(
ref
).
any?
submodule
=
submodules
(
ref
)[
path
]
submodule
=
submodules
(
ref
)[
path
]
submodule
[
'url'
]
if
submodule
if
submodule
end
submodule
[
'url'
]
end
end
end
end
end
end
...
@@ -915,6 +918,18 @@ module Gitlab
...
@@ -915,6 +918,18 @@ module Gitlab
fill_submodule_ids
(
commit
,
parser
.
parse
)
fill_submodule_ids
(
commit
,
parser
.
parse
)
end
end
def
gitaly_submodule_url_for
(
ref
,
path
)
# We don't care about the contents so 1 byte is enough. Can't request 0 bytes, 0 means unlimited.
commit_object
=
gitaly_commit_client
.
tree_entry
(
ref
,
path
,
1
)
return
unless
commit_object
&&
commit_object
.
type
==
:COMMIT
gitmodules
=
gitaly_commit_client
.
tree_entry
(
ref
,
'.gitmodules'
,
Blob
::
MAX_DATA_DISPLAY_SIZE
)
found_module
=
GitmodulesParser
.
new
(
gitmodules
.
data
).
parse
[
path
]
found_module
&&
found_module
[
'url'
]
end
def
alternate_object_directories
def
alternate_object_directories
Gitlab
::
Git
::
Env
.
all
.
values_at
(
*
ALLOWED_OBJECT_DIRECTORIES_VARIABLES
).
compact
Gitlab
::
Git
::
Env
.
all
.
values_at
(
*
ALLOWED_OBJECT_DIRECTORIES_VARIABLES
).
compact
end
end
...
...
spec/lib/gitlab/git/repository_spec.rb
View file @
b67d1d64
...
@@ -358,6 +358,38 @@ describe Gitlab::Git::Repository, seed_helper: true do
...
@@ -358,6 +358,38 @@ describe Gitlab::Git::Repository, seed_helper: true do
end
end
end
end
describe
'#submodule_url_for'
do
let
(
:repository
)
{
Gitlab
::
Git
::
Repository
.
new
(
'default'
,
TEST_REPO_PATH
)
}
let
(
:ref
)
{
'master'
}
def
submodule_url
(
path
)
repository
.
submodule_url_for
(
ref
,
path
)
end
it
{
expect
(
submodule_url
(
'six'
)).
to
eq
(
'git://github.com/randx/six.git'
)
}
it
{
expect
(
submodule_url
(
'nested/six'
)).
to
eq
(
'git://github.com/randx/six.git'
)
}
it
{
expect
(
submodule_url
(
'deeper/nested/six'
)).
to
eq
(
'git://github.com/randx/six.git'
)
}
it
{
expect
(
submodule_url
(
'invalid/path'
)).
to
eq
(
nil
)
}
context
'uncommitted submodule dir'
do
let
(
:ref
)
{
'fix-existing-submodule-dir'
}
it
{
expect
(
submodule_url
(
'submodule-existing-dir'
)).
to
eq
(
nil
)
}
end
context
'tags'
do
let
(
:ref
)
{
'v1.2.1'
}
it
{
expect
(
submodule_url
(
'six'
)).
to
eq
(
'git://github.com/randx/six.git'
)
}
end
context
'no submodules at commit'
do
let
(
:ref
)
{
'6d39438'
}
it
{
expect
(
submodule_url
(
'six'
)).
to
eq
(
nil
)
}
end
end
context
'#submodules'
do
context
'#submodules'
do
let
(
:repository
)
{
Gitlab
::
Git
::
Repository
.
new
(
'default'
,
TEST_REPO_PATH
)
}
let
(
:repository
)
{
Gitlab
::
Git
::
Repository
.
new
(
'default'
,
TEST_REPO_PATH
)
}
...
...
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