GitLab wurde erfolgreich aktualisiert. Dank regelmäßiger Updates bleibt das THM GitLab sicher und Sie profitieren von den neuesten Funktionen. Danke für Ihre Geduld.

Commit 04cf618b authored by Douwe Maan's avatar Douwe Maan

Change no_limits to limits

parent ce869e39
......@@ -176,7 +176,7 @@ class Commits < Grape::API
}
if params[:path]
commit.raw_diffs(no_limits: true).each do |diff|
commit.raw_diffs(limits: false).each do |diff|
next unless diff.new_path == params[:path]
lines = Gitlab::Diff::Parser.new.parse(diff.diff.each_line)
......
......@@ -331,7 +331,7 @@ class MergeRequest < MergeRequestBasic
class MergeRequestChanges < MergeRequest
expose :diffs, as: :changes, using: Entities::RepoDiff do |compare, _|
compare.raw_diffs(no_limits: true).to_a
compare.raw_diffs(limits: false).to_a
end
end
......@@ -344,7 +344,7 @@ class MergeRequestDiffFull < MergeRequestDiff
expose :commits, using: Entities::RepoCommit
expose :diffs, using: Entities::RepoDiff do |compare, _|
compare.raw_diffs(no_limits: true).to_a
compare.raw_diffs(limits: false).to_a
end
end
......@@ -548,7 +548,7 @@ class Compare < Grape::Entity
end
expose :diffs, using: Entities::RepoDiff do |compare, options|
compare.diffs(no_limits: true).to_a
compare.diffs(limits: false).to_a
end
expose :compare_timeout do |compare, options|
......
......@@ -167,7 +167,7 @@ class Commits < Grape::API
}
if params[:path]
commit.raw_diffs(no_limits: true).each do |diff|
commit.raw_diffs(limits: false).each do |diff|
next unless diff.new_path == params[:path]
lines = Gitlab::Diff::Parser.new.parse(diff.diff.each_line)
......
......@@ -226,7 +226,7 @@ class Deployment < Grape::Entity
class MergeRequestChanges < MergeRequest
expose :diffs, as: :changes, using: ::API::Entities::RepoDiff do |compare, _|
compare.raw_diffs(no_limits: true).to_a
compare.raw_diffs(limits: false).to_a
end
end
......
......@@ -155,7 +155,7 @@ def filter_diff_options(options, default_options = {})
:include_untracked_content, :skip_binary_check,
:include_typechange, :include_typechange_trees,
:ignore_filemode, :recurse_ignored_dirs, :paths,
:max_files, :max_lines, :no_limits, :expanded]
:max_files, :max_lines, :limits, :expanded]
if default_options
actual_defaults = default_options.dup
......
......@@ -13,7 +13,7 @@ def initialize(iterator, options = {})
@safe_max_files = [@max_files, DEFAULT_LIMITS[:max_files]].min
@safe_max_lines = [@max_lines, DEFAULT_LIMITS[:max_lines]].min
@safe_max_bytes = @safe_max_files * 5.kilobytes # Average 5 KB per file
@no_limits = !!options.fetch(:no_limits, false)
@enforce_limits = !!options.fetch(:limits, true)
@expanded = !!options.fetch(:expanded, true)
@line_count = 0
......@@ -88,12 +88,12 @@ def each_patch
@iterator.each do |raw|
@empty = false
if !@no_limits && i >= @max_files
if @enforce_limits && i >= @max_files
@overflow = true
break
end
expanded = @no_limits || @expanded
expanded = !@enforce_limits || @expanded
diff = Gitlab::Git::Diff.new(raw, expanded: expanded)
......@@ -104,7 +104,7 @@ def each_patch
@line_count += diff.line_count
@byte_count += diff.diff.bytesize
if !@no_limits && (@line_count >= @max_lines || @byte_count >= @max_bytes)
if @enforce_limits && (@line_count >= @max_lines || @byte_count >= @max_bytes)
# This last Diff instance pushes us over the lines limit. We stop and
# discard it.
@overflow = true
......
......@@ -6,7 +6,7 @@
iterator,
max_files: max_files,
max_lines: max_lines,
no_limits: no_limits,
limits: limits,
expanded: expanded
)
end
......@@ -16,7 +16,7 @@
let(:line_count) { 1 }
let(:max_files) { 10 }
let(:max_lines) { 100 }
let(:no_limits) { false }
let(:limits) { true }
let(:expanded) { true }
describe '#to_a' do
......@@ -75,7 +75,7 @@
end
context 'when limiting is disabled' do
let(:no_limits) { true }
let(:limits) { false }
describe '#overflow?' do
subject { super().overflow? }
......@@ -94,7 +94,7 @@
describe '#size' do
it { expect(subject.size).to eq(3) }
it 'does not change after peeking' do
subject.any?
expect(subject.size).to eq(3)
......@@ -123,7 +123,7 @@
it { expect(subject.size).to eq(0) }
context 'when limiting is disabled' do
let(:no_limits) { true }
let(:limits) { false }
describe '#overflow?' do
subject { super().overflow? }
......@@ -167,7 +167,7 @@
it { expect(subject.size).to eq(10) }
context 'when limiting is disabled' do
let(:no_limits) { true }
let(:limits) { false }
describe '#overflow?' do
subject { super().overflow? }
......@@ -207,7 +207,7 @@
it { expect(subject.size).to eq(3) }
context 'when limiting is disabled' do
let(:no_limits) { true }
let(:limits) { false }
describe '#overflow?' do
subject { super().overflow? }
......@@ -273,7 +273,7 @@
it { expect(subject.size).to eq(9) }
context 'when limiting is disabled' do
let(:no_limits) { true }
let(:limits) { false }
describe '#overflow?' do
subject { super().overflow? }
......@@ -450,7 +450,7 @@
end
context 'when limiting is disabled' do
let(:no_limits) { true }
let(:limits) { false }
it 'yields Diff instances even when they are quite big' do
expect { |b| subject.each(&b) }.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment