gitlab_git 2.0.0.pre → 2.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0725f82100a19e889e298d9547374c6f2aa447e4
-  data.tar.gz: 885471b182cd540905c1c60e7a50ac56304e4cce
+  metadata.gz: da25f5e49b2f2f7cacb78576ab4a3fde6bb0cf56
+  data.tar.gz: 340e2be3999981b3fa56bbbaa6c93fd47d0b5ff0
 SHA512:
-  metadata.gz: ed5d10618f109693809cef7d4de650c2ed187764ef33f2bf0c73b8a3ff46dde815191699318ef9be4fdfaa0d4980bc117750e64eb4c66de221daea891e3ac95e
-  data.tar.gz: 5a8a963698a50196d6fcb1474dbc2e9a387699fefd71c8d85c2fe750b11850cf91c785f6e1242c2b81c306a2e27535a5bf77fa81a4e76e00d718f8604c5fcb1d
+  metadata.gz: 4a44c137700945c9cb02b964ea79f886db546e7497c286be637ac3e6dcf0a5111ee6766bd9d77764516f625be9298364aa415f3578d9bdc65790707a460abe93
+  data.tar.gz: 435685c2c27baef6d6fb581ff3c35781bd7a4b356a1bee2ac44f9e84095cecc28f42f45c2cd0107a9d7ce98852e2ab67388a33c8f9a4180f6d69439bea8a93f4

data/lib/gitlab_git/git_stats.rb

@@ -10,7 +10,8 @@ module Gitlab
       end
 
       def log
-        args = ['--format=%aN%x0a%ad', '--date=short', '--shortstat', '--no-merges']
+        # 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']
         repo.git.run(nil, 'log', nil, {}, args)
       rescue Grit::Git::GitTimeout
         nil

data/lib/gitlab_git/log_parser.rb

@@ -2,31 +2,23 @@ module Gitlab
   module Git
     class LogParser
       # Parses the log file into a collection of commits
-      # Data model: {author, date, additions, deletions}
-      def self.parse_log log_from_git
+      # Data model:
+      #   {author_name, author_email, date, additions, deletions}
+      def self.parse_log(log_from_git)
         log = log_from_git.split("\n")
-
-        i = 0
         collection = []
-        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
+        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?
+
+          collection.push(entry)
         end
 
         collection

metadata

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