gitlab_git 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2108e7b969cd3dac473e6eb14311a72bf84972d
-  data.tar.gz: cafd1804445e5ee667fc98e9c6d9aa4d2c6d346b
+  metadata.gz: bdfbfd59004423e86997c1ea7c70bfbcf685eb4b
+  data.tar.gz: 02e1b56a8f1dd1c3ea1af62cb6758df1e8584f2e
 SHA512:
-  metadata.gz: d7005c9028474ca9bfc742980c1e66010add94963d1959bc37cedea82718ca448a7091d23155f69625199d0492ae630d006b7fc35a706448183081e0b34bc6ff
-  data.tar.gz: a6f8bdfe302fa68d094dc1bd3ed19aa217a028efb24cc0166e97bcf26c50cf8a0ca644c3c5a8bd84de9512c3154970f38b21293715a9dd7ae0d1f5d9b4d791c9
+  metadata.gz: 2b4d1899314ac9914ab7f7fa25cfdb2f90b464f27b6fb389ae1789e1e99b80e45125a74bb9acce4cea256af5771f400fc3666d01f6e571289a502551a47c9bbd
+  data.tar.gz: d00e12fd0cb1f3cfe2437ebc16b3b0714bc04e098e19679f4e637b89e5574c4ee59a0bc8bc475ad3557b26851b26cd27981cbe00921ae4e1af091da9a913a032

data/lib/gitlab_git/compare.rb

@@ -7,26 +7,28 @@ module Gitlab
         @commits, @diffs = [], []
         @commit = nil
         @same = false
+        @limit = limit
+        @repository = repository
 
         return unless from && to
 
-        base = Gitlab::Git::Commit.find(repository, from.try(:strip))
-        head = Gitlab::Git::Commit.find(repository, to.try(:strip))
+        @base = Gitlab::Git::Commit.find(repository, from.try(:strip))
+        @head = Gitlab::Git::Commit.find(repository, to.try(:strip))
 
-        return unless base && head
+        return unless @base && @head
 
-        if base.id == head.id
+        if @base.id == @head.id
           @same = true
           return
         end
 
-        @commit = head
-        @commits = Gitlab::Git::Commit.between(repository, base.id, head.id)
-        @diffs = if @commits.size > limit
-                   []
-                 else
-                   Gitlab::Git::Diff.between(repository, head.id, base.id) rescue []
-                 end
+        @commit = @head
+        @commits = Gitlab::Git::Commit.between(repository, @base.id, @head.id)
+      end
+
+      def diffs(paths = nil)
+        return [] if @commits.size > @limit
+        Gitlab::Git::Diff.between(@repository, @head.id, @base.id, *paths) rescue []
       end
     end
   end

data/lib/gitlab_git/diff.rb

@@ -15,13 +15,13 @@ module Gitlab
       attr_accessor  :new_file, :renamed_file, :deleted_file
 
       class << self
-        def between(repo, head, base)
+        def between(repo, head, base, *paths)
           # Only show what is new in the source branch compared to the target branch, not the other way around.
           # The linex below with merge_base is equivalent to diff with three dots (git diff branch1...branch2)
           # From the git documentation: "git diff A...B" is equivalent to "git diff $(git-merge-base A B) B"
           common_commit = repo.merge_base_commit(head, base)
 
-          repo.diff(common_commit, head).map do |diff|
+          repo.diff(common_commit, head, *paths).map do |diff|
             Gitlab::Git::Diff.new(diff)
           end
         rescue Grit::Git::GitTimeout

data/lib/gitlab_git/repository.rb

@@ -200,8 +200,8 @@ module Gitlab
         grit.git.native(:merge_base, {}, [to, from]).strip
       end
 
-      def diff(from, to)
-        grit.diff(from, to)
+      def diff(from, to, *paths)
+        grit.diff(from, to, *paths)
       end
 
       # Returns commits collection

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-linguist
@@ -38,20 +38,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.1
-- !ruby/object:Gem::Dependency
-  name: gitlab-pygments.rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement