gitlab_git 8.2.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b0f3419d64b2c0119bcdeb634baa4f1dfe0763b
-  data.tar.gz: 22fcc9bd22892c98fa2c6d1c1e013f2c7ebf8204
+  metadata.gz: e997dc18170db77f9b2ffad597f0cc1654f457a8
+  data.tar.gz: d557e66cdbaa42781d0ad422c91d969cb1a91af6
 SHA512:
-  metadata.gz: b8bdb953c22028834f1af0ed0203886b701c0c49ad0c8738037fcb0abb10e43a93d8ba56c883d678dfd238be39ebbd631fd574fa26ce73d909a76d6bfcdf39ae
-  data.tar.gz: 3dc2d199d45f7c503c45f38d47c99d154b3f1eb2dac7ef6ae4ebf5734054824796cdac1a9787b42fb85ab5ff9c417e91086e0695b9467296e896ee709251c551
+  metadata.gz: cc478f222265b20bb57a26ec2f85f75863dd5f89a61cba9a9299c999e853a8a69896bcbeec880570f9c69a19fcf04b9285e87242c78519b384b05e3dbe68dd68
+  data.tar.gz: 753dec7e037607af0ceaf47dd260d061f8799d0b5fd0eab598a048b1765de44e3217ed8f9e0f9041d49dc1c864762b6373dbba4c74213199e5d3ec714fdeba99

data/VERSION

@@ -1 +1 @@
-8.2.0
+9.0.0

data/lib/gitlab_git.rb

@@ -17,9 +17,11 @@ require_relative "gitlab_git/commit"
 require_relative "gitlab_git/commit_stats"
 require_relative "gitlab_git/compare"
 require_relative "gitlab_git/diff"
+require_relative "gitlab_git/diff_collection"
 require_relative "gitlab_git/repository"
 require_relative "gitlab_git/tree"
 require_relative "gitlab_git/blob_snippet"
 require_relative "gitlab_git/ref"
 require_relative "gitlab_git/branch"
 require_relative "gitlab_git/tag"
+require_relative "gitlab_git/util"

data/lib/gitlab_git/commit.rb

@@ -205,7 +205,7 @@ module Gitlab
       end
 
       def diffs(options = {})
-        diff_from_parent(options).map { |diff| Gitlab::Git::Diff.new(diff) }
+        DiffCollection.new(diff_from_parent(options), options)
       end
 
       def parents

data/lib/gitlab_git/compare.rb

@@ -1,13 +1,12 @@
 module Gitlab
   module Git
     class Compare
-      attr_reader :commits, :diffs, :same, :timeout, :head, :base
+      attr_reader :commits, :same, :head, :base
 
       def initialize(repository, base, head)
-        @commits, @diffs = [], []
+        @commits = []
         @same = false
         @repository = repository
-        @timeout = false
 
         return unless base && head
 
@@ -24,30 +23,13 @@ module Gitlab
         @commits = Gitlab::Git::Commit.between(repository, @base.id, @head.id)
       end
 
-      def diffs(paths = nil, options = {})
+      def diffs(options = {})
         unless @head && @base
-          return []
+          return Gitlab::Git::DiffCollection.new([])
         end
 
-        # Try to collect diff only if diffs is empty
-        # Otherwise return cached version
-        if @diffs.empty? && @timeout == false
-          begin
-            @diffs = Gitlab::Git::Diff.between(@repository, @head.id, @base.id,
-                                               options, *paths)
-          rescue Gitlab::Git::Diff::TimeoutError => ex
-            @diffs = []
-            @timeout = true
-          end
-        end
-
-        @diffs
-      end
-
-      # Check if diff is empty because it is actually empty
-      # and not because its impossible to get it
-      def empty_diff?
-        diffs.empty? && timeout == false
+        paths = options.delete(:paths) || []
+        Gitlab::Git::Diff.between(@repository, @head.id, @base.id, options, *paths)
       end
     end
   end

data/lib/gitlab_git/diff.rb

