gitlab_git 7.0.0.rc10 → 7.0.0.rc11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47fb0500cc9f11693684d6b9f27574948da9ef92
-  data.tar.gz: 19dffe313f146a53f799ab8c6de3ce5a1cbed734
+  metadata.gz: 01d35bccb72fd1412692b9c65341610f78616595
+  data.tar.gz: 636bf49e47997552e56cd1af4858632621701283
 SHA512:
-  metadata.gz: 77646b0c9cc5b1d6f4d218928c9ef143b0caae0eef394c17fe893f032f986efaebc0639c3d94ee9c4faeb39a5fa627b7a10f0db161ccfba2cda658a88bd1ed4b
-  data.tar.gz: fc6fccda0442a3acb885d92d6b924e4f5344bee8cac725c048541d0f296f9acb03f2bfdd04ec26529e4c72f96519b8b31b4ac90842b12b1fbfcda6d63a674331
+  metadata.gz: 5a03878e04c0906780ea36d4852f1e030388c60862ffbbcef6395a8e66f41f0e534be34d8f0079aa938aadbcff909d5d4df50593d8603aad11b70d0d514dc8f7
+  data.tar.gz: 2636e356c09f723637d585236c58fb50c52e154482a9aebf1d725d397e755fc4a63fbb8aed92d33205c322949f3ca2bf33f61fbc250c0abd6113643f89a304e4

data/VERSION

@@ -1 +1 @@
-7.0.0.rc10
+7.0.0.rc11

data/lib/gitlab_git/blob.rb

@@ -15,18 +15,22 @@ module Gitlab
 
           return nil unless blob_entry
 
-          blob = repository.lookup(blob_entry[:oid])
-
-          if blob
-            Blob.new(
-              id: blob.oid,
-              name: blob_entry[:name],
-              size: blob.size,
-              data: blob.content,
-              mode: blob_entry[:mode],
-              path: path,
-              commit_id: sha,
-            )
+          if blob_entry[:type] == :commit
+            submodule_blob(blob_entry, path, sha)
+          else
+            blob = repository.lookup(blob_entry[:oid])
+
+            if blob
+              Blob.new(
+                id: blob.oid,
+                name: blob_entry[:name],
+                size: blob.size,
+                data: blob.content,
+                mode: blob_entry[:mode],
+                path: path,
+                commit_id: sha,
+              )
+            end
           end
         end
 
@@ -63,17 +67,22 @@ module Gitlab
 
           if path_arr.size > 1
             return nil unless entry[:type] == :tree
-          else
-            return nil unless entry[:type] == :blob
-          end
-
-          if path_arr.size > 1
             path_arr.shift
             find_entry_by_path(repository, entry[:oid], path_arr.join('/'))
           else
-            entry
+            [:blob, :commit].include?(entry[:type]) ? entry : nil
           end
         end
+
+        def submodule_blob(blob_entry, path, sha)
+          Blob.new(
+            id: blob_entry[:oid],
+            name: blob_entry[:name],
+            data: '',
+            path: path,
+            commit_id: sha,
+          )
+        end
       end
 
       def initialize(options)

data/lib/gitlab_git/diff.rb

@@ -5,8 +5,6 @@ module Gitlab
       class TimeoutError < StandardError; end
       include EncodingHelper
 
-      attr_accessor :raw_diff
-
       # Diff properties
       attr_accessor :old_path, :new_path, :a_mode, :b_mode, :diff
 
@@ -52,11 +50,13 @@ module Gitlab
         hash
       end
 
+      def submodule?
+        a_mode == '160000' || b_mode == '160000'
+      end
+
       private
 
       def init_from_rugged(rugged)
-        @raw_diff = rugged
-
         @diff = encode!(strip_diff_headers(rugged.to_s))
 
         d = rugged.delta
@@ -80,9 +80,20 @@ module Gitlab
       # Strip out the information at the beginning of the patch's text to match
       # Grit's output
       def strip_diff_headers(diff_text)
-        lines = diff_text.split("\n")
-        lines.shift until lines.empty? || lines.first.match("^(---|Binary)")
-        lines.join("\n")
+        # Delete everything up to the first line that starts with '---' or
+        # 'Binary'
+        diff_text.sub!(/\A.*?^(---|Binary)/m, '\1')
+        # Remove trailing newline because the tests ask for it
+        diff_text.chomp!
+
+        if diff_text.start_with?('---') or diff_text.start_with?('Binary')
+          diff_text
+        else
+          # If the diff_text did not contain a line starting with '---' or
+          # 'Binary', return the empty string. No idea why; we are just
+          # preserving behavior from before the refactor.
+          ''
+        end
       end
     end
   end

data/lib/gitlab_git/repository.rb

@@ -265,7 +265,7 @@ module Gitlab
       # Return an array of Diff objects that represent the diff
       # between +from+ and +to+.
       def diff(from, to, *paths)
