gitlab_git 2.0.0.beta → 2.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 721ce63ea203619c49c42fd796634d7076ebad3b
-  data.tar.gz: 3d7ac5846bc15878beddfedb4bc8378048359d43
+  metadata.gz: 0725f82100a19e889e298d9547374c6f2aa447e4
+  data.tar.gz: 885471b182cd540905c1c60e7a50ac56304e4cce
 SHA512:
-  metadata.gz: 216f0f37fa7f9b38ce2bf9710ed9773210af4128e6f874124f0c5e26865fcf9739ef8d38cddea671c05c195fe7021dd4287a1d8f2511f8618400539e1833c799
-  data.tar.gz: 4df9626fbf0a5c1c18d603d64bc93fa7a998dccddaac7ae424461bbf36fc11b0f9e73f7817f6beb456cb43fcb89e2d124da2d1fe439e00a08f5676adf146235f
+  metadata.gz: ed5d10618f109693809cef7d4de650c2ed187764ef33f2bf0c73b8a3ff46dde815191699318ef9be4fdfaa0d4980bc117750e64eb4c66de221daea891e3ac95e
+  data.tar.gz: 5a8a963698a50196d6fcb1474dbc2e9a387699fefd71c8d85c2fe750b11850cf91c785f6e1242c2b81c306a2e27535a5bf77fa81a4e76e00d718f8604c5fcb1d

data/lib/gitlab_git/git_stats.rb

@@ -10,8 +10,7 @@ module Gitlab
       end
 
       def log
-        # Limit log to 8k commits to avoid timeout for huge projects
-        args = ['--format=%aN%x0a%aE%x0a%ad', '--date=short', '--shortstat', '--no-merges', '--max-count=8000']
+        args = ['--format=%aN%x0a%ad', '--date=short', '--shortstat', '--no-merges']
         repo.git.run(nil, 'log', nil, {}, args)
       rescue Grit::Git::GitTimeout
         nil

data/lib/gitlab_git/log_parser.rb

@@ -2,23 +2,31 @@ module Gitlab
   module Git
     class LogParser
       # Parses the log file into a collection of commits
-      # Data model:
-      #   {author_name, author_email, date, additions, deletions}
-      def self.parse_log(log_from_git)
+      # Data model: {author, date, additions, deletions}
+      def self.parse_log log_from_git
         log = log_from_git.split("\n")
-        collection = []
-
-        log.each_slice(5) do |slice|
-          entry = {}
-          entry[:author_name] = slice[0]
-          entry[:author_email] = slice[1]
-          entry[:date] = slice[2]
 
-          changes = slice[4].split(",")
-          entry[:additions] = changes[1].to_i unless changes[1].nil?
-          entry[:deletions] = changes[2].to_i unless changes[2].nil?
+        i = 0
+        collection = []
+        entry = {}
 
-          collection.push(entry)
+        while i <= log.size do
+          pos = i % 4
+          case pos
+          when 0
+            unless i == 0
+              collection.push(entry)
+              entry = {}
+            end
+            entry[:author] = log[i].to_s
+          when 1
+            entry[:date] = log[i].to_s
+          when 3
+            changes = log[i].split(",")
+            entry[:additions] = changes[1].to_i unless changes[1].nil?
+            entry[:deletions] = changes[2].to_i unless changes[2].nil?
+          end
+          i += 1
         end
 
         collection

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta
+  version: 2.0.0.pre
 platform: ruby
 authors:
 - Dmitriy Zaporozhets