@@ -130,7 +130,8 @@ module Gitlab
                              :disable_pathspec_match, :deltas_are_icase,
                              :include_untracked_content, :skip_binary_check,
                              :include_typechange, :include_typechange_trees,
-                             :ignore_filemode, :recurse_ignored_dirs, :paths]
+                             :ignore_filemode, :recurse_ignored_dirs, :paths,
+                             :max_files, :max_lines, :all_diffs]
 
           if default_options
             actual_defaults = default_options.dup
@@ -187,6 +188,10 @@ module Gitlab
         a_mode == '160000' || b_mode == '160000'
       end
 
+      def line_count
+        @line_count ||= Util.count_lines(@diff)
+      end
+
       private
 
       def init_from_rugged(rugged)

data/lib/gitlab_git/diff_collection.rb

@@ -0,0 +1,90 @@
+module Gitlab
+  module Git
+    class DiffCollection
+      include Enumerable
+
+      DEFAULT_LIMITS = { max_files: 100, max_lines: 5000 }.freeze
+
+      def initialize(iterator, options={})
+        @iterator = iterator
+        @max_files = options.fetch(:max_files, DEFAULT_LIMITS[:max_files])
+        @max_lines = options.fetch(:max_lines, DEFAULT_LIMITS[:max_lines])
+        @all_diffs = !!options.fetch(:all_diffs, false)
+
+        @line_count = 0
+        @overflow = false
+        @array = Array.new
+      end
+
+      def each
+        @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)
+
+          @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.
+            @overflow = true
+            break
+          end
+
+          yield @array[i] = diff
+        end
+      end
+
+      def empty?
+        !@iterator.any?
+      end
+
+      def overflow?
+        populate!
+        !!@overflow
+      end
+
+      def size
+        @size ||= count # forces a loop through @iterator
+      end
+
+      def real_size
+        populate!
+
+        if @overflow
+          "#{size}+"
+        else
+          size.to_s
+        end
+      end
+
+      def decorate!
+        each_with_index do |element, i|
+          @array[i] = yield(element)
+        end
+      end
+
+      private
+
+      def populate!
+        return if @populated
+
+        each { nil } # force a loop through all diffs
+        @populated = true
+        nil
+      end
+    end
+  end
+end

data/lib/gitlab_git/repository.rb

@@ -320,9 +320,7 @@ module Gitlab
       # diff options.  The +options+ hash can also include :break_rewrites to
       # split larger rewrites into delete/add pairs.
       def diff(from, to, options = {}, *paths)
-        diff_patches(from, to, options, *paths).map do |p|
-          Gitlab::Git::Diff.new(p)
-        end
+        DiffCollection.new(diff_patches(from, to, options, *paths), options)
       end
 
       # Return the diff between +from+ and +to+ in a single patch string.  The

data/lib/gitlab_git/util.rb

@@ -0,0 +1,18 @@
+module Gitlab
+  module Git
+    module Util
+      LINE_SEP = "\n"
+
+      def self.count_lines(string)
+        case string[-1]
+        when nil
+          0
+        when LINE_SEP
+          string.count(LINE_SEP)
+        else
+          string.count(LINE_SEP) + 1
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 8.2.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-linguist
@@ -82,6 +82,7 @@ files:
 - lib/gitlab_git/commit_stats.rb
 - lib/gitlab_git/compare.rb
 - lib/gitlab_git/diff.rb
+- lib/gitlab_git/diff_collection.rb
 - lib/gitlab_git/encoding_helper.rb
 - lib/gitlab_git/path_helper.rb
 - lib/gitlab_git/popen.rb
@@ -89,6 +90,7 @@ files:
 - lib/gitlab_git/repository.rb
 - lib/gitlab_git/tag.rb
 - lib/gitlab_git/tree.rb
+- lib/gitlab_git/util.rb
 homepage: http://rubygems.org/gems/gitlab_git
 licenses:
 - MIT
@@ -109,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Gitlab::Git library