gitlab_git 7.2.6 → 7.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40404bc6eebccdbd4fe6e3389a5ea3db396ab5ca
-  data.tar.gz: 01639046d7956b321c868ba026d3f03c49634af4
+  metadata.gz: 0fb286d72a72f537e6256122e9017c6901e7534f
+  data.tar.gz: a65bf64b798e5bdc6ed45f8a9837b8bd9e5437bb
 SHA512:
-  metadata.gz: cc39687fd79229843b61053f62293b9ce1afed9f4a112cf305d7e4aefef10e27de3c7839780a1233f9a9e83f067e95349e4741f61dcea5eee31ec38b15fbd921
-  data.tar.gz: 1c0d0abcb8f8d1df2f886f994226a33a35a4e2eff95673347522e2287b25e284d5181675df4fce6cab63917bbda1197394241617326297b81e79e83d6e2738fb
+  metadata.gz: cd4a03b4bc7fbeef4436f919855ad0f9f424387f22ab8e09a78d12fa60925017f4e59e2157bba93c39dd2e833b83fd5fddde92248fb70134a37452d91cb8a948
+  data.tar.gz: 0002e83c7288132e5cd7a8ba70696bbc3dd8d04748b988abbf64777612c65be5cfbe81991c5cedc5474096f8bac03ab781fb32b832eecf16e1438a9fe931bbad

data/VERSION

@@ -1 +1 @@
-7.2.6
+7.2.8

data/lib/gitlab_git/repository.rb

@@ -53,8 +53,12 @@ module Gitlab
       # Returns an Array of Branches
       def branches
         rugged.branches.map do |rugged_ref|
-          Branch.new(rugged_ref.name, rugged_ref.target)
-        end.sort_by(&:name)
+          begin
+            Branch.new(rugged_ref.name, rugged_ref.target)
+          rescue Rugged::ReferenceError
+            # Omit invalid branch
+          end
+        end.compact.sort_by(&:name)
       end
 
       # Returns an Array of tag names
@@ -135,7 +139,7 @@ module Gitlab
       # Archive Project to .tar.gz
       #
       # Already packed repo archives stored at
-      # app_root/tmp/repositories/project_name/project_name-commit-id.tag.gz
+      # 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
@@ -147,16 +151,15 @@ module Gitlab
 
         case format
         when "tar.bz2", "tbz", "tbz2", "tb2", "bz2"
-          pipe_cmd = %W(bzip2)
+          compress_cmd = %W(bzip2)
         when "tar"
-          pipe_cmd = %W(cat)
+          compress_cmd = %W(cat)
         when "zip"
           git_archive_format = "zip"
-          pipe_cmd = %W(cat)
+          compress_cmd = %W(cat)
         else
           # everything else should fall back to tar.gz
-          git_archive_format = nil
-          pipe_cmd = %W(gzip -n)
+          compress_cmd = %W(gzip -n)
         end
 
         FileUtils.mkdir_p File.dirname(file_path)
@@ -174,7 +177,7 @@ module Gitlab
         temp_file_path = "#{file_path}.#{Process.pid}-#{Time.now.to_i}"
 
         begin
-          archive_to_file(ref, temp_file_path, git_archive_format, pipe_cmd)
+          archive_to_file(ref, temp_file_path, git_archive_format, compress_cmd)
         rescue
           FileUtils.rm(temp_file_path)
           raise
@@ -188,26 +191,34 @@ module Gitlab
         file_path
       end
 
-      def archive_file_path(ref, storage_path, format = "tar.gz")
+      def archive_name(ref)
         ref ||= root_ref
         commit = Gitlab::Git::Commit.find(self, ref)
         return nil unless commit
 
+        project_name = self.name.sub(/\.git\z/, "")
+        file_name = "#{project_name}-#{ref}-#{commit.id}"
+      end
+
+      def archive_file_path(ref, storage_path, format = "tar.gz")
+        # Build file path
+        name = archive_name(ref)
+        return nil unless name
+
         extension =
           case format
           when "tar.bz2", "tbz", "tbz2", "tb2", "bz2"
-            ".tar.bz2"
+            "tar.bz2"
           when "tar"
-            ".tar"
+            "tar"
           when "zip"
-            ".zip"
+            "zip"
           else
             # everything else should fall back to tar.gz
-            ".tar.gz"
+            "tar.gz"
           end
 
-        # Build file path
-        file_name = self.name.gsub("\.git", "") + "-" + commit.id.to_s + extension
+        file_name = "#{name}.#{extension}"
         File.join(storage_path, self.name, file_name)
       end
 
@@ -289,12 +300,15 @@ module Gitlab
       #
       def commits_between(from, to)
         walker = Rugged::Walker.new(rugged)
+        walker.sorting(Rugged::SORT_DATE | Rugged::SORT_REVERSE)
+
         walker.push(to)
         walker.hide(from)
+
         commits = walker.to_a
         walker.reset
 
-        commits.reverse
+        commits
       end
 
       # Returns the SHA of the most recent common ancestor of +from+ and +to+
@@ -944,14 +958,16 @@ module Gitlab
         end
       end
 
-      def archive_to_file(treeish = 'master', 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 -n))
         git_archive_cmd = %W(git --git-dir=#{path} archive)
 
         # Put files into a directory before archiving
-        prefix = File.basename(self.name) + "/"
+        prefix = "#{archive_name(treeish)}/"
         git_archive_cmd << "--prefix=#{prefix}"
 
+        # Format defaults to tar
         git_archive_cmd << "--format=#{format}" if format
+
         git_archive_cmd += %W(-- #{treeish})
 
         open(filename, 'w') do |file|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.2.6
+  version: 7.2.8
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-linguist