gitlab_git 10.4.2 → 10.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e30dbf365616d1882c82f8b7dab9df82a263fbbd
-  data.tar.gz: 2fa32f9affdc6f0b431b598b463c7c0a8584aa4f
+  metadata.gz: 01b37a892f1f38530140a9011553c495ecc33f23
+  data.tar.gz: 26cbfd7f959a1f76e54d6244ccbec5c60297c93f
 SHA512:
-  metadata.gz: b39cbb770c89b34fc94a9e9758ddc7ef8be5ceb89c6f403c85ba3b883ef9f1ee0ca4ba86b806ffb1b04363716e5941f5ba52cd90428f47ace13de9c043480fe0
-  data.tar.gz: 987439cb257e6b0dbcfb794f522888ed47ca63a1d7c04c8c5fdff607fd27cad6569e01ecdfef2cabb6de6122861caf8be38a9970bfb4622c74fe646d6a20fdf0
+  metadata.gz: ff5d5c4d4ef411f7d99089d874de79f33ab0be52390d70cdfc81feb97054f13bc6923ac26584ab96d9c326e604f924cfb6fc4debd5ddfc6186f462083b9eb3ae
+  data.tar.gz: 2cb19139c2a10e5452eaffd3381f25122f656e10da9b8cb5f7e5f5fdb8991e39084c6e3feb1de7f98a5abf07973c5519329a7ea1ae76f70b259ed9f48103d6d4

data/VERSION

@@ -1 +1 @@
-10.4.2
+10.4.3

data/lib/gitlab_git/diff.rb

@@ -159,12 +159,13 @@ module Gitlab
       end
 
       def initialize(raw_diff)
-        raise "Nil as raw diff passed" unless raw_diff
-
-        if raw_diff.is_a?(Hash)
+        case raw_diff
+        when Hash
           init_from_hash(raw_diff)
-        elsif raw_diff.is_a?(Rugged::Patch)
+        when Rugged::Patch, Rugged::Diff::Delta
           init_from_rugged(raw_diff)
+        when nil
+          raise "Nil as raw diff passed"
         else
           raise "Invalid raw diff type: #{raw_diff.class}"
         end
@@ -226,9 +227,13 @@ module Gitlab
       private
 
       def init_from_rugged(rugged)
-        @diff = encode!(strip_diff_headers(rugged.to_s))
+        if rugged.is_a?(Rugged::Patch)
+          @diff = encode!(strip_diff_headers(rugged.to_s))
+          d = rugged.delta
+        else
+          d = rugged
+        end
 
-        d = rugged.delta
         @new_path = encode!(d.new_file[:path])
         @old_path = encode!(d.old_file[:path])
         @a_mode = d.old_file[:mode].to_s(8)

data/lib/gitlab_git/diff_collection.rb

@@ -15,6 +15,7 @@ module Gitlab
         @safe_max_bytes = @safe_max_files * 5120 # Average 5 KB per file
         @all_diffs = !!options.fetch(:all_diffs, false)
         @no_collapse = !!options.fetch(:no_collapse, true)
+        @deltas_only = !!options.fetch(:deltas_only, false)
 
         @line_count = 0
         @byte_count = 0
@@ -22,59 +23,14 @@ module Gitlab
         @array = Array.new
       end
 
-      def each
+      def each(&block)
         if @populated
           # @iterator.each is slower than just iterating the array in place
-          @array.each do |item|
-            yield item
-          end
+          @array.each(&block)
+        elsif @deltas_only
+          each_delta(&block)
         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
-
-            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
-
-            if !@all_diffs && !@no_collapse
-              if diff.collapsible? || over_safe_limits?(i)
-                diff.prune_collapsed_diff!
-              end
-            end
-
-            @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
-
-            yield @array[i] = diff
-          end
+          each_patch(&block)
         end
       end
 
@@ -122,6 +78,63 @@ module Gitlab
       def over_safe_limits?(files)
         files >= @safe_max_files || @line_count > @safe_max_lines || @byte_count >= @safe_max_bytes
       end
+
+      def each_delta
+        @iterator.each_delta.with_index do |delta, i|
+          diff = Gitlab::Git::Diff.new(delta)
+
+          yield @array[i] = diff
+        end
+      end
+
+      def each_patch
+        @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
+
+          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
+
+          if !@all_diffs && !@no_collapse
+            if diff.collapsible? || over_safe_limits?(i)
+              diff.prune_collapsed_diff!
+            end
+          end
+
+          @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
+
+          yield @array[i] = diff
+        end
+      end
     end
   end
 end

metadata

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