gitlab_git 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ebbcb7c820cc43073ff11a89608553f4bb7abac
-  data.tar.gz: f060d02e573af1d86065507f29a0dc04bcc0f641
+  metadata.gz: eb3b53c4340fbb2ef002661f2da3ca9473ab4cc5
+  data.tar.gz: 57c1e77f61485b399d854d30465a74ffb3d88078
 SHA512:
-  metadata.gz: 928b0db6c557babb1a447e1a8ac551751b33ac02effa3b220b4ee37572019194fb6624ade26b0aba4e6a77c982a4653b91cfa466fe63aaf193d45f7cfeba5ded
-  data.tar.gz: 9e133707553e092b676af9f46b276a78b818750bdd0086482d1e7682128aeb9c8f6ff127ec24cc8f9f8de6de7804610906db70c33e036c219319cdc65d2d51bd
+  metadata.gz: 30d11e36f05677cbcecd13f022b1f29dcd6ed8a6f879d4446be1128872caaca0ebf47b601d629cbbf7b89d161ae6be98ef54a492e7215842ddb34cd7ec8c2537
+  data.tar.gz: c6aeb4b21858ed9d599a585911c45f36a452fa2f2f63ca9ba012055bccb99f4fce576d6a9e8b71ed72f5fc301bbcfcbed30ae7ae02e4daac0b97701d64026326

data/lib/gitlab_git/commit.rb

@@ -85,8 +85,8 @@ module Gitlab
         # Ex.
         #   Commit.between('29eda46b', 'master')
         #
-        def between(repo, from, to)
-          repo.commits_between(from, to).map do |commit|
+        def between(repo, base, head)
+          repo.commits_between(base, head).map do |commit|
             decorate(commit)
           end
         end

data/lib/gitlab_git/compare.rb

@@ -3,30 +3,29 @@ module Gitlab
     class Compare
       attr_accessor :commits, :commit, :diffs, :same
 
-      def initialize(repository, from, to)
+      def initialize(repository, from, to, limit = 100)
         @commits, @diffs = [], []
         @commit = nil
         @same = false
 
         return unless from && to
 
-        first = repository.commit(to.try(:strip))
-        last = repository.commit(from.try(:strip))
+        base = Gitlab::Git::Commit.find(repository, from.try(:strip))
+        head = Gitlab::Git::Commit.find(repository, to.try(:strip))
 
-        return unless first && last
+        return unless base && head
 
-        if first.id == last.id
+        if base.id == head.id
           @same = true
           return
         end
 
-        @commit = first
-        @commits = repository.commits_between(last.id, first.id)
-
-        @diffs = if @commits.size > 100
+        @commit = head
+        @commits = Gitlab::Git::Commit.between(repository, base.id, head.id)
+        @diffs = if @commits.size > limit
                    []
                  else
-                   repository.repo.diff(last.id, first.id) rescue []
+                   Gitlab::Git::Diff.between(repository, head.id, base.id) rescue []
                  end
       end
     end

data/lib/gitlab_git/diff.rb

@@ -15,13 +15,13 @@ module Gitlab
       attr_accessor  :new_file, :renamed_file, :deleted_file
 
       class << self
-        def between(repo, from, to)
+        def between(repo, head, base)
           # Only show what is new in the source branch compared to the target branch, not the other way around.
           # The linex below with merge_base is equivalent to diff with three dots (git diff branch1...branch2)
           # From the git documentation: "git diff A...B" is equivalent to "git diff $(git-merge-base A B) B"
-          common_commit = repo.merge_base_commit(from, to)
+          common_commit = repo.merge_base_commit(head, base)
 
-          repo.diff(common_commit, from).map do |diff|
+          repo.diff(common_commit, head).map do |diff|
             Gitlab::Git::Diff.new(diff)
           end
         rescue Grit::Git::GitTimeout

data/lib/gitlab_git/log_parser.rb

@@ -10,8 +10,8 @@ module Gitlab
 
         log.each_slice(5) do |slice|
           entry = {}
-          entry[:author_name] = slice[0]
-          entry[:author_email] = slice[1]
+          entry[:author_name] = slice[0].force_encoding('UTF-8')
+          entry[:author_email] = slice[1].force_encoding('UTF-8')
           entry[:date] = slice[2]
 
           if slice[4]

data/lib/gitlab_git/repository.rb

@@ -28,8 +28,8 @@ module Gitlab
       # compatibility
       alias_method :repo, :raw
 
-      def initialize(path_with_namespace, root_ref = 'master')
-        @root_ref = root_ref || "master"
+      def initialize(path_with_namespace, root_ref)
+        @root_ref = root_ref || raw.head.name
         @path_with_namespace = path_with_namespace
 
         # Init grit repo object

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-linguist