gitlab_git 10.3.2 → 10.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51076bd426c1093deb3ac7921090402ff3217397
-  data.tar.gz: 0bcd48cc52ef0ec8ecd4bcc7d45c892ec31b21d0
+  metadata.gz: 1115974e3de5f5c12b50a8ba8d4551cfd8d98f0d
+  data.tar.gz: 1e35d62d7867e80a75ec7a7b157dcddb283c8835
 SHA512:
-  metadata.gz: f84755a8d8474f773236438cb92d5264ce75ee935609faf2b6d9efe0210285c632bf157d4b599f46893075c6fe68ebe52c93ccc3b9053e3904a5f774057d8051
-  data.tar.gz: 6470f132620cff756f6c6810b4ef042ea2cab28eec465806fc38d5ab6f8199c6a8ac0832753fa652c1fb9e302eb02cca7c004a40b48729e10ea13325bcc3f7f6
+  metadata.gz: 636e47d38d0f91058c3f985c60dffbeaa28cf95733dfa63cd7c7de67495a808b4bb3b23554e9a8331988786aa954b63e4a59c3365075080b4a26c1a579b2c1cc
+  data.tar.gz: 0b97a98a7e2d981fa9833f204b97174f1173bb7e4eff932546d700c0cc9a8dbde17a6c466c338e2c8c79d34b9cfa532eaf764164ac684c5175df587fbf8a3d25

data/VERSION

@@ -1 +1 @@
-10.3.2
+10.4.0

data/lib/gitlab_git/commit.rb

@@ -55,7 +55,12 @@ module Gitlab
         def find(repo, commit_id = "HEAD")
           return decorate(commit_id) if commit_id.is_a?(Rugged::Commit)
 
-          obj = repo.rev_parse_target(commit_id)
+          obj = if commit_id.is_a?(String)
+                  repo.rev_parse_target(commit_id)
+                else
+                  Ref.dereference_object(commit_id)
+                end
+
           return nil unless obj.is_a?(Rugged::Commit)
 
           decorate(obj)

data/lib/gitlab_git/ref.rb

@@ -2,7 +2,7 @@ module Gitlab
   module Git
     class Ref
       include EncodingHelper
-      
+
       # Branch or tag name
       # without "refs/tags|heads" prefix
       attr_reader :name
@@ -20,18 +20,17 @@ module Gitlab
         str.gsub(/\Arefs\/heads\//, '')
       end
 
-      def initialize(name, target)
+      def self.dereference_object(object)
+        object = object.target while object.is_a?(Rugged::Tag::Annotation)
+
+        object
+      end
+
+      def initialize(repository, name, target)
         encode! name
         @name = name.gsub(/\Arefs\/(tags|heads)\//, '')
-        @target = if target.respond_to?(:oid)
-                    target.oid
-                  elsif target.respond_to?(:name)
-                    target.name
-                  elsif target.is_a? String
-                    target
-                  else
-                    nil
-                  end
+
+        @target = Commit.find(repository, target)
       end
     end
   end

data/lib/gitlab_git/repository.rb

@@ -61,13 +61,19 @@ module Gitlab
       def branches
         rugged.branches.map do |rugged_ref|
           begin
-            Branch.new(rugged_ref.name, rugged_ref.target)
+            Branch.new(self, rugged_ref.name, rugged_ref.target)
           rescue Rugged::ReferenceError
             # Omit invalid branch
           end
         end.compact.sort_by(&:name)
       end
 
+      def local_branches
+        rugged.branches.each(:local).map do |branch|
+          Branch.new(self, branch.name, branch.target)
+        end
+      end
+
       # Returns the number of valid branches
       def branch_count
         rugged.branches.count do |ref|
@@ -99,7 +105,7 @@ module Gitlab
             end
           end
 
-          Tag.new(ref.name, ref.target, message)
+          Tag.new(self, ref.name, ref.target, message)
         end.sort_by(&:name)
       end
 
@@ -132,7 +138,7 @@ module Gitlab
       # Deprecated. Will be removed in 5.2
       def heads
         rugged.references.each("refs/heads/*").map do |head|
-          Gitlab::Git::Ref.new(head.name, head.target)
+          Gitlab::Git::Ref.new(self, head.name, head.target)
         end.sort_by(&:name)
       end
 
@@ -337,8 +343,7 @@ module Gitlab
       # 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
+        Ref.dereference_object(obj)
       end
 
       # Return a collection of Rugged::Commits between the two revspec arguments.
@@ -745,7 +750,7 @@ module Gitlab
       #   create_branch("other-feature", "master")
       def create_branch(ref, start_point = "HEAD")
         rugged_ref = rugged.branches.create(ref, start_point)
-        Branch.new(rugged_ref.name, rugged_ref.target)
+        Branch.new(self, rugged_ref.name, rugged_ref.target)
       rescue Rugged::ReferenceError => e
         raise InvalidRef.new("Branch #{ref} already exists") if e.to_s =~ /'refs\/heads\/#{ref}'/
         raise InvalidRef.new("Invalid reference #{start_point}")

data/lib/gitlab_git/tag.rb

@@ -1,8 +1,8 @@
 module Gitlab
   module Git
     class Tag < Ref
-      def initialize(name, target, message = nil)
-        super(name, target)
+      def initialize(repository, name, target, message = nil)
+        super(repository, name, target)
         @message = message
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 10.3.2
+  version: 10.4.0
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-linguist