gitlab_git 7.2.8 → 7.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fb286d72a72f537e6256122e9017c6901e7534f
-  data.tar.gz: a65bf64b798e5bdc6ed45f8a9837b8bd9e5437bb
+  metadata.gz: 093a48bc5387399df0b770442205dbc5d782f840
+  data.tar.gz: 9bbc121aad494a63764ff35f97332fce368883b6
 SHA512:
-  metadata.gz: cd4a03b4bc7fbeef4436f919855ad0f9f424387f22ab8e09a78d12fa60925017f4e59e2157bba93c39dd2e833b83fd5fddde92248fb70134a37452d91cb8a948
-  data.tar.gz: 0002e83c7288132e5cd7a8ba70696bbc3dd8d04748b988abbf64777612c65be5cfbe81991c5cedc5474096f8bac03ab781fb32b832eecf16e1438a9fe931bbad
+  metadata.gz: c655e5aa4856d822a7b5e46b12efa7da8494226edeee121c8622148d7c239f262c8e95ead052fc159b20e5be210a24519c5b791ca717322aada3d8923399d19e
+  data.tar.gz: 276b8610c80c368daedb4f793311fc86564eb64b5f916d8f7b251b9635a4799e1d87ddfb9a8073db75d5c45ee58a67262e4e8d675bb152fa8be2dd37a8e4ab0e

data/VERSION

@@ -1 +1 @@
-7.2.8
+7.2.9

data/lib/gitlab_git/repository.rb

@@ -278,10 +278,23 @@ module Gitlab
         options[:offset] ||= 0
         actual_ref = options[:ref] || root_ref
         sha = sha_from_ref(actual_ref)
-        build_log(sha, options)
-      rescue Rugged::OdbError, Rugged::InvalidError, Rugged::ReferenceError
-        # Return an empty array if the ref wasn't found
-        []
+        repo = options[:repo]
+
+        cmd = %W(git -C #{path} log)
+        cmd << %W(-n #{options[:limit].to_i})
+        cmd << %W(--skip=#{options[:offset].to_i})
+        cmd << %W(--follow) if options[:follow]
+        cmd << %W(--no-merges) if options[:skip_merges]
+        cmd << sha
+        cmd << %W(-- #{options[:path]}) if options[:path]
+
+        raw_output = IO.popen(cmd.flatten) {|io| io.read }
+
+        log = raw_output.scan(/commit\ ([0-9a-f]{40})/).flatten.map do |c|
+          Rugged::Commit.new(rugged, c)
+        end
+
+        log.is_a?(Array) ? log : []
       end
 
       def sha_from_ref(ref)
@@ -837,46 +850,6 @@ module Gitlab
         results
       end
 
-      # Return an array of log commits, given an SHA hash and a hash of
-      # options.
-      def build_log(sha, options)
-        # Instantiate a Walker and add the SHA hash
-        walker = Rugged::Walker.new(rugged)
-        walker.push(sha)
-
-        commits = []
-        skipped = 0
-        current_path = options[:path]
-        current_path = nil if current_path == ''
-
-        limit = options[:limit].to_i
-        offset = options[:offset].to_i
-        skip_merges = options[:skip_merges]
-
-        walker.sorting(Rugged::SORT_DATE)
-        walker.each do |c|
-          break if limit > 0 && commits.length >= limit
-
-          if skip_merges
-            # Skip merge commits
-            next if c.parents.length > 1
-          end
-
-          if !current_path ||
-            commit_touches_path?(c, current_path, options[:follow], walker)
-
-            # This is a commit we care about, unless we haven't skipped enough
-            # yet
-            skipped += 1
-            commits.push(c) if skipped > offset
-          end
-        end
-
-        walker.reset
-
-        commits
-      end
-
       # Returns true if +commit+ introduced changes to +path+, using commit
       # trees to make that determination.  Uses the history simplification
       # rules that `git log` uses by default, where a commit is omitted if it

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.2.8
+  version: 7.2.9
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Gitlab::Git library