gitlab_git 7.2.11 → 7.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50788ad664893b2875689cfa12eb02c5bd730ec1
-  data.tar.gz: fcf06c07bd60c4e88d049ee75eb7fc7724819036
+  metadata.gz: 3dfe1adc18e236f4674a8a9444280bad676a7813
+  data.tar.gz: 8071dc50122e79328543e6a14965141d58450914
 SHA512:
-  metadata.gz: 039657190c51f2a0e2b18680c6ab70d878ad89795ea1866b161b59e4be645e337652391097b645f75e465a155d30b57ce113c012066279763494ce84fa8f2fff
-  data.tar.gz: 40d9f6f79c4820ea7a0a99730c463f85f4e71ae9702217df120bce263c9fc010b632302cf3747d0eff3dea19c98563597f7d21f61a43782dd8646712f546407c
+  metadata.gz: ed619af4decb82283bd18af7842d0abd3fb6433b3999ae395cd85d99eba84f8fcbb77305676aac13d387ceadfd81dfe800c7821e3b36c31fc779c8a198fa8f65
+  data.tar.gz: dc1bc45f26596917a2adc26bab5e94a0ee64655ca84f407259049f8f5ec65fbf29155d8d04b92cb95cdab5f3b2378665ad5c47d65457d93f6af2093ac04ec6ac

data/VERSION

@@ -1 +1 @@
-7.2.11
+7.2.12

data/lib/gitlab_git/blame.rb

@@ -1,24 +1,70 @@
 module Gitlab
   module Git
     class Blame
-      attr_accessor :blob
+      attr_reader :lines, :blames
 
       def initialize(repository, sha, path)
-        @repo = repository.rugged
-        @blame = Rugged::Blame.new(@repo, path, { newest_commit: sha })
-        @blob = Blob.find(repository, sha, path)
-        @lines = @blob.data.split("\n")
+        @repo = repository
+        @sha = sha
+        @path = path
+        @lines = []
+        @blames = load_blame
       end
 
       def each
-        @blame.each do |blame|
-          from = blame[:final_start_line_number] - 1
-          commit = @repo.lookup(blame[:final_commit_id])
+        @blames.each do |blame|
+          yield(
+            Gitlab::Git::Commit.new(blame.commit),
+            blame.line
+          )
+        end
+      end
+
+      private
+
+      def load_blame
+        cmd = %W(git --git-dir=#{@repo.path} blame -p #{@sha} -- #{@path})
+        raw_output = IO.popen(cmd) {|io| io.read }
+        process_raw_blame raw_output
+      end
+
+      def process_raw_blame(output)
+        lines, final = [], []
+        info, commits = {}, {}
+
+        # process the output
+        output.split("\n").each do |line|
+          if line[0, 1] == "\t"
+            lines << line[1, line.size]
+          elsif m = /^(\w{40}) (\d+) (\d+)/.match(line)
+            commit_id, old_lineno, lineno = m[1], m[2].to_i, m[3].to_i
+            commits[commit_id] = nil if !commits.key?(commit_id)
+            info[lineno] = [commit_id, old_lineno]
+          end
+        end
+
+        # load all commits in single call
+        commits.keys.each do |key|
+          commits[key] = @repo.lookup(key)
+        end
 
-          yield(Gitlab::Git::Commit.new(commit),
-              @lines[from, blame[:lines_in_hunk]] || [],
-              blame[:final_start_line_number])
+        # get it together
+        info.sort.each do |lineno, (commit_id, old_lineno)|
+          commit = commits[commit_id]
+          final << BlameLine.new(lineno, old_lineno, commit, lines[lineno - 1])
         end
+
+        @lines = final
+      end
+    end
+
+    class BlameLine
+      attr_accessor :lineno, :oldlineno, :commit, :line
+      def initialize(lineno, oldlineno, commit, line)
+        @lineno = lineno
+        @oldlineno = oldlineno
+        @commit = commit
+        @line = line
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.2.11
+  version: 7.2.12
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-linguist
@@ -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