gitlab_git 7.0.0.rc11 → 7.0.0.rc12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01d35bccb72fd1412692b9c65341610f78616595
-  data.tar.gz: 636bf49e47997552e56cd1af4858632621701283
+  metadata.gz: 44a52af0f3a9985bae1ccd85e7cb074682d8b691
+  data.tar.gz: 26e8ffbe31ae2baa9880ba82c568baed3188dd98
 SHA512:
-  metadata.gz: 5a03878e04c0906780ea36d4852f1e030388c60862ffbbcef6395a8e66f41f0e534be34d8f0079aa938aadbcff909d5d4df50593d8603aad11b70d0d514dc8f7
-  data.tar.gz: 2636e356c09f723637d585236c58fb50c52e154482a9aebf1d725d397e755fc4a63fbb8aed92d33205c322949f3ca2bf33f61fbc250c0abd6113643f89a304e4
+  metadata.gz: 04c93841365a6bf23042e5e495189c6dd134047cf54219dcf7cc4aa72b1936da99f2b63cebbbbdb2041005f1a25815d3bf53ecae66660a942e3ea55efdb2e57e
+  data.tar.gz: 794f208951447ba3a5cb71a0908b94e4786a6149f19a31b70072ca65cdb43f4770ab1387769df4374761b89a786c1d1370139faa3c895b23f61103f0d7b0400c

data/VERSION

@@ -1 +1 @@
-7.0.0.rc11
+7.0.0.rc12

data/lib/gitlab_git/repository.rb

@@ -8,6 +8,8 @@ module Gitlab
     class Repository
       include Gitlab::Git::Popen
 
+      SEARCH_CONTEXT_LINES = 3
+
       class NoRepository < StandardError; end
 
       # Default branch in the repository
@@ -920,15 +922,63 @@ module Gitlab
       # Return an array of BlobSnippets for lines in +file_contents+ that match
       # +query+
       def build_greps(file_contents, query, ref, filename)
+        # The file_contents string is potentially huge so we make sure to loop
+        # through it one line at a time. This gives Ruby the chance to GC lines
+        # we are not interested in.
+        #
+        # We need to do a little extra work because we are not looking for just
+        # the lines that matches the query, but also for the context
+        # (surrounding lines). We will use Enumerable#each_cons to efficiently
+        # loop through the lines while keeping surrounding lines on hand.
+        #
+        # First, we turn "foo\nbar\nbaz" into
+        # [
+        #  [nil, -3], [nil, -2], [nil, -1],
+        #  ['foo', 0], ['bar', 1], ['baz', 3],
+        #  [nil, 4], [nil, 5], [nil, 6]
+        # ]
+        lines_with_index = Enumerator.new do |yielder|
+          # Yield fake 'before' lines for the first line of file_contents
+          (-SEARCH_CONTEXT_LINES..-1).each do |i|
+            yielder.yield [nil, i]
+          end
+
+          # Yield the actual file contents
+          count = 0
+          file_contents.each_line.each_with_index do |line, i|
+            line.chomp!
+            yielder.yield [line, i]
+            count += 1
+          end
+
+          # Yield fake 'after' lines for the last line of file_contents
+          (count+1..count+SEARCH_CONTEXT_LINES).each do |i|
+            yielder.yield [nil, i]
+          end
+        end
+
         greps = []
 
-        file_contents.split("\n").each_with_index do |line, i|
-          next unless line.match(/#{Regexp.escape(query)}/i)
+        # Loop through consecutive blocks of lines with indexes
+        lines_with_index.each_cons(2 * SEARCH_CONTEXT_LINES + 1) do |line_block|
+          # Get the 'middle' line and index from the block
+          line, i = line_block[SEARCH_CONTEXT_LINES]
+
+          next unless line && line.match(/#{Regexp.escape(query)}/i)
+
+          # Yay, 'line' contains a match!
+          # Get an array with just the context lines (no indexes)
+          match_with_context = line_block.map(&:first)
+          # Remove 'nil' lines in case we are close to the first or last line
+          match_with_context.compact!
+
+          # Get the line number (1-indexed) of the first context line
+          first_context_line_number = line_block[0][1] + 1
 
           greps << Gitlab::Git::BlobSnippet.new(
             ref,
-            file_contents.split("\n")[i - 3..i + 3],
-            i - 2,
+            match_with_context,
+            first_context_line_number,
             filename
           )
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.0.0.rc11
+  version: 7.0.0.rc12
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-linguist
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.21.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.21.2
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
   requirement: !ruby/object:Gem::Requirement