2019-11-12 22:06:31 -05:00
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2017-02-24 10:53:44 -05:00
|
|
|
require 'spec_helper'
|
|
|
|
|
2017-07-18 03:59:36 -04:00
|
|
|
describe Gitlab::GitalyClient::CommitService do
|
2017-05-05 10:55:12 -04:00
|
|
|
let(:project) { create(:project, :repository) }
|
2017-07-18 01:02:56 -04:00
|
|
|
let(:storage_name) { project.repository_storage }
|
2017-07-21 20:37:22 -04:00
|
|
|
let(:relative_path) { project.disk_path + '.git' }
|
2017-05-05 10:55:12 -04:00
|
|
|
let(:repository) { project.repository }
|
|
|
|
let(:repository_message) { repository.gitaly_repository }
|
2017-07-18 01:02:56 -04:00
|
|
|
let(:revision) { '913c66a37b4a45b9769037c55c2d238bd0942d2e' }
|
|
|
|
let(:commit) { project.commit(revision) }
|
|
|
|
let(:client) { described_class.new(repository) }
|
2017-02-24 10:53:44 -05:00
|
|
|
|
2017-05-05 10:55:12 -04:00
|
|
|
describe '#diff_from_parent' do
|
2017-02-24 10:53:44 -05:00
|
|
|
context 'when a commit has a parent' do
|
|
|
|
it 'sends an RPC request with the parent ID as left commit' do
|
|
|
|
request = Gitaly::CommitDiffRequest.new(
|
|
|
|
repository: repository_message,
|
|
|
|
left_commit_id: 'cfe32cf61b73a0d5e9f13e774abde7ff789b1660',
|
2017-07-13 18:22:09 -04:00
|
|
|
right_commit_id: commit.id,
|
2018-06-29 09:25:35 -04:00
|
|
|
collapse_diffs: false,
|
2017-07-13 18:22:09 -04:00
|
|
|
enforce_limits: true,
|
2018-09-06 16:56:06 -04:00
|
|
|
# Tests limitation parameters explicitly
|
|
|
|
max_files: 100,
|
|
|
|
max_lines: 5000,
|
|
|
|
max_bytes: 512000,
|
|
|
|
safe_max_files: 100,
|
|
|
|
safe_max_lines: 5000,
|
|
|
|
safe_max_bytes: 512000,
|
|
|
|
max_patch_bytes: 102400
|
2017-02-24 10:53:44 -05:00
|
|
|
)
|
|
|
|
|
2017-07-18 03:59:36 -04:00
|
|
|
expect_any_instance_of(Gitaly::DiffService::Stub).to receive(:commit_diff).with(request, kind_of(Hash))
|
2017-02-24 10:53:44 -05:00
|
|
|
|
2017-07-18 01:02:56 -04:00
|
|
|
client.diff_from_parent(commit)
|
2017-02-24 10:53:44 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when a commit does not have a parent' do
|
|
|
|
it 'sends an RPC request with empty tree ref as left commit' do
|
2017-07-25 16:48:17 -04:00
|
|
|
initial_commit = project.commit('1a0b36b3cdad1d2ee32457c102a8c0b7056fa863').raw
|
2017-02-24 10:53:44 -05:00
|
|
|
request = Gitaly::CommitDiffRequest.new(
|
|
|
|
repository: repository_message,
|
2018-04-11 23:05:07 -04:00
|
|
|
left_commit_id: Gitlab::Git::EMPTY_TREE_ID,
|
2017-07-13 18:22:09 -04:00
|
|
|
right_commit_id: initial_commit.id,
|
2018-06-29 09:25:35 -04:00
|
|
|
collapse_diffs: false,
|
2017-07-13 18:22:09 -04:00
|
|
|
enforce_limits: true,
|
2018-09-06 16:56:06 -04:00
|
|
|
# Tests limitation parameters explicitly
|
|
|
|
max_files: 100,
|
|
|
|
max_lines: 5000,
|
|
|
|
max_bytes: 512000,
|
|
|
|
safe_max_files: 100,
|
|
|
|
safe_max_lines: 5000,
|
|
|
|
safe_max_bytes: 512000,
|
|
|
|
max_patch_bytes: 102400
|
2017-02-24 10:53:44 -05:00
|
|
|
)
|
|
|
|
|
2017-07-18 03:59:36 -04:00
|
|
|
expect_any_instance_of(Gitaly::DiffService::Stub).to receive(:commit_diff).with(request, kind_of(Hash))
|
2017-02-24 10:53:44 -05:00
|
|
|
|
2017-07-18 01:02:56 -04:00
|
|
|
client.diff_from_parent(initial_commit)
|
2017-02-24 10:53:44 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-07-25 17:26:52 -04:00
|
|
|
it 'returns a Gitlab::GitalyClient::DiffStitcher' do
|
2017-07-18 01:02:56 -04:00
|
|
|
ret = client.diff_from_parent(commit)
|
2017-02-24 10:53:44 -05:00
|
|
|
|
2017-07-25 17:26:52 -04:00
|
|
|
expect(ret).to be_kind_of(Gitlab::GitalyClient::DiffStitcher)
|
2017-05-05 10:55:12 -04:00
|
|
|
end
|
2017-09-19 07:35:21 -04:00
|
|
|
|
|
|
|
it 'encodes paths correctly' do
|
2017-10-03 04:03:19 -04:00
|
|
|
expect { client.diff_from_parent(commit, paths: ['encoding/test.txt', 'encoding/テスト.txt', nil]) }.not_to raise_error
|
2017-09-19 07:35:21 -04:00
|
|
|
end
|
2017-05-05 10:55:12 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
describe '#commit_deltas' do
|
|
|
|
context 'when a commit has a parent' do
|
|
|
|
it 'sends an RPC request with the parent ID as left commit' do
|
|
|
|
request = Gitaly::CommitDeltaRequest.new(
|
|
|
|
repository: repository_message,
|
|
|
|
left_commit_id: 'cfe32cf61b73a0d5e9f13e774abde7ff789b1660',
|
|
|
|
right_commit_id: commit.id
|
|
|
|
)
|
|
|
|
|
2017-07-18 03:59:36 -04:00
|
|
|
expect_any_instance_of(Gitaly::DiffService::Stub).to receive(:commit_delta).with(request, kind_of(Hash)).and_return([])
|
2017-05-05 10:55:12 -04:00
|
|
|
|
2017-07-18 01:02:56 -04:00
|
|
|
client.commit_deltas(commit)
|
2017-05-05 10:55:12 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when a commit does not have a parent' do
|
|
|
|
it 'sends an RPC request with empty tree ref as left commit' do
|
|
|
|
initial_commit = project.commit('1a0b36b3cdad1d2ee32457c102a8c0b7056fa863')
|
|
|
|
request = Gitaly::CommitDeltaRequest.new(
|
|
|
|
repository: repository_message,
|
2018-04-11 23:05:07 -04:00
|
|
|
left_commit_id: Gitlab::Git::EMPTY_TREE_ID,
|
2017-05-05 10:55:12 -04:00
|
|
|
right_commit_id: initial_commit.id
|
|
|
|
)
|
|
|
|
|
2017-07-18 03:59:36 -04:00
|
|
|
expect_any_instance_of(Gitaly::DiffService::Stub).to receive(:commit_delta).with(request, kind_of(Hash)).and_return([])
|
2017-05-05 10:55:12 -04:00
|
|
|
|
2017-07-18 01:02:56 -04:00
|
|
|
client.commit_deltas(initial_commit)
|
2017-05-05 10:55:12 -04:00
|
|
|
end
|
2017-02-24 10:53:44 -05:00
|
|
|
end
|
|
|
|
end
|
2017-06-23 17:52:51 -04:00
|
|
|
|
|
|
|
describe '#between' do
|
|
|
|
let(:from) { 'master' }
|
2018-04-11 23:05:07 -04:00
|
|
|
let(:to) { Gitlab::Git::EMPTY_TREE_ID }
|
2017-07-18 01:02:56 -04:00
|
|
|
|
2017-06-23 17:52:51 -04:00
|
|
|
it 'sends an RPC request' do
|
|
|
|
request = Gitaly::CommitsBetweenRequest.new(
|
|
|
|
repository: repository_message, from: from, to: to
|
|
|
|
)
|
|
|
|
|
|
|
|
expect_any_instance_of(Gitaly::CommitService::Stub).to receive(:commits_between)
|
|
|
|
.with(request, kind_of(Hash)).and_return([])
|
|
|
|
|
|
|
|
described_class.new(repository).between(from, to)
|
|
|
|
end
|
|
|
|
end
|
2017-07-18 01:02:56 -04:00
|
|
|
|
2018-09-13 21:11:35 -04:00
|
|
|
describe '#diff_stats' do
|
|
|
|
let(:left_commit_id) { 'master' }
|
|
|
|
let(:right_commit_id) { 'cfe32cf61b73a0d5e9f13e774abde7ff789b1660' }
|
|
|
|
|
|
|
|
it 'sends an RPC request' do
|
|
|
|
request = Gitaly::DiffStatsRequest.new(repository: repository_message,
|
|
|
|
left_commit_id: left_commit_id,
|
|
|
|
right_commit_id: right_commit_id)
|
|
|
|
|
|
|
|
expect_any_instance_of(Gitaly::DiffService::Stub).to receive(:diff_stats)
|
|
|
|
.with(request, kind_of(Hash)).and_return([])
|
|
|
|
|
|
|
|
described_class.new(repository).diff_stats(left_commit_id, right_commit_id)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-07-18 01:02:56 -04:00
|
|
|
describe '#tree_entries' do
|
|
|
|
let(:path) { '/' }
|
|
|
|
|
|
|
|
it 'sends a get_tree_entries message' do
|
|
|
|
expect_any_instance_of(Gitaly::CommitService::Stub)
|
|
|
|
.to receive(:get_tree_entries)
|
|
|
|
.with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash))
|
|
|
|
.and_return([])
|
|
|
|
|
2018-02-16 15:39:43 -05:00
|
|
|
client.tree_entries(repository, revision, path, false)
|
2017-07-18 01:02:56 -04:00
|
|
|
end
|
2017-08-21 14:13:40 -04:00
|
|
|
|
|
|
|
context 'with UTF-8 params strings' do
|
|
|
|
let(:revision) { "branch\u011F" }
|
|
|
|
let(:path) { "foo/\u011F.txt" }
|
|
|
|
|
|
|
|
it 'handles string encodings correctly' do
|
|
|
|
expect_any_instance_of(Gitaly::CommitService::Stub)
|
|
|
|
.to receive(:get_tree_entries)
|
|
|
|
.with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash))
|
|
|
|
.and_return([])
|
|
|
|
|
2018-02-16 15:39:43 -05:00
|
|
|
client.tree_entries(repository, revision, path, false)
|
2017-08-21 14:13:40 -04:00
|
|
|
end
|
|
|
|
end
|
2017-07-18 01:02:56 -04:00
|
|
|
end
|
2017-07-25 17:33:06 -04:00
|
|
|
|
2018-01-23 03:26:28 -05:00
|
|
|
describe '#commit_count' do
|
|
|
|
before do
|
|
|
|
expect_any_instance_of(Gitaly::CommitService::Stub)
|
|
|
|
.to receive(:count_commits)
|
|
|
|
.with(gitaly_request_with_path(storage_name, relative_path),
|
|
|
|
kind_of(Hash))
|
|
|
|
.and_return([])
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'sends a commit_count message' do
|
|
|
|
client.commit_count(revision)
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'with UTF-8 params strings' do
|
|
|
|
let(:revision) { "branch\u011F" }
|
|
|
|
let(:path) { "foo/\u011F.txt" }
|
|
|
|
|
|
|
|
it 'handles string encodings correctly' do
|
|
|
|
client.commit_count(revision, path: path)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-07-25 17:33:06 -04:00
|
|
|
describe '#find_commit' do
|
2018-04-11 23:05:07 -04:00
|
|
|
let(:revision) { Gitlab::Git::EMPTY_TREE_ID }
|
2019-12-12 07:07:33 -05:00
|
|
|
|
2017-07-25 17:33:06 -04:00
|
|
|
it 'sends an RPC request' do
|
|
|
|
request = Gitaly::FindCommitRequest.new(
|
|
|
|
repository: repository_message, revision: revision
|
|
|
|
)
|
|
|
|
|
|
|
|
expect_any_instance_of(Gitaly::CommitService::Stub).to receive(:find_commit)
|
|
|
|
.with(request, kind_of(Hash)).and_return(double(commit: nil))
|
|
|
|
|
|
|
|
described_class.new(repository).find_commit(revision)
|
|
|
|
end
|
2018-02-06 10:32:34 -05:00
|
|
|
|
|
|
|
describe 'caching', :request_store do
|
|
|
|
let(:commit_dbl) { double(id: 'f01b' * 10) }
|
|
|
|
|
|
|
|
context 'when passed revision is a branch name' do
|
|
|
|
it 'calls Gitaly' do
|
|
|
|
expect_any_instance_of(Gitaly::CommitService::Stub).to receive(:find_commit).twice.and_return(double(commit: commit_dbl))
|
|
|
|
|
|
|
|
commit = nil
|
|
|
|
2.times { commit = described_class.new(repository).find_commit('master') }
|
|
|
|
|
|
|
|
expect(commit).to eq(commit_dbl)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when passed revision is a commit ID' do
|
|
|
|
it 'returns a cached commit' do
|
|
|
|
expect_any_instance_of(Gitaly::CommitService::Stub).to receive(:find_commit).once.and_return(double(commit: commit_dbl))
|
|
|
|
|
|
|
|
commit = nil
|
|
|
|
2.times { commit = described_class.new(repository).find_commit('f01b' * 10) }
|
|
|
|
|
|
|
|
expect(commit).to eq(commit_dbl)
|
|
|
|
end
|
|
|
|
end
|
2019-03-17 02:23:11 -04:00
|
|
|
|
|
|
|
context 'when caching of the ref name is enabled' do
|
2019-06-23 01:51:52 -04:00
|
|
|
it 'caches negative entries' do
|
|
|
|
expect_any_instance_of(Gitaly::CommitService::Stub).to receive(:find_commit).once.and_return(double(commit: nil))
|
|
|
|
|
|
|
|
commit = nil
|
|
|
|
2.times do
|
|
|
|
::Gitlab::GitalyClient.allow_ref_name_caching do
|
|
|
|
commit = described_class.new(repository).find_commit('master')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
expect(commit).to eq(nil)
|
|
|
|
end
|
|
|
|
|
2019-03-17 02:23:11 -04:00
|
|
|
it 'returns a cached commit' do
|
|
|
|
expect_any_instance_of(Gitaly::CommitService::Stub).to receive(:find_commit).once.and_return(double(commit: commit_dbl))
|
|
|
|
|
|
|
|
commit = nil
|
|
|
|
2.times do
|
|
|
|
::Gitlab::GitalyClient.allow_ref_name_caching do
|
|
|
|
commit = described_class.new(repository).find_commit('master')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
expect(commit).to eq(commit_dbl)
|
|
|
|
end
|
|
|
|
end
|
2018-02-06 10:32:34 -05:00
|
|
|
end
|
2017-07-25 17:33:06 -04:00
|
|
|
end
|
2017-08-09 17:47:11 -04:00
|
|
|
|
2017-09-06 06:55:16 -04:00
|
|
|
describe '#commit_stats' do
|
|
|
|
let(:request) do
|
|
|
|
Gitaly::CommitStatsRequest.new(
|
|
|
|
repository: repository_message, revision: revision
|
|
|
|
)
|
|
|
|
end
|
|
|
|
let(:response) do
|
|
|
|
Gitaly::CommitStatsResponse.new(
|
|
|
|
oid: revision,
|
|
|
|
additions: 11,
|
|
|
|
deletions: 15
|
|
|
|
)
|
|
|
|
end
|
|
|
|
|
|
|
|
subject { described_class.new(repository).commit_stats(revision) }
|
|
|
|
|
|
|
|
it 'sends an RPC request' do
|
|
|
|
expect_any_instance_of(Gitaly::CommitService::Stub).to receive(:commit_stats)
|
|
|
|
.with(request, kind_of(Hash)).and_return(response)
|
|
|
|
|
|
|
|
expect(subject.additions).to eq(11)
|
|
|
|
expect(subject.deletions).to eq(15)
|
|
|
|
end
|
|
|
|
end
|
2020-02-13 16:08:59 -05:00
|
|
|
|
|
|
|
describe '#find_commits' do
|
2020-02-17 19:09:20 -05:00
|
|
|
it 'sends an RPC request with NONE when default' do
|
|
|
|
request = Gitaly::FindCommitsRequest.new(
|
|
|
|
repository: repository_message,
|
|
|
|
disable_walk: true,
|
|
|
|
order: 'NONE'
|
|
|
|
)
|
|
|
|
|
|
|
|
expect_any_instance_of(Gitaly::CommitService::Stub).to receive(:find_commits)
|
|
|
|
.with(request, kind_of(Hash)).and_return([])
|
|
|
|
|
|
|
|
client.find_commits(order: 'default')
|
|
|
|
end
|
|
|
|
|
2020-02-13 16:08:59 -05:00
|
|
|
it 'sends an RPC request' do
|
|
|
|
request = Gitaly::FindCommitsRequest.new(
|
|
|
|
repository: repository_message,
|
|
|
|
disable_walk: true,
|
|
|
|
order: 'TOPO'
|
|
|
|
)
|
|
|
|
|
|
|
|
expect_any_instance_of(Gitaly::CommitService::Stub).to receive(:find_commits)
|
|
|
|
.with(request, kind_of(Hash)).and_return([])
|
|
|
|
|
|
|
|
client.find_commits(order: 'topo')
|
|
|
|
end
|
|
|
|
end
|
2017-02-24 10:53:44 -05:00
|
|
|
end
|