gitlab_git 9.0.3 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9de29ada902161092fb9e47fdeca8aa6181a13bf
-  data.tar.gz: 94075ed61b45d324b5d5766eac2476b52cdd2ee8
+  metadata.gz: 31c6a37123aa6b3d2a4e5a51508fd0bb46f3fa65
+  data.tar.gz: 1f9dd6e2548aca96d1b367435e131c78b1c12679
 SHA512:
-  metadata.gz: 96fb73a3d63714cb9b00f05fc656c65efc4384c10da24aff43bf9eab3e39140da912b839da72b0d1e6459e767b0774e9a114035020d8e2d2941be323b0215055
-  data.tar.gz: 24fee34bba8b1db85b464aa69eace2d85be2be4f949fd627a123dafe817f08998cf101e554f6ec87eade7ee9932b68a5394f161ac2aa2844fd3e40919bb4f5a8
+  metadata.gz: 1852e5944d7ec3a02a0c745aa09d381f72cd9233b7bbb92d1ab38582e346ba900b75faea720aa0cdf51c3b8c86e7b1b94c5a8d69e52f105cd1e2ec35de51d7c4
+  data.tar.gz: 9ea1b801930d276a3de2cbf0ff3ad7e425a333d744c6d18ff34f769d00ff8c4d63a7916feef21632f45a87f2678e3c59c2d1539de79afc7edd64a1c7ccb35441

data/VERSION

@@ -1 +1 @@
-9.0.3
+10.0.0

data/lib/gitlab_git/diff.rb

@@ -11,6 +11,8 @@ module Gitlab
       # Stats properties
       attr_accessor :new_file, :renamed_file, :deleted_file
 
+      attr_accessor :too_large
+
       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.
@@ -169,7 +171,7 @@ module Gitlab
       end
 
       def serialize_keys
-        @serialize_keys ||= %i(diff new_path old_path a_mode b_mode new_file renamed_file deleted_file)
+        @serialize_keys ||= %i(diff new_path old_path a_mode b_mode new_file renamed_file deleted_file too_large)
       end
 
       def to_hash
@@ -192,6 +194,20 @@ module Gitlab
         @line_count ||= Util.count_lines(@diff)
       end
 
+      def too_large?
+        if @too_large.nil?
+          @too_large = @diff.bytesize >= 102400 # 100 KB
+        else
+          @too_large
+        end
+      end
+
+      def prune_large_diff!
+        @diff = ''
+        @line_count = 0
+        @too_large = true
+      end
+
       private
 
       def init_from_rugged(rugged)

data/lib/gitlab_git/diff_collection.rb

@@ -35,7 +35,18 @@ module Gitlab
           # 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
+
           @line_count += diff.line_count
+
           if !@all_diffs && @line_count >= @max_lines
             # This last Diff instance pushes us over the lines limit. We stop and
             # discard it.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 9.0.3
+  version: 10.0.0
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-linguist
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0b13
+        version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0b13
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
   requirement: !ruby/object:Gem::Requirement
@@ -111,8 +111,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: