git_spelunk 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d134035b13ff89d17adbfcf99948fbb3d2dbea8f
-  data.tar.gz: 6c11e700075909ed8c9784d442437f1ac9ef8d09
+  metadata.gz: 4a7fa06da8d61e779a69fb28667bf618cf067a15
+  data.tar.gz: 0e60161a7aea4de66fec9a6f64d7a164be6a4aba
 SHA512:
-  metadata.gz: 9b7870d7e485b8d8010256e8128ed7e0488d767043fc229017c6b274c52225900f914b5d89996f90d0ba823d2281847a26e08ab16286817c5abd035333f5f2d0
-  data.tar.gz: 2904e99c0ea0c88bf39e9082656b6481cd2a0b61c8d069dc1f6596aeb720d5f2654cde84aebf2413e7d5763597e2486d081d8699befb396eb606ac7b1c153e9e
+  metadata.gz: 52d04a313b56ea8297514a270d62af51c10985cbc600361ad5e4ecf1ed603f312c41da7fd97a0e54fe7be2c2c1b1a52fe1253479ccb882b51ea0d8aad3af4424
+  data.tar.gz: 9841ab6897ab0bfbc3abbbee1cf59331591393cfc6a13f0d9ac60d2af3711cf8c25a4623b5b8a34d66d273d1160d01ed0120f12a5c4eaaf23cd7e3d054ebe153

data/lib/git_spelunk/offset.rb

@@ -47,121 +47,134 @@ module GitSpelunk
       true
     end
 
-    def chunks
-      @chunks ||= diff_chunks(@repo.diff(@parent.id, @sha, @file_name))
-    end
-
-    def at_beginning_of_time?
-      @parent.nil?
-    end
-
-    def unable_to_trace_lineage?
-      @parent && (@chunks.nil? || target_chunk.nil?)
-    end
+    STATS_PATTERN=/@@ \-(\d+),(\d+) \+(\d+),(\d+) @@/
+    class Chunk
+      attr_reader :minus_offset, :minus_length, :plus_offset, :plus_length, :lines
 
-    def first_commit_for_file?
+      def initialize(data)
+        @minus_offset, @minus_length, @plus_offset, @plus_length = *extract_stats(data[0])
+        @lines = data[1..-1]
+      end
 
-    end
+      def has_line?(line_number)
+        plus_offset <= line_number && line_number <= (plus_offset + plus_length)
+      end
 
-    def line_number_to_parent
-      return :at_beginning_of_time unless @parent && chunks
-      chunk = target_chunk(@line_number)
-      return :unable_to_trace unless chunk
+      LineBlock = Struct.new(:offset, :data) do
+        def initialize(offset, line)
+          super(offset, [line])
+        end
 
-      parent_starting_line, parent_total_lines = parent_start_and_total(stats_line(chunk))
-      return :first_commit_for_file if parent_starting_line == 0 && parent_total_lines == 0
+        def type
+          data.first[0]
+        end
 
-      chunk_starting_line, chunk_total_lines = src_start_and_total(stats_line(chunk))
-      parent_line_offset = find_parent_line_number(diff_lines(chunk), @line_number, chunk_starting_line, chunk_total_lines)
-      parent_starting_line + parent_line_offset
-    end
+        def size
+          data.size
+        end
 
-    private
+        def <<(other)
+          data << other
+        end
+      end
 
-    def diff_chunks(diffs)
-      return nil if diffs.empty?
-      # split it into chunks: [["@@ -10,13 +10,18 @@", diffs], ["@@ -20,13 +20,18 @@", diffs, diff]]
-      multiple_chunks = diffs[0].diff.split(/(@@ \-\d+,\d+ \+\d+,\d+ @@.*?\n)/)
-      # Discard file name line
-      multiple_chunks[1..multiple_chunks.length].each_slice(2).to_a
-    end
+      def find_parent_line_number(target)
+        # separate in blocks of lines with the same prefix
 
+        old_line_number = minus_offset
+        new_line_number = plus_offset
 
-    def target_chunk(line_number)
-      chunks.select {|chunk| has_line?(chunk, line_number)}[0]
-    end
+        blocks = []
+        lines.each do |l|
+          next if l =~ /\/
+          last_block = blocks.last
 
-    def has_line?(chunk, line_number)
-      starting_line, total_lines = src_start_and_total(stats_line(chunk))
-      starting_line + total_lines >= line_number
-    end
+          if last_block.nil? || last_block.type != l[0]
+            blocks << LineBlock.new(old_line_number, l)
+          else
+            last_block << l
+          end
 
-    def src_start_and_total(line)
-      # Get the offset and line number where lines were added
-      # @@ -3,10 +3,17 @@ optionally a line\n   unchnaged_line_1\n-    deleted_line_1\n+    new_line_1"
-      line.scan(/\+(\d+),(\d+)/).first.map { |str| str.to_i }
-    end
+          if l[0] == "+" || l[0] == " "
+            if new_line_number == target
+              # important: we don't finish building the structure.
+              break
+            end
 