-        rugged.diff(from, to, paths: paths).patches.map do |p|
+        rugged.diff(from, to, paths: paths).each_patch.map do |p|
           Gitlab::Git::Diff.new(p)
         end
       end
@@ -275,7 +275,7 @@ module Gitlab
         # NOTE: It would be simpler to use the Rugged::Diff#patch method, but
         # that formats the diff text differently than Rugged::Patch#to_s for
         # changes to binary files.
-        rugged.diff(from, to, paths: paths).patches.map do |p|
+        rugged.diff(from, to, paths: paths).each_patch.map do |p|
           p.to_s
         end.join("\n")
       end
@@ -736,11 +736,11 @@ module Gitlab
 
         current = ""
         content.split("\n").each do |txt|
-          if txt.match(/^\[/)
+          if txt.match(/^\s*\[/)
             current = txt.match(/(?<=").*(?=")/)[0]
             results[current] = {}
           else
-            match_data = txt.match(/(\w+) = (.*)/)
+            match_data = txt.match(/(\w+)\s*=\s*(.*)/)
             results[current][match_data[1]] = match_data[2]
 
             if match_data[1] == "path"
@@ -778,7 +778,7 @@ module Gitlab
           end
 
           if !current_path ||
-            commit_touches_path?(c, current_path, options[:follow])
+            commit_touches_path?(c, current_path, options[:follow], walker)
 
             # This is a commit we care about, unless we haven't skipped enough
             # yet
@@ -792,36 +792,43 @@ module Gitlab
         commits
       end
 
-      # Returns true if the given commit affects the given path.  If the
-      # +follow+ option is true and the file specified by +path+ was renamed,
-      # then the path value is set to the old path.
-      def commit_touches_path?(commit, path, follow)
-        if follow
-          touches_path_diff?(commit, path)
-        else
-          touches_path_tree?(commit, path)
-        end
-      end
-
       # Returns true if +commit+ introduced changes to +path+, using commit
-      # trees to make that determination.
-      def touches_path_tree?(commit, path)
-        parent = commit.parents[0]
+      # trees to make that determination.  Uses the history simplification
+      # rules that `git log` uses by default, where a commit is omitted if it
+      # is TREESAME to any parent.
+      #
+      # If the +follow+ option is true and the file specified by +path+ was
+      # renamed, then the path value is set to the old path.
+      def commit_touches_path?(commit, path, follow, walker)
         entry = tree_entry(commit, path)
 
-        if parent.nil?
+        if commit.parents.empty?
           # This is the root commit, return true if it has +path+ in its tree
           return entry != nil
         end
 
-        parent_entry = tree_entry(parent, path)
+        num_treesame = 0
+        commit.parents.each do |parent|
+          parent_entry = tree_entry(parent, path)
+
+          # Only follow the first TREESAME parent for merge commits
+          if num_treesame > 0
+            walker.hide(parent)
+            next
+          end
 
-        if entry.nil? && parent_entry.nil?
-          false
-        elsif entry.nil? || parent_entry.nil?
+          if entry.nil? && parent_entry.nil?
+            num_treesame += 1
+          elsif entry && parent_entry && entry[:oid] == parent_entry[:oid]
+            num_treesame += 1
+          end
+        end
+
+        case num_treesame
+        when 0
+          detect_rename(commit, commit.parents.first, path) if follow
           true
-        else
-          entry[:oid] != parent_entry[:oid]
+        else false
         end
       end
 
@@ -841,24 +848,18 @@ module Gitlab
         tmp_entry
       end
 
-      # Returns true if +commit+ introduced changes to +path+, using
-      # Rugged::Diff objects to make that determination.  This is slower than
-      # comparing commit trees, but lets us use Rugged::Diff#find_similar to
-      # detect file renames.
-      def touches_path_diff?(commit, path)
-        diff = commit.diff(reverse: true, paths: [path],
-                           disable_pathspec_match: true)
-
-        return false if diff.deltas.empty?
+      # Compare +commit+ and +parent+ for +path+.  If +path+ is a file and was
+      # renamed in +commit+, then set +path+ to the old filename.
+      def detect_rename(commit, parent, path)
+        diff = parent.diff(commit, paths: [path], disable_pathspec_match: true)
 
         # If +path+ is a filename, not a directory, then we should only have
         # one delta.  We don't need to follow renames for directories.
-        return true if diff.deltas.length > 1
+        return nil if diff.each_delta.count > 1
 
-        # Detect renames
-        delta = diff.deltas.first
+        delta = diff.each_delta.first
         if delta.added?
-          full_diff = commit.diff(reverse: true)
+          full_diff = parent.diff(commit)
           full_diff.find_similar!
 
           full_diff.each_delta do |full_delta|
@@ -868,8 +869,6 @@ module Gitlab
             end
           end
         end
-
-        true
       end
 
       def archive_to_file(treeish = 'master', prefix = nil, filename = 'archive.tar.gz', format = nil, compress_cmd = %W(gzip))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.0.0.rc10
+  version: 7.0.0.rc11
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-linguist