gitlab_git 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6153bb71b711454165303016cafd44943691bcf6
-  data.tar.gz: 05faffaaa0c4346fbfda09b80d24692044c7a3c4
+  metadata.gz: 5f61306b02ce00f09ae58472e5d486e4ed676388
+  data.tar.gz: 823cea793f9f714ea3b2a9459a7119ad5d80ad40
 SHA512:
-  metadata.gz: ae2038afe8f25b18e141969b0099ea3d64fcca4475bfd287f1bc5fd7089c5ee3092d7e36e2191d633b89546c2d6ac941090d7f8ee3198fe1b23e2e7d1af93066
-  data.tar.gz: 190841dbc36231e05a999fb3c6f4a848d4e6d5d8d51b85925e3ca325dd4902851ac5493cd70bf0385be90014bb03e4ca59681db6075385eda12854b6fd39ff7d
+  metadata.gz: f42e53e6b8662cd00f839539348033ca9437cf15b2e3b144542502a38f3aeda9b42d7074b853604a3b4201999e6440e1859e46c890491bdafef044e6e8214a5c
+  data.tar.gz: 1a17eb07cc61c26c005940c308d77b3ed2987e82c4b0109727e7b7576d39d5dce15247cb183ce414e19f6d3966939ea48dba6b43d08b501702b2288806144518

data/lib/gitlab_git/commit.rb

@@ -91,6 +91,11 @@ module Gitlab
           end
         end
 
+        # Delegate Repository#find_commits
+        def find_all(repo, options = {})
+          repo.find_commits(options)
+        end
+
         def decorate(commit, ref = nil)
           Gitlab::Git::Commit.new(commit, ref)
         end
@@ -190,6 +195,24 @@ module Gitlab
         raw_commit.to_patch
       end
 
+      # Get refs collection(Grit::Head or Grit::Remote or Grit::Tag)
+      #
+      # Ex.
+      #   commit.ref(repo)
+      #
+      def refs(repo)
+        repo.refs_hash[id]
+      end
+
+      # Get ref names collection
+      #
+      # Ex.
+      #   commit.ref_names(repo)
+      #
+      def ref_names(repo)
+        refs(repo).map(&:name)
+      end
+
       private
 
       def init_from_grit(grit)

data/lib/gitlab_git/git_stats.rb

@@ -11,9 +11,9 @@ module Gitlab
 
       def log
         log = nil
-        Grit::Git.with_timeout(15) do
-          # Limit log to 8k commits to avoid timeout for huge projects
-          args = ['-8000', '--format=%aN%x0a%aE%x0a%cd', '--date=short', '--shortstat', '--no-merges']
+        Grit::Git.with_timeout(30) do
+          # Limit log to 6k commits to avoid timeout for huge projects
+          args = ['-6000', '--format=%aN%x0a%aE%x0a%cd', '--date=short', '--shortstat', '--no-merges']
           log = repo.git.run(nil, 'log', nil, {}, args)
         end
 

data/lib/gitlab_git/repository.rb

@@ -199,6 +199,96 @@ module Gitlab
       def diff(from, to)
         raw.diff(from, to)
       end
+
+      # Returns commits collection
+      #
+      # Ex.
+      #   repo.find_commits(
+      #     ref: 'master',
+      #     max_count: 10,
+      #     skip: 5,
+      #     order: :date
+      #   )
+      #
+      #   +options+ is a Hash of optional arguments to git
+      #     :ref is the ref from which to begin (SHA1 or name)
+      #     :contains is the commit contained by the refs from which to begin (SHA1 or name)
+      #     :max_count is the maximum number of commits to fetch
+      #     :skip is the number of commits to skip
+      #     :order is the commits order and allowed value is :date(default) or :topo
+      #
+      def find_commits(options = {})
+        actual_options = options.dup
+
+        allowed_options = [:ref, :max_count, :skip, :contains, :order]
+
+        actual_options.keep_if do |key, value|
+          allowed_options.include?(key)
+        end
+
+        default_options = {pretty: 'raw', order: :date}
+
+        actual_options = default_options.merge(actual_options)
+
+        order = actual_options.delete(:order)
+
+        case order
+        when :date
+          actual_options[:date_order] = true
+        when :topo
+          actual_options[:topo_order] = true
+        end
+
+        ref = actual_options.delete(:ref)
+
+        containing_commit = actual_options.delete(:contains)
+
+        args = []
+
+        if ref
+          args.push(ref)
+        elsif containing_commit
+          args.push(*branch_names_contains(containing_commit))
+        else
+          actual_options[:all] = true
+        end
+
+        output = raw.git.native(:rev_list, actual_options, *args)
+
+        Grit::Commit.list_from_string(raw, output).map do |commit|
+          Gitlab::Git::Commit.decorate(commit)
+        end
+      rescue Grit::GitRuby::Repository::NoSuchShaFound
+        []
+      end
+
+      # Returns branch names collection that contains the special commit(SHA1 or name)
+      #
+      # Ex.
+      #   repo.branch_names_contains('master')
+      #
+      def branch_names_contains(commit)
+        output = raw.git.native(:branch, {contains: true}, commit)
+        # The output is expected as follow
+        #   fix-aaa
+        #   fix-bbb
+        # * master
+        output.scan(/[^* \n]+/)
+      end
+
+      # Get refs hash which key is SHA1 and value is ref object(Grit::Head or Grit::Remote or Grit::Tag)
+      def refs_hash
+        # Initialize only when first call
+        if @refs_hash.nil?
+          @refs_hash = Hash.new { |h, k| h[k] = [] }
+
+          @raw.refs.each do |r|
+            @refs_hash[r.commit.id] << r
+          end
+        end
+
+        @refs_hash
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Dmitriy Zaporozhets