-    def parent_start_and_total(line)
-      line.scan(/\-(\d+),(\d+)/).first.map { |str| str.to_i }
-    end
+            new_line_number += 1
+          end
 
-    def find_parent_line_number(lines, src_line_number, src_starting_line, src_number_of_lines)
-      target_line_offset = src_line_number - src_starting_line
-      current_line_offset = parent_line_offset = diff_index = 0
+          if l[0] == "-" || l[0] == " "
+            old_line_number += 1
+          end
+        end
 
-      lines.each do |line|
-        break if current_line_offset == target_line_offset && src_line?(line)
+        addition_block = blocks.pop
+        last_old_block = blocks.last
 
-        if src_line?(line)
-          current_line_offset += 1
+        if last_old_block.type == " "
+          last_old_block.offset + (last_old_block.size - 1)
+        else
+          # offset N lines into last block, but don't go beyond the edge of it.
+          last_old_block.offset + [addition_block.size - 1, last_old_block.size].min
         end
+      end
 
-        if parent_line?(line)
-          parent_line_offset += 1
-        end
+      private
 
-        diff_index += 1
+      def extract_stats(l)
+        #@@ -1,355 +1,355 @@
+        l.scan(STATS_PATTERN).first.map(&:to_i)
       end
 
-      # find last contiguous bit of diff, and try to offset into that.
-      removals = additions = 0
-      diff_index -= 1
-
-      while diff_index > 0
-        line = lines[diff_index]
+      def old_has?(line)
+        # Src line will either have a "+" or will be an unchanged line
+        line[0] == '-' || line[0] == " "
+      end
 
-        break unless ["-", "+"].include?(line[0])
+      def new_has?(line)
+        # Src line will either have a "-" or will be an unchanged line
+        line[0] == '+' || line[0] == " "
+      end
+    end
 
-        if parent_line?(line)
-          removals += 1
-        else
-          additions += 1
+    def chunks
+      @chunks ||= begin
+        diffs = @repo.diff(@parent.id, @sha, @file_name)
+        return nil if diffs.empty?
+
+        chunks = diffs[0].diff.split(/\n/).inject([[]]) do |arr, line|
+          arr.push([]) if line =~ STATS_PATTERN
+          arr.last << line
+          arr
         end
 
-        diff_index -= 1
+        chunks[1..-1].map { |c| Chunk.new(c) } # slice off first chunk -- it's just the filename
       end
-
-      forward_push = [additions, removals - 1].min
-      (parent_line_offset - removals) + forward_push
     end
 
-    def src_line?(line)
-      # Src line will either have a "+" or will be an unchanged line
-      line[0] != '-'
+    def at_beginning_of_time?
+      @parent.nil?
     end
 
-    def parent_line?(line)
-      # Src line will either have a "-" or will be an unchanged line
-      line[0] != '+'
+    def unable_to_trace_lineage?
+      @parent && (@chunks.nil? || target_chunk.nil?)
     end
 
-    def stats_line(chunk)
-      chunk[0]
+    def line_number_to_parent
+      return :at_beginning_of_time unless @parent && chunks
+      chunk = target_chunk(@line_number)
+      return :unable_to_trace unless chunk
+
+      return :first_commit_for_file if chunk.minus_offset == 0 && chunk.minus_length == 0
+
+      chunk.find_parent_line_number(@line_number)
     end
 
-    def diff_lines(chunk)
-      chunk[1].split("\n")
+    private
+
+    def target_chunk(line_number)
+      chunks.find { |c| c.has_line?(line_number) }
     end
   end
 end

data/lib/git_spelunk/ui.rb

@@ -74,6 +74,7 @@ module GitSpelunk
         @file_context.line_number = @pager.cursor
         @history.push(@file_context)
 
+
         @file_context = @file_context.clone_for_blame_line(@pager.blame_line)
         @pager.data = @file_context.get_blame
         @pager.go_to(goto)

data/lib/git_spelunk/ui/pager.rb

@@ -29,8 +29,8 @@ module GitSpelunk
 
         view = Array.new(@height)
 
-        data[@top - 1,@height].each_with_index.map do |b, i|
-          line = view[i] = ""
+        data[@top - 1, @height].each_with_index do |b, i|
+          line = ""
           sha, content = b.sha, b.content
 
           line_number = i + @top
@@ -47,7 +47,8 @@ module GitSpelunk
           line << sha_abbrev
 
           line << " %*s " % [line_number_width, line_number]
-          line << content
+          line << content.gsub(/\r/, '')
+
 
           content_start = (sha_abbrev.size + line_number_width + 2)
 
@@ -57,8 +58,8 @@ module GitSpelunk
               styles.add(FOUND_COLOR, i, found...(found + @search_term.size))
             end
           end
-        end.join("\n")
-
+          view[i] = line
+        end
         [view, styles]
       end
 

data/lib/git_spelunk/version.rb

@@ -1,3 +1,3 @@
 module GitSpelunk
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_spelunk
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Ben Osheroff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit