gitlab_git 7.1.2 → 7.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bacaa31ceeb2b8f23f6bf232947ccb9abbf26ad7
-  data.tar.gz: f25102377547ae8fcd83fdc133cbac40f73a3d80
+  metadata.gz: d14bd556fed0b0ad3ace6df4ac9c61a54972b878
+  data.tar.gz: aa8526169e2a983fea5f65f782911b5f030d0f17
 SHA512:
-  metadata.gz: 840ea700a7453713acb0c67d795e4278462f09d9642f9da6926a3e0837b402e8274f699a338f0c5c8668feaa1e70a85222de55eafb09927abebff46c06d4aa25
-  data.tar.gz: 6ddb2fe9ee8cdc7ac95f389c624666d626fb6e7649f675fc5495d9050291842d877ab053b88b89decd3cfa909918aa11aae6335bba0f60cb46e4cf4e772427a6
+  metadata.gz: 472f06e80a1bfb62907a1e620a95cd2fa6e99829ccd6622f7d68013bbb740ce6d161abc9f200808f947650ce4714415543c1b4771af020457c2f458ace95c0ae
+  data.tar.gz: 2d1739752f4fba1228b11ea5e8efb23bd5bbab8b9d7e113a21f4a6b5962a0d38eef815ebbb1567ddf49153d690e5a01a4cd73b9d3759ce3b7c7c722465b9b249

data/VERSION

@@ -1 +1 @@
-7.1.2
+7.1.3

data/lib/gitlab_git/commit.rb

@@ -172,16 +172,7 @@ module Gitlab
       #
       # Cuts out the header and stats from #to_patch and returns only the diff.
       def to_diff(options = {})
-        patch = to_patch(options)
-
-        # discard lines before the diff
-        lines = patch.split("\n")
-        while !lines.first.start_with?("diff --git") do
-          lines.shift
-        end
-        lines.pop if lines.last =~ /^[\d.]+$/ # Git version
-        lines.pop if lines.last == "-- "      # end of diff
-        lines.join("\n")
+        diff_from_parent(options).patch
       end
 
       # Returns a diff object for the changes from this commit's first parent.
@@ -229,7 +220,13 @@ module Gitlab
       end
 
       def to_patch(options = {})
-        raw_commit.to_mbox(options)
+        begin
+          raw_commit.to_mbox(options)
+        rescue Rugged::InvalidError => ex
+          if ex.message =~ /Commit \w+ is a merge commit/
+            'Patch format is not currently supported for merge commits.'
+          end
+        end
       end
 
       # Get a collection of Rugged::Reference objects for this commit.

data/lib/gitlab_git/repository.rb

@@ -135,57 +135,82 @@ module Gitlab
       #
       def archive_repo(ref, storage_path, format = "tar.gz")
         ref ||= root_ref
-        commit = Gitlab::Git::Commit.find(self, ref)
-        return nil unless commit
 
-        extension = nil
-        git_archive_format = nil
-        pipe_cmd = nil
+        file_path = archive_file_path(ref, storage_path, format)
+        return nil unless file_path
+
+        return file_path if File.exist?(file_path)
 
         case format
         when "tar.bz2", "tbz", "tbz2", "tb2", "bz2"
-          extension = ".tar.bz2"
           pipe_cmd = %W(bzip2)
         when "tar"
-          extension = ".tar"
           pipe_cmd = %W(cat)
         when "zip"
-          extension = ".zip"
           git_archive_format = "zip"
           pipe_cmd = %W(cat)
         else
           # everything else should fall back to tar.gz
-          extension = ".tar.gz"
           git_archive_format = nil
           pipe_cmd = %W(gzip -n)
         end
 
-        # Build file path
-        file_name = self.name.gsub("\.git", "") + "-" + commit.id.to_s + extension
-        file_path = File.join(storage_path, self.name, file_name)
-
-        # Put files into a directory before archiving
-        prefix = File.basename(self.name) + "/"
+        FileUtils.mkdir_p File.dirname(file_path)
 
-        # Create file if not exists
-        unless File.exists?(file_path)
-          FileUtils.mkdir_p File.dirname(file_path)
+        pid_file_path = archive_pid_file_path(ref, storage_path, format)
+        return file_path if File.exist?(pid_file_path)
+        
+        File.open(pid_file_path, "w") do |file|
+          file.puts Process.pid
+        end
 
-          # Create the archive in temp file, to avoid leaving a corrupt archive
-          # to be downloaded by the next user if we get interrupted while
-          # creating the archive. Note that we do not care about cleaning up
-          # the temp file in that scenario, because GitLab cleans up the
-          # directory holding the archive files periodically.
-          temp_file_path = file_path + ".#{Process.pid}-#{Time.now.to_i}"
-          archive_to_file(ref, prefix, temp_file_path, git_archive_format, pipe_cmd)
+        # Create the archive in temp file, to avoid leaving a corrupt archive
+        # to be downloaded by the next user if we get interrupted while
+        # creating the archive.
+        temp_file_path = "#{file_path}.#{Process.pid}-#{Time.now.to_i}"
 
-          # move temp file to persisted location
-          FileUtils.move(temp_file_path, file_path)
+        begin
+          archive_to_file(ref, temp_file_path, git_archive_format, pipe_cmd)
+        rescue
+          FileUtils.rm(temp_file_path)
+          raise
+        ensure
+          FileUtils.rm(pid_file_path)
         end
 
+        # move temp file to persisted location
+        FileUtils.move(temp_file_path, file_path)
+
         file_path
       end
 
+      def archive_file_path(ref, storage_path, format = "tar.gz")
+        ref ||= root_ref
+        commit = Gitlab::Git::Commit.find(self, ref)
+        return nil unless commit
+
+        extension = 
+          case format
+          when "tar.bz2", "tbz", "tbz2", "tb2", "bz2"
+            ".tar.bz2"
+          when "tar"
+            ".tar"
+          when "zip"
+            ".zip"
+          else
+            # everything else should fall back to tar.gz
+            ".tar.gz"
+          end
+
+        # Build file path
+        file_name = self.name.gsub("\.git", "") + "-" + commit.id.to_s + extension
+        File.join(storage_path, self.name, file_name)
+      end
+
+      def archive_pid_file_path(*args)
+        "#{archive_file_path(*args)}.pid"
+      end
+
       # Return repo size in megabytes
       def size
         size = popen(%W(du -s), path).first.strip.to_i
@@ -891,9 +916,13 @@ module Gitlab
         end
       end
 
-      def archive_to_file(treeish = 'master', prefix = nil, filename = 'archive.tar.gz', format = nil, compress_cmd = %W(gzip))
+      def archive_to_file(treeish = 'master', filename = 'archive.tar.gz', format = nil, compress_cmd = %W(gzip))
         git_archive_cmd = %W(git --git-dir=#{path} archive)
-        git_archive_cmd << "--prefix=#{prefix}" if prefix
+
+        # Put files into a directory before archiving
+        prefix = File.basename(self.name) + "/"
+        git_archive_cmd << "--prefix=#{prefix}"
+
         git_archive_cmd << "--format=#{format}" if format
         git_archive_cmd += %W(-- #{treeish})
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.1.2
+  version: 7.1.3
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-27 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.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Gitlab::Git library