gitlab_git 5.3.0 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddb7cedb6dcc41c8e2ba624b7718fcfd76f1474a
-  data.tar.gz: 300923b0bb6c9dd1957b186c499cf04ef22e8d9d
+  metadata.gz: a55120d34d9e9b2087ebb986213e27d01d1fe76b
+  data.tar.gz: fa165fd88b30db8cdfe33b0d9525088b0f505993
 SHA512:
-  metadata.gz: 1bc8919844978c5070f8507a5368199717273cef573c60023caa3ea78d5ff19c0f4ce5859b2527573666d4780052436dad6f69a70c31bc80c6cfc07eef59050f
-  data.tar.gz: 5ffa553d9dd5f5aa008da4474dae67c679cac65efcd99caa67d0e8c5792a5ca0a78ca26da77d04decf5f2e061336f1a0e7312867f24632fa712c64f24d7a567d
+  metadata.gz: a271874e14e54fca6437a92709b0249383983f80f2d49439f11ff12b4e195ca347f8c3de8b46523b01f3225241859eae00b8695d85d4fefb7fe839814eda9aed
+  data.tar.gz: e5445e97d57aaf696886791a17aba0e1e1e1dd177d8e68cc9b7aa68d4915b50f9697c7d5d9d4e504778665f1eb7111895b721a306e1739b05d06f06d2b9d250d

data/VERSION

@@ -1 +1 @@
-5.3.0
+5.4.0

data/lib/gitlab_git.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'grit'
 require 'linguist'
 require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/object/try'
 require 'grit'
 require 'grit_ext'
 require 'rugged'

data/lib/gitlab_git/compare.rb

@@ -1,7 +1,7 @@
 module Gitlab
   module Git
     class Compare
-      attr_accessor :commits, :commit, :diffs, :same
+      attr_accessor :commits, :commit, :diffs, :same, :limit, :timeout
 
       def initialize(repository, from, to, limit = 100)
         @commits, @diffs = [], []
@@ -9,6 +9,7 @@ module Gitlab
         @same = false
         @limit = limit
         @repository = repository
+        @timeout = false
 
         return unless from && to
 
@@ -27,10 +28,33 @@ module Gitlab
       end
 
       def diffs(paths = nil)
-        return [] if @commits.size > @limit
-        Gitlab::Git::Diff.between(@repository, @head.id, @base.id, *paths) rescue []
+        # Return empty array if amount of commits
+        # more than specified limit
+        return [] if commits_over_limit?
+
+        # 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, *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 && commits.size < limit
+      end
+
+      def commits_over_limit?
+        commits.size > limit
       end
     end
   end
 end
-

data/lib/gitlab_git/diff.rb

@@ -4,7 +4,7 @@
 module Gitlab
   module Git
     class Diff
-      BROKEN_DIFF = "--broken-diff"
+      class TimeoutError < StandardError; end
 
       attr_accessor :raw_diff
 
@@ -25,7 +25,7 @@ module Gitlab
             Gitlab::Git::Diff.new(diff)
           end
         rescue Grit::Git::GitTimeout
-          [Gitlab::Git::Diff::BROKEN_DIFF]
+          raise TimeoutError.new("Diff.between exited with timeout")
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.4.0
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-linguist