gitlab_git 10.6.3 → 10.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7297d7f12907c147d8b039f91aa75a16487a906
-  data.tar.gz: 1de3808442341ecfad0353eef558ba61324f658c
+  metadata.gz: 5415dadf9d220102e60808ce90da48ae04c01d51
+  data.tar.gz: 0d50f0dca69aa08ebf13668edc93bbce2a10ea53
 SHA512:
-  metadata.gz: 8c9dfac728a81523ed04bdf3342e9e1a332348246db2ef10013f70f793170858c5900ed9add33c969d5f93031b402f157ec92cab2ad813e04dfb10205d51332b
-  data.tar.gz: 0ebaf2bd41d9ce8bf6babdc4d8a4859d6f80c233606cf108cc9dbdf57dc2685819afaea35f431a540f1eeeafc4d93c35fe2d2939e76405c2a7b8eef50247621e
+  metadata.gz: 55e01cc03c7a744321cb825c568200df8ba55e20f830f85a0b2ffcfb1fba416b399220cce1a444bb5e68cd2d3677a8dc8d61071dd58032dc872240da7f0f654d
+  data.tar.gz: 8e3c8701cb9f258b0252d9976113d5db8f3185a3e41e9dea0343a229c5265622310232ee5ca79a243620da156319d38bbb628b2b587d11f6f5787ddfef292ceb

data/VERSION

@@ -1 +1 @@
-10.6.3
+10.6.4

data/lib/gitlab_git/blob.rb

@@ -13,7 +13,7 @@ module Gitlab
       # blob data should use load_all_data!.
       MAX_DATA_DISPLAY_SIZE = 10485760
 
-      attr_accessor :name, :path, :size, :data, :mode, :id, :commit_id, :loaded_size
+      attr_accessor :name, :path, :size, :data, :mode, :id, :commit_id, :loaded_size, :binary
 
       class << self
         def find(repository, sha, path)
@@ -38,6 +38,7 @@ module Gitlab
                 mode: blob_entry[:filemode].to_s(8),
                 path: path,
                 commit_id: sha,
+                binary: blob.binary?
               )
             end
           end
@@ -50,6 +51,7 @@ module Gitlab
             id: blob.oid,
             size: blob.size,
             data: blob.content(MAX_DATA_DISPLAY_SIZE),
+            binary: blob.binary?
           )
         end
 
@@ -247,7 +249,7 @@ module Gitlab
       end
 
       def initialize(options)
-        %w(id name path size data mode commit_id).each do |key|
+        %w(id name path size data mode commit_id binary).each do |key|
           self.send("#{key}=", options[key.to_sym])
         end
 
@@ -256,6 +258,10 @@ module Gitlab
         @loaded_size = @data.bytesize if @data
       end
 
+      def binary?
+        @binary.nil? ? super : @binary == true
+      end
+
       def empty?
         !data || data == ''
       end

data/lib/gitlab_git/diff.rb

@@ -13,6 +13,12 @@ module Gitlab
 
       attr_accessor :too_large
 
+      # The maximum size of a diff to display.
+      DIFF_SIZE_LIMIT = 102400 # 100 KB
+
+      # The maximum size before a diff is collapsed.
+      DIFF_COLLAPSE_LIMIT = 10240 # 10 KB
+
       class << self
         def between(repo, head, base, options = {}, *paths)
           # Only show what is new in the source branch compared to the target branch, not the other way around.
@@ -158,12 +164,12 @@ module Gitlab
         end
       end
 
-      def initialize(raw_diff)
+      def initialize(raw_diff, collapse: false)
         case raw_diff
         when Hash
-          init_from_hash(raw_diff)
+          init_from_hash(raw_diff, collapse: collapse)
         when Rugged::Patch, Rugged::Diff::Delta
-          init_from_rugged(raw_diff)
+          init_from_rugged(raw_diff, collapse: collapse)
         when nil
           raise "Nil as raw diff passed"
         else
@@ -197,12 +203,16 @@ module Gitlab
 
       def too_large?
         if @too_large.nil?
-          @too_large = @diff.bytesize >= 102400 # 100 KB
+          @too_large = @diff.bytesize >= DIFF_SIZE_LIMIT
         else
           @too_large
         end
       end
 
+      def collapsible?
+        @diff.bytesize >= DIFF_COLLAPSE_LIMIT
+      end
+
       def prune_large_diff!
         @diff = ''
         @line_count = 0
@@ -214,10 +224,6 @@ module Gitlab
         false
       end
 
-      def collapsible?
-        @diff.bytesize >= 10240 # 10 KB
-      end
-
       def prune_collapsed_diff!
         @diff = ''
         @line_count = 0
@@ -226,9 +232,9 @@ module Gitlab
 
       private
 
-      def init_from_rugged(rugged)
+      def init_from_rugged(rugged, collapse: false)
         if rugged.is_a?(Rugged::Patch)
-          @diff = encode!(strip_diff_headers(rugged.to_s))
+          init_from_rugged_patch(rugged, collapse: collapse)
           d = rugged.delta
         else
           d = rugged
@@ -243,12 +249,46 @@ module Gitlab
         @deleted_file = d.deleted?
       end
 
-      def init_from_hash(hash)
+      def init_from_rugged_patch(patch, collapse: false)
+        # Don't bother initializing diffs that are too large. If a diff is
+        # binary we're not going to display anything so we skip the size check.
+        unless patch.delta.binary?
+          diff_size = patch_size(patch)
+
+          if diff_size >= DIFF_SIZE_LIMIT
+            prune_large_diff!
+            return
+          elsif collapse && diff_size >= DIFF_COLLAPSE_LIMIT
+            prune_collapsed_diff!
+            return
+          end
+        end
+
+        @diff = encode!(strip_diff_headers(patch.to_s))
+      end
+
+      def init_from_hash(hash, collapse: false)
         raw_diff = hash.symbolize_keys
 
         serialize_keys.each do |key|
           send(:"#{key}=", raw_diff[key.to_sym])
         end
+
+        prune_large_diff! if too_large?
+        prune_collapsed_diff! if collapse && collapsible?
+      end
+
+      # Returns the size of a diff without taking any diff markers into account.
+      def patch_size(patch)
+        size = 0
+
+        patch.each_hunk do |hunk|
+          hunk.each_line do |line|
+            size += line.content.bytesize
+          end
+        end
+
+        size
       end
 
       # Strip out the information at the beginning of the patch's text to match

data/lib/gitlab_git/diff_collection.rb

@@ -103,23 +103,12 @@ module Gitlab
             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
+          collapse = !@all_diffs && !@no_collapse
+
+          diff = Gitlab::Git::Diff.new(raw, collapse: collapse)
 
-          if !@all_diffs && !@no_collapse
-            if diff.collapsible? || over_safe_limits?(i)
-              diff.prune_collapsed_diff!
-            end
+          if collapse && over_safe_limits?(i)
+            diff.prune_collapsed_diff!
           end
 
           @line_count += diff.line_count

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 10.6.3
+  version: 10.6.4
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-linguist