gitlab_git 7.2.18 → 7.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51faf2ed86cc7ec1871ab520a010387027e10934
-  data.tar.gz: 2c0159a83e00d08ba95c79c05b3b270b2a715e8c
+  metadata.gz: 67ef4ed15aef21f374891ff34902b43458b1d571
+  data.tar.gz: c42c73310105cbf1678b015a6fb8ab2c7dd6aaef
 SHA512:
-  metadata.gz: 8fc36043056991b48a5cca5d7a7b0521e5a0fcdb7b6c4a2396c5377e5bd6790916f910e6378d578efe905f23ee1678a722c29f94cec767865de21a84367bd381
-  data.tar.gz: a21575ea3bff0c46aec1a5d6857fdc553b9fc45d12c47e37ded06d7046913b5fcc5538f664c89809ca96b374eedaa4ffc82d313fa2d5160f358d6357902c58c3
+  metadata.gz: a4c8012aea7f188bbc3d46692b5cd7e700a921309fc7b01897816ec199afa4c8bfdcea05b953de0a57b22da7c85428ef2f5f295d7a1b5930b2f9a8fd8d5fb772
+  data.tar.gz: f32eea0df1d2969f7f52c2641a35ac34615acd285e486576f730d034fcc19255cd122ad851ff2bcb17835dd25ec79ad261e08e911fa33110a0a8542ecc382d24

data/VERSION

@@ -1 +1 @@
-7.2.18
+7.2.19

data/lib/gitlab_git/repository.rb

@@ -138,73 +138,24 @@ module Gitlab
         nil
       end
 
-      # Archive Project to .tar.gz
-      #
-      # Already packed repo archives stored at
-      # app_root/tmp/repositories/<project_name>.git/<project_name>-<ref>-<commit id>.tar.gz
-      #
-      def archive_repo(ref, storage_path, format = "tar.gz")
-        ref ||= root_ref
-
-        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"
-          compress_cmd = %W(bzip2)
-        when "tar"
-          compress_cmd = %W(cat)
-        when "zip"
-          git_archive_format = "zip"
-          compress_cmd = %W(cat)
-        else
-          # everything else should fall back to tar.gz
-          compress_cmd = %W(gzip -n)
-        end
-
-        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.
-        temp_file_path = "#{file_path}.#{Process.pid}-#{Time.now.to_i}"
-
-        begin
-          archive_to_file(ref, temp_file_path, git_archive_format, compress_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_name(ref)
+      def archive_metadata(ref, storage_path, format = "tar.gz")
         ref ||= root_ref
         commit = Gitlab::Git::Commit.find(self, ref)
-        return nil unless commit
+        return {} if commit.nil?
+
+        project_name = self.name.chomp('.git')
+        prefix = "#{project_name}-#{ref}-#{commit.id}"
 
-        project_name = self.name.sub(/\.git\z/, "")
-        file_name = "#{project_name}-#{ref}-#{commit.id}"
+        {
+          'RepoPath' => path,
+          'ArchivePrefix' => prefix,
+          'ArchivePath' => archive_file_path(prefix, storage_path, format),
+          'CommitId' => commit.id,
+        }
       end
 
-      def archive_file_path(ref, storage_path, format = "tar.gz")
+      def archive_file_path(name, storage_path, format = "tar.gz")
         # Build file path
-        name = archive_name(ref)
         return nil unless name
 
         extension =
@@ -224,10 +175,6 @@ module Gitlab
         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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.2.18
+  version: 7.2.19
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-linguist