gitlab_git 7.0.0.rc14 → 7.0.0.rc15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3cf5080130d02af367a03688fd7532df357b2b8
-  data.tar.gz: 4ff124240753faadb7c136936920463e0544afcb
+  metadata.gz: 032effd5ddcbdee163141fad8753e2e05b5be2d6
+  data.tar.gz: e95f2a74da65b5d3f73e34ecdf2322cc357c12ab
 SHA512:
-  metadata.gz: c4fdac70760182bb518663fd0c9382cdfa77316363444238bb403efe9828fd7e1f95e568c0b3b0ac9c23a23ad76fb1173295acd63e727665365f4864a8782f60
-  data.tar.gz: 0e357a87c45dd3ad9a186c371f72ae5c7b2385c910d9680d465763aefe477dc7ddeeacfc0247dd8a72d4d568f4bc059c71feb8e82e680459ec67082720ec09f4
+  metadata.gz: 8a7de66d53708e64ab2850a8baad0851d561bf8513f40d8cc4572170a8d76f80ada73d831ac2893502a9397532d46b469baf6ff5b0bd51804cae25da5c7fd352
+  data.tar.gz: c81d4b56dc3114276d96f905e5cf7803d15ace82b1d2f6546a154c3f55065f33e543b8ba107e4e21cd43adac9400d4c361b41e6f9671e5845c31f018f2135867

data/VERSION

@@ -1 +1 @@
-7.0.0.rc14
+7.0.0.rc15

data/lib/gitlab_git/commit.rb

@@ -52,12 +52,8 @@ module Gitlab
         def find(repo, commit_id = "HEAD")
           return decorate(commit_id) if commit_id.is_a?(Rugged::Commit)
 
-          obj = repo.rugged.rev_parse(commit_id)
-          commit = case obj
-                   when Rugged::Tag::Annotation then obj.target
-                   when Rugged::Commit then obj
-                   end
-          decorate(commit) if commit
+          obj = repo.rev_parse_target(commit_id)
+          decorate(obj)
         rescue Rugged::ReferenceError, Rugged::ObjectError
           nil
         end

data/lib/gitlab_git/repository.rb

@@ -238,14 +238,15 @@ module Gitlab
       end
 
       def sha_from_ref(ref)
-        sha = rugged.rev_parse_oid(ref)
-        object = rugged.lookup(sha)
+        rev_parse_target(ref).oid
+      end
 
-        if object.kind_of?(Rugged::Commit)
-          sha
-        elsif object.respond_to?(:target)
-          sha_from_ref(object.target.oid)
-        end
+      # Return the object that +revspec+ points to.  If +revspec+ is an
+      # annotated tag, then return the tag's target instead.
+      def rev_parse_target(revspec)
+        obj = rugged.rev_parse(revspec)
+        obj = obj.target while obj.is_a?(Rugged::Tag::Annotation)
+        obj
       end
 
       # Return a collection of Rugged::Commits between the two SHA arguments.
@@ -720,17 +721,6 @@ module Gitlab
 
       private
 
-      # Return the object that +revspec+ points to.  If +revspec+ is an
-      # annotated tag, then return the tag's target instead.
-      def rev_parse_target(revspec)
-        obj = rugged.rev_parse(revspec)
-        if obj.is_a?(Rugged::Tag::Annotation)
-          obj.target
-        else
-          obj
-        end
-      end
-
       # Get the content of a blob for a given commit.  If the blob is a commit
       # (for submodules) then return the blob's OID.
       def blob_content(commit, blob_name)
@@ -907,6 +897,8 @@ module Gitlab
           # Get the compression process ready to accept data from the read end
           # of the pipe
           compress_pid = spawn(*compress_cmd, :in => pipe_rd, :out => file)
+          # Set the lowest priority for the compressing process
+          popen(nice_process(compress_pid), path)
           # The read end belongs to the compression process now; we should
           # close our file descriptor for it.
           pipe_rd.close
@@ -926,6 +918,16 @@ module Gitlab
         end
       end
 
+      def nice_process(pid)
+        niced_process = %W(renice -n 20 -p #{pid})
+
+        unless RUBY_PLATFORM.include?('darwin')
+          niced_process = %W(ionice -c 2 -n 7 -p #{pid}) + niced_process
+        end
+
+        niced_process
+      end
+
       # Returns true if the index entry has the special file mode that denotes
       # a submodule.
       def submodule?(index_entry)
@@ -934,9 +936,9 @@ module Gitlab
 
       # Return a Rugged::Index that has read from the tree at +ref_name+
       def populated_index(ref_name)
-        tree = rugged.lookup(rugged.rev_parse_oid(ref_name)).tree
+        commit = rev_parse_target(ref_name)
         index = rugged.index
-        index.read_tree(tree)
+        index.read_tree(commit.tree)
         index
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.0.0.rc14
+  version: 7.0.0.rc15
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-10 00:00:00.000000000 Z
+date: 2015-03-04 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: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Gitlab::Git library