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
3213f28c
Commit
3213f28c
authored
Mar 17, 2017
by
Alejandro Rodríguez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Incorporate Gitaly's local_branches operation into repo code
parent
befa0b98
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
191 additions
and
23 deletions
+191
-23
app/models/repository.rb
app/models/repository.rb
+1
-15
changelogs/unreleased/gitaly-local-branches.yml
changelogs/unreleased/gitaly-local-branches.yml
+4
-0
lib/gitlab/git/branch.rb
lib/gitlab/git/branch.rb
+34
-0
lib/gitlab/git/commit.rb
lib/gitlab/git/commit.rb
+1
-0
lib/gitlab/git/repository.rb
lib/gitlab/git/repository.rb
+31
-6
lib/gitlab/gitaly_client/ref.rb
lib/gitlab/gitaly_client/ref.rb
+16
-0
spec/lib/gitlab/git/branch_spec.rb
spec/lib/gitlab/git/branch_spec.rb
+45
-0
spec/lib/gitlab/git/repository_spec.rb
spec/lib/gitlab/git/repository_spec.rb
+26
-2
spec/lib/gitlab/gitaly_client/ref_spec.rb
spec/lib/gitlab/gitaly_client/ref_spec.rb
+23
-0
spec/support/matchers/gitaly_matchers.rb
spec/support/matchers/gitaly_matchers.rb
+6
-0
spec/tasks/gitlab/backup_rake_spec.rb
spec/tasks/gitlab/backup_rake_spec.rb
+4
-0
No files found.
app/models/repository.rb
View file @
3213f28c
...
@@ -649,22 +649,8 @@ class Repository
...
@@ -649,22 +649,8 @@ class Repository
"
#{
name
}
-
#{
highest_branch_id
+
1
}
"
"
#{
name
}
-
#{
highest_branch_id
+
1
}
"
end
end
# Remove archives older than 2 hours
def
branches_sorted_by
(
value
)
def
branches_sorted_by
(
value
)
case
value
raw_repository
.
local_branches
(
sort_by:
value
)
when
'name'
branches
.
sort_by
(
&
:name
)
when
'updated_desc'
branches
.
sort
do
|
a
,
b
|
commit
(
b
.
dereferenced_target
).
committed_date
<=>
commit
(
a
.
dereferenced_target
).
committed_date
end
when
'updated_asc'
branches
.
sort
do
|
a
,
b
|
commit
(
a
.
dereferenced_target
).
committed_date
<=>
commit
(
b
.
dereferenced_target
).
committed_date
end
else
branches
end
end
end
def
tags_sorted_by
(
value
)
def
tags_sorted_by
(
value
)
...
...
changelogs/unreleased/gitaly-local-branches.yml
0 → 100644
View file @
3213f28c
---
title
:
Add suport for find_local_branches GRPC from Gitaly
merge_request
:
10059
author
:
lib/gitlab/git/branch.rb
View file @
3213f28c
module
Gitlab
module
Gitlab
module
Git
module
Git
class
Branch
<
Ref
class
Branch
<
Ref
def
initialize
(
repository
,
name
,
target
)
if
target
.
is_a?
(
Gitaly
::
FindLocalBranchResponse
)
target
=
target_from_gitaly_local_branches_response
(
target
)
end
super
(
repository
,
name
,
target
)
end
def
target_from_gitaly_local_branches_response
(
response
)
# Git messages have no encoding enforcements. However, in the UI we only
# handle UTF-8, so basically we cross our fingers that the message force
# encoded to UTF-8 is readable.
message
=
response
.
commit_subject
.
dup
.
force_encoding
(
'UTF-8'
)
# NOTE: For ease of parsing in Gitaly, we have only the subject of
# the commit and not the full message. This is ok, since all the
# code that uses `local_branches` only cares at most about the
# commit message.
# TODO: Once gitaly "takes over" Rugged consider separating the
# subject from the message to make it clearer when there's one
# available but not the other.
hash
=
{
id:
response
.
commit_id
,
message:
message
,
authored_date:
Time
.
at
(
response
.
commit_author
.
date
.
seconds
),
author_name:
response
.
commit_author
.
name
,
author_email:
response
.
commit_author
.
email
,
committed_date:
Time
.
at
(
response
.
commit_committer
.
date
.
seconds
),
committer_name:
response
.
commit_committer
.
name
,
committer_email:
response
.
commit_committer
.
email
}
Gitlab
::
Git
::
Commit
.
decorate
(
hash
)
end
end
end
end
end
end
end
lib/gitlab/git/commit.rb
View file @
3213f28c
...
@@ -49,6 +49,7 @@ module Gitlab
...
@@ -49,6 +49,7 @@ module Gitlab
# Commit.find(repo, 'master')
# Commit.find(repo, 'master')
#
#
def
find
(
repo
,
commit_id
=
"HEAD"
)
def
find
(
repo
,
commit_id
=
"HEAD"
)
return
commit_id
if
commit_id
.
is_a?
(
Gitlab
::
Git
::
Commit
)
return
decorate
(
commit_id
)
if
commit_id
.
is_a?
(
Rugged
::
Commit
)
return
decorate
(
commit_id
)
if
commit_id
.
is_a?
(
Rugged
::
Commit
)
obj
=
if
commit_id
.
is_a?
(
String
)
obj
=
if
commit_id
.
is_a?
(
String
)
...
...
lib/gitlab/git/repository.rb
View file @
3213f28c
...
@@ -78,14 +78,16 @@ module Gitlab
...
@@ -78,14 +78,16 @@ module Gitlab
end
end
# Returns an Array of Branches
# Returns an Array of Branches
def
branches
def
branches
(
filter:
nil
,
sort_by:
nil
)
rugged
.
branches
.
map
do
|
rugged_ref
|
branches
=
rugged
.
branches
.
each
(
filter
)
.
map
do
|
rugged_ref
|
begin
begin
Gitlab
::
Git
::
Branch
.
new
(
self
,
rugged_ref
.
name
,
rugged_ref
.
target
)
Gitlab
::
Git
::
Branch
.
new
(
self
,
rugged_ref
.
name
,
rugged_ref
.
target
)
rescue
Rugged
::
ReferenceError
rescue
Rugged
::
ReferenceError
# Omit invalid branch
# Omit invalid branch
end
end
end
.
compact
.
sort_by
(
&
:name
)
end
.
compact
sort_branches
(
branches
,
sort_by
)
end
end
def
reload_rugged
def
reload_rugged
...
@@ -106,9 +108,15 @@ module Gitlab
...
@@ -106,9 +108,15 @@ module Gitlab
Gitlab
::
Git
::
Branch
.
new
(
self
,
rugged_ref
.
name
,
rugged_ref
.
target
)
if
rugged_ref
Gitlab
::
Git
::
Branch
.
new
(
self
,
rugged_ref
.
name
,
rugged_ref
.
target
)
if
rugged_ref
end
end
def
local_branches
def
local_branches
(
sort_by:
nil
)
rugged
.
branches
.
each
(
:local
).
map
do
|
branch
|
gitaly_migrate
(
:local_branches
)
do
|
is_enabled
|
Gitlab
::
Git
::
Branch
.
new
(
self
,
branch
.
name
,
branch
.
target
)
if
is_enabled
gitaly_ref_client
.
local_branches
(
sort_by:
sort_by
).
map
do
|
gitaly_branch
|
Gitlab
::
Git
::
Branch
.
new
(
self
,
gitaly_branch
.
name
,
gitaly_branch
)
end
else
branches
(
filter: :local
,
sort_by:
sort_by
)
end
end
end
end
end
...
@@ -1253,6 +1261,23 @@ module Gitlab
...
@@ -1253,6 +1261,23 @@ module Gitlab
diff
.
each_patch
diff
.
each_patch
end
end
def
sort_branches
(
branches
,
sort_by
)
case
sort_by
when
'name'
branches
.
sort_by
(
&
:name
)
when
'updated_desc'
branches
.
sort
do
|
a
,
b
|
b
.
dereferenced_target
.
committed_date
<=>
a
.
dereferenced_target
.
committed_date
end
when
'updated_asc'
branches
.
sort
do
|
a
,
b
|
a
.
dereferenced_target
.
committed_date
<=>
b
.
dereferenced_target
.
committed_date
end
else
branches
end
end
def
gitaly_ref_client
def
gitaly_ref_client
@gitaly_ref_client
||=
Gitlab
::
GitalyClient
::
Ref
.
new
(
self
)
@gitaly_ref_client
||=
Gitlab
::
GitalyClient
::
Ref
.
new
(
self
)
end
end
...
...
lib/gitlab/gitaly_client/ref.rb
View file @
3213f28c
...
@@ -44,6 +44,12 @@ module Gitlab
...
@@ -44,6 +44,12 @@ module Gitlab
branch_names
.
count
branch_names
.
count
end
end
def
local_branches
(
sort_by:
nil
)
request
=
Gitaly
::
FindLocalBranchesRequest
.
new
(
repository:
@gitaly_repo
)
request
.
sort_by
=
sort_by_param
(
sort_by
)
if
sort_by
consume_branches_response
(
stub
.
find_local_branches
(
request
))
end
private
private
def
consume_refs_response
(
response
,
prefix
:)
def
consume_refs_response
(
response
,
prefix
:)
...
@@ -51,6 +57,16 @@ module Gitlab
...
@@ -51,6 +57,16 @@ module Gitlab
r
.
names
.
map
{
|
name
|
name
.
sub
(
/\A
#{
Regexp
.
escape
(
prefix
)
}
/
,
''
)
}
r
.
names
.
map
{
|
name
|
name
.
sub
(
/\A
#{
Regexp
.
escape
(
prefix
)
}
/
,
''
)
}
end
end
end
end
def
sort_by_param
(
sort_by
)
enum_value
=
Gitaly
::
FindLocalBranchesRequest
::
SortBy
.
resolve
(
sort_by
.
upcase
.
to_sym
)
raise
ArgumentError
,
"Invalid sort_by key `
#{
sort_by
}
`"
unless
enum_value
enum_value
end
def
consume_branches_response
(
response
)
response
.
flat_map
{
|
r
|
r
.
branches
}
end
end
end
end
end
end
end
spec/lib/gitlab/git/branch_spec.rb
View file @
3213f28c
...
@@ -7,6 +7,51 @@ describe Gitlab::Git::Branch, seed_helper: true do
...
@@ -7,6 +7,51 @@ describe Gitlab::Git::Branch, seed_helper: true do
it
{
is_expected
.
to
be_kind_of
Array
}
it
{
is_expected
.
to
be_kind_of
Array
}
describe
'initialize'
do
let
(
:commit_id
)
{
'f00'
}
let
(
:commit_subject
)
{
"My commit"
.
force_encoding
(
'ASCII-8BIT'
)
}
let
(
:committer
)
do
Gitaly
::
FindLocalBranchCommitAuthor
.
new
(
name:
generate
(
:name
),
email:
generate
(
:email
),
date:
Google
::
Protobuf
::
Timestamp
.
new
(
seconds:
123
)
)
end
let
(
:author
)
do
Gitaly
::
FindLocalBranchCommitAuthor
.
new
(
name:
generate
(
:name
),
email:
generate
(
:email
),
date:
Google
::
Protobuf
::
Timestamp
.
new
(
seconds:
456
)
)
end
let
(
:gitaly_branch
)
do
Gitaly
::
FindLocalBranchResponse
.
new
(
name:
'foo'
,
commit_id:
commit_id
,
commit_subject:
commit_subject
,
commit_author:
author
,
commit_committer:
committer
)
end
let
(
:attributes
)
do
{
id:
commit_id
,
message:
commit_subject
,
authored_date:
Time
.
at
(
author
.
date
.
seconds
),
author_name:
author
.
name
,
author_email:
author
.
email
,
committed_date:
Time
.
at
(
committer
.
date
.
seconds
),
committer_name:
committer
.
name
,
committer_email:
committer
.
email
}
end
let
(
:branch
)
{
described_class
.
new
(
repository
,
'foo'
,
gitaly_branch
)
}
it
'parses Gitaly::FindLocalBranchResponse correctly'
do
expect
(
Gitlab
::
Git
::
Commit
).
to
receive
(
:decorate
).
with
(
hash_including
(
attributes
)).
and_call_original
expect
(
branch
.
dereferenced_target
.
message
.
encoding
).
to
be
(
Encoding
::
UTF_8
)
end
end
describe
'#size'
do
describe
'#size'
do
subject
{
super
().
size
}
subject
{
super
().
size
}
it
{
is_expected
.
to
eq
(
SeedRepo
::
Repo
::
BRANCHES
.
size
)
}
it
{
is_expected
.
to
eq
(
SeedRepo
::
Repo
::
BRANCHES
.
size
)
}
...
...
spec/lib/gitlab/git/repository_spec.rb
View file @
3213f28c
...
@@ -1080,7 +1080,9 @@ describe Gitlab::Git::Repository, seed_helper: true do
...
@@ -1080,7 +1080,9 @@ describe Gitlab::Git::Repository, seed_helper: true do
ref
=
double
()
ref
=
double
()
allow
(
ref
).
to
receive
(
:name
)
{
'bad-branch'
}
allow
(
ref
).
to
receive
(
:name
)
{
'bad-branch'
}
allow
(
ref
).
to
receive
(
:target
)
{
raise
Rugged
::
ReferenceError
}
allow
(
ref
).
to
receive
(
:target
)
{
raise
Rugged
::
ReferenceError
}
allow
(
repository
.
rugged
).
to
receive
(
:branches
)
{
[
ref
]
}
branches
=
double
()
allow
(
branches
).
to
receive
(
:each
)
{
[
ref
].
each
}
allow
(
repository
.
rugged
).
to
receive
(
:branches
)
{
branches
}
end
end
it
'should return empty branches'
do
it
'should return empty branches'
do
...
@@ -1264,7 +1266,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
...
@@ -1264,7 +1266,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
describe
'#local_branches'
do
describe
'#local_branches'
do
before
(
:all
)
do
before
(
:all
)
do
@repo
=
Gitlab
::
Git
::
Repository
.
new
(
'default'
,
TEST_MUTABLE_REPO_PATH
)
@repo
=
Gitlab
::
Git
::
Repository
.
new
(
'default'
,
File
.
join
(
TEST_MUTABLE_REPO_PATH
,
'.git'
)
)
end
end
after
(
:all
)
do
after
(
:all
)
do
...
@@ -1279,6 +1281,28 @@ describe Gitlab::Git::Repository, seed_helper: true do
...
@@ -1279,6 +1281,28 @@ describe Gitlab::Git::Repository, seed_helper: true do
expect
(
@repo
.
local_branches
.
any?
{
|
branch
|
branch
.
name
==
'remote_branch'
}).
to
eq
(
false
)
expect
(
@repo
.
local_branches
.
any?
{
|
branch
|
branch
.
name
==
'remote_branch'
}).
to
eq
(
false
)
expect
(
@repo
.
local_branches
.
any?
{
|
branch
|
branch
.
name
==
'local_branch'
}).
to
eq
(
true
)
expect
(
@repo
.
local_branches
.
any?
{
|
branch
|
branch
.
name
==
'local_branch'
}).
to
eq
(
true
)
end
end
context
'with gitaly enabled'
do
before
{
stub_gitaly
}
it
'gets the branches from GitalyClient'
do
expect_any_instance_of
(
Gitlab
::
GitalyClient
::
Ref
).
to
receive
(
:local_branches
).
and_return
([])
@repo
.
local_branches
end
it
'wraps GRPC not found'
do
expect_any_instance_of
(
Gitlab
::
GitalyClient
::
Ref
).
to
receive
(
:local_branches
).
and_raise
(
GRPC
::
NotFound
)
expect
{
@repo
.
local_branches
}.
to
raise_error
(
Gitlab
::
Git
::
Repository
::
NoRepository
)
end
it
'wraps GRPC exceptions'
do
expect_any_instance_of
(
Gitlab
::
GitalyClient
::
Ref
).
to
receive
(
:local_branches
).
and_raise
(
GRPC
::
Unknown
)
expect
{
@repo
.
local_branches
}.
to
raise_error
(
Gitlab
::
Git
::
CommandError
)
end
end
end
end
def
create_remote_branch
(
remote_name
,
branch_name
,
source_branch_name
)
def
create_remote_branch
(
remote_name
,
branch_name
,
source_branch_name
)
...
...
spec/lib/gitlab/gitaly_client/ref_spec.rb
View file @
3213f28c
...
@@ -38,4 +38,27 @@ describe Gitlab::GitalyClient::Ref do
...
@@ -38,4 +38,27 @@ describe Gitlab::GitalyClient::Ref do
client
.
default_branch_name
client
.
default_branch_name
end
end
end
end
describe
'#local_branches'
do
it
'sends a find_local_branches message'
do
expect_any_instance_of
(
Gitaly
::
Ref
::
Stub
).
to
receive
(
:find_local_branches
).
with
(
gitaly_request_with_repo_path
(
repo_path
)).
and_return
([])
client
.
local_branches
end
it
'parses and sends the sort parameter'
do
expect_any_instance_of
(
Gitaly
::
Ref
::
Stub
).
to
receive
(
:find_local_branches
).
with
(
gitaly_request_with_params
(
sort_by: :UPDATED_DESC
)).
and_return
([])
client
.
local_branches
(
sort_by:
'updated_desc'
)
end
it
'raises an argument error if an invalid sort_by parameter is passed'
do
expect
{
client
.
local_branches
(
sort_by:
'invalid_sort'
)
}.
to
raise_error
(
ArgumentError
)
end
end
end
end
spec/support/matchers/gitaly_matchers.rb
View file @
3213f28c
RSpec
::
Matchers
.
define
:gitaly_request_with_repo_path
do
|
path
|
RSpec
::
Matchers
.
define
:gitaly_request_with_repo_path
do
|
path
|
match
{
|
actual
|
actual
.
repository
.
path
==
path
}
match
{
|
actual
|
actual
.
repository
.
path
==
path
}
end
end
RSpec
::
Matchers
.
define
:gitaly_request_with_params
do
|
params
|
match
do
|
actual
|
params
.
reduce
(
true
)
{
|
r
,
(
key
,
val
)
|
r
&&
actual
.
send
(
key
)
==
val
}
end
end
spec/tasks/gitlab/backup_rake_spec.rb
View file @
3213f28c
...
@@ -251,6 +251,10 @@ describe 'gitlab:app namespace rake task' do
...
@@ -251,6 +251,10 @@ describe 'gitlab:app namespace rake task' do
FileUtils
.
rm_rf
(
'tmp/tests/default_storage'
)
FileUtils
.
rm_rf
(
'tmp/tests/default_storage'
)
FileUtils
.
rm_rf
(
'tmp/tests/custom_storage'
)
FileUtils
.
rm_rf
(
'tmp/tests/custom_storage'
)
FileUtils
.
rm
(
@backup_tar
)
FileUtils
.
rm
(
@backup_tar
)
# We unstub the storages to be able to reconfigure the actual Gitaly channels
allow
(
Gitlab
.
config
.
repositories
).
to
receive
(
:storages
).
and_call_original
Gitlab
::
GitalyClient
.
configure_channels
end
end
it
'includes repositories in all repository storages'
do
it
'includes repositories in all repository storages'
do
...
...
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