gitlab_git 10.4.1 → 10.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c6105a4756fd689a3d5c54d7335c9873364c473
-  data.tar.gz: 3f7005c2ae1c7f1ba84984559547040f851215ff
+  metadata.gz: e30dbf365616d1882c82f8b7dab9df82a263fbbd
+  data.tar.gz: 2fa32f9affdc6f0b431b598b463c7c0a8584aa4f
 SHA512:
-  metadata.gz: 55d94d228cb06b35c0aa375833387170f503ba2e05e2c89b5775f91de9f40e534472e4100777ac3c568c64d8c0347969ecf599103cacb5b28766e0fc120c79c4
-  data.tar.gz: 903ef839de16ca0ce55b063cb5626f67863e59461ad14f818ca19d30faacc8b7d62cca303f611a72beda7892b5a6fe9216e3cfbf2bc13981a1851e380f34ebe4
+  metadata.gz: b39cbb770c89b34fc94a9e9758ddc7ef8be5ceb89c6f403c85ba3b883ef9f1ee0ca4ba86b806ffb1b04363716e5941f5ba52cd90428f47ace13de9c043480fe0
+  data.tar.gz: 987439cb257e6b0dbcfb794f522888ed47ca63a1d7c04c8c5fdff607fd27cad6569e01ecdfef2cabb6de6122861caf8be38a9970bfb4622c74fe646d6a20fdf0

data/VERSION

@@ -1 +1 @@
-10.4.1
+10.4.2

data/lib/gitlab_git/diff_collection.rb

@@ -23,51 +23,58 @@ module Gitlab
       end
 
       def each
-        @iterator.each_with_index do |raw, i|
-          # First yield cached Diff instances from @array
-          if @array[i]
-            yield @array[i]
-            next
+        if @populated
+          # @iterator.each is slower than just iterating the array in place
+          @array.each do |item|
+            yield item
           end
+        else
+          @iterator.each_with_index do |raw, i|
+            # First yield cached Diff instances from @array
+            if @array[i]
+              yield @array[i]
+              next
+            end
 
-          # We have exhausted @array, time to create new Diff instances or stop.
-          break if @overflow
+            # We have exhausted @array, time to create new Diff instances or stop.
+            break if @overflow
 
-          if !@all_diffs && i >= @max_files
-            @overflow = true
-            break
-          end
+            if !@all_diffs && i >= @max_files
+              @overflow = true
+              break
+            end
 
-          # Going by the number of files alone it is OK to create a new Diff instance.
-          diff = Gitlab::Git::Diff.new(raw)
-
-          # If a diff is too large we still want to display some information
-          # about it (e.g. the file path) without keeping the raw data around
-          # (as this would be a waste of memory usage).
-          #
-          # This also removes the line count (from the diff itself) so it
-          # doesn't add up to the total amount of lines.
-          if diff.too_large?
-            diff.prune_large_diff!
-          end
+            # Going by the number of files alone it is OK to create a new Diff instance.
+            diff = Gitlab::Git::Diff.new(raw)
+
+            # If a diff is too large we still want to display some information
+            # about it (e.g. the file path) without keeping the raw data around
+            # (as this would be a waste of memory usage).
+            #
+            # This also removes the line count (from the diff itself) so it
+            # doesn't add up to the total amount of lines.
+            if diff.too_large?
+              diff.prune_large_diff!
+            end
 
-          if !@all_diffs && !@no_collapse
-            if diff.collapsible? || over_safe_limits?(i)
-              diff.prune_collapsed_diff!
+            if !@all_diffs && !@no_collapse
+              if diff.collapsible? || over_safe_limits?(i)
+                diff.prune_collapsed_diff!
+              end
             end
-          end
 
-          @line_count += diff.line_count
-          @byte_count += diff.diff.bytesize
+            @line_count += diff.line_count
+            @byte_count += diff.diff.bytesize
 
-          if !@all_diffs && (@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
-            break
-          end
+            if !@all_diffs && (@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
+              break
+            end
 
-          yield @array[i] = diff
+            yield @array[i] = diff
+          end
         end
       end
 
@@ -81,7 +88,7 @@ module Gitlab
       end
 
       def size
-        @size ||= count # forces a loop through @iterator
+        @size ||= count # forces a loop using each method
       end
 
       def real_size
@@ -95,9 +102,11 @@ module Gitlab
       end
 
       def decorate!
-        each_with_index do |element, i|
+        collection = each_with_index do |element, i|
           @array[i] = yield(element)
         end
+        @populated = true
+        collection
       end
 
       private

data/lib/gitlab_git/repository.rb

@@ -1,6 +1,7 @@
 # Gitlab::Git::Repository is a wrapper around native Rugged::Repository object
 require_relative 'encoding_helper'
 require_relative 'path_helper'
+require 'forwardable'
 require 'tempfile'
 require "rubygems/package"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 10.4.1
+  version: 10.4.2
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-linguist
@@ -125,8 +125,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Gitlab::Git library
 test_files: []
+has_rdoc: