gitlab_git 1.4.1 → 2.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d590d7ff3fab5e14714b50c3834566f326ef20af
-  data.tar.gz: 40e19943e01067a42f9ef8ba906a1e7b618d146c
+  metadata.gz: 721ce63ea203619c49c42fd796634d7076ebad3b
+  data.tar.gz: 3d7ac5846bc15878beddfedb4bc8378048359d43
 SHA512:
-  metadata.gz: 0e589b34aea8ebb6397ba01b6367313b4a5725be1990dd86f5cee2077e9476969a34d239651452797035431397a646d56a1b90ba02a527273570769ebd0c34ef
-  data.tar.gz: 8a7707289c1bdc7feadaaa8a9cba4aefefd8bcec7b8dc1212725495fd697893fe405583eeb644317ce7622101992c485ff01bf20a90978a8015942ea2da1dd1b
+  metadata.gz: 216f0f37fa7f9b38ce2bf9710ed9773210af4128e6f874124f0c5e26865fcf9739ef8d38cddea671c05c195fe7021dd4287a1d8f2511f8618400539e1833c799
+  data.tar.gz: 4df9626fbf0a5c1c18d603d64bc93fa7a998dccddaac7ae424461bbf36fc11b0f9e73f7817f6beb456cb43fcb89e2d124da2d1fe439e00a08f5676adf146235f

data/lib/gitlab_git/blame.rb

@@ -1,7 +1,6 @@
 module Gitlab
   module Git
     class Blame
-
       attr_accessor :repository, :sha, :path
 
       def initialize(repository, sha, path)
@@ -9,7 +8,7 @@ module Gitlab
       end
 
       def each
-        raw_blame = Grit::Blob.blame(repository.repo, sha, path)
+        raw_blame = Grit::Blob.blame(repository.raw, sha, path)
 
         raw_blame.each do |commit, lines|
           next unless commit

data/lib/gitlab_git/commit.rb

@@ -13,6 +13,89 @@ module Gitlab
       ]
       attr_accessor *SERIALIZE_KEYS
 
+      class << self
+        # Get commits collection
+        #
+        # Ex.
+        #   Commit.where(
+        #     repo: repo,
+        #     ref: 'master',
+        #     path: 'app/models',
+        #     limit: 10,
+        #     offset: 5,
+        #   )
+        #
+        def where(options)
+          repo = options.delete(:repo)
+          raise 'Gitlab::Git::Repository is required' unless repo.respond_to?(:log)
+
+          repo.log(options).map { |c| decorate(c) }
+        end
+
+        # Get single commit
+        #
+        # Ex.
+        #   Commit.find(repo, '29eda46b')
+        #
+        #   Commit.find(repo, 'master')
+        #
+        def find(repo, commit_id = nil)
+          # Find repo.tags first,
+          # because if commit_id is "tag name",
+          # repo.commit(commit_id) returns wrong commit sha
+          # that is git tag object sha.
+          tag = repo.tags.find {|tag| tag.name == commit_id} if commit_id
+
+          commit = if tag
+                     tag.commit
+                   else
+                     repo.log(ref: commit_id).first
+                   end
+
+          decorate(commit) if commit
+        end
+
+        # Get last commit for HEAD
+        #
+        # Ex.
+        #   Commit.last(repo)
+        #
+        def last(repo)
+          find(repo, nil)
+        end
+
+        # Get last commit for specified path and ref
+        #
+        # Ex.
+        #   Commit.last_for_path(repo, '29eda46b', 'app/models')
+        #
+        #   Commit.last_for_path(repo, 'master', 'Gemfile')
+        #
+        def last_for_path(repo, ref, path = nil)
+          where(
+            repo: repo,
+            ref: ref,
+            path: path,
+            limit: 1
+          ).first
+        end
+
+        # Get commits between two refs
+        #
+        # Ex.
+        #   Commit.between('29eda46b', 'master')
+        #
+        def between(repo, from, to)
+          repo.commits_between(from, to).map do |commit|
+            decorate(commit)
+          end
+        end
+
+        def decorate(commit, ref = nil)
+          Gitlab::Git::Commit.new(commit, ref)
+        end
+      end
+
       def initialize(raw_commit, head = nil)
         raise "Nil as raw commit passed" unless raw_commit
 

data/lib/gitlab_git/diff.rb

@@ -14,6 +14,21 @@ module Gitlab
       # Stats properties
       attr_accessor  :new_file, :renamed_file, :deleted_file
 
+      class << self
+        def between(repo, from, to)
+          # 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)
+
+          repo.diff(common_commit, from).map do |diff|
+            Gitlab::Git::Diff.new(diff)
+          end
+        rescue Grit::Git::GitTimeout
+          [Gitlab::Git::Diff::BROKEN_DIFF]
+        end
+      end
+
       def initialize(raw_diff)
         raise "Nil as raw diff passed" unless raw_diff
 

data/lib/gitlab_git/git_stats.rb

@@ -10,7 +10,8 @@ module Gitlab
       end
 
       def log
-        args = ['--format=%aN%x0a%ad', '--date=short', '--shortstat', '--no-merges']
+        # Limit log to 8k commits to avoid timeout for huge projects
+        args = ['--format=%aN%x0a%aE%x0a%ad', '--date=short', '--shortstat', '--no-merges', '--max-count=8000']
         repo.git.run(nil, 'log', nil, {}, args)
       rescue Grit::Git::GitTimeout
         nil

data/lib/gitlab_git/log_parser.rb

@@ -2,31 +2,23 @@ module Gitlab
   module Git
     class LogParser
       # Parses the log file into a collection of commits
-      # Data model: {author, date, additions, deletions}
-      def self.parse_log log_from_git
+      # Data model:
+      #   {author_name, author_email, date, additions, deletions}
+      def self.parse_log(log_from_git)
         log = log_from_git.split("\n")
-
-        i = 0
         collection = []
-        entry = {}
 
-        while i <= log.size do
-          pos = i % 4
-          case pos
-          when 0
-            unless i == 0
-              collection.push(entry)
-              entry = {}
-            end
-            entry[:author] = log[i].to_s
-          when 1
-            entry[:date] = log[i].to_s
-          when 3
-            changes = log[i].split(",")
-            entry[:additions] = changes[1].to_i unless changes[1].nil?
-            entry[:deletions] = changes[2].to_i unless changes[2].nil?
-          end
-          i += 1
+        log.each_slice(5) do |slice|
+          entry = {}
+          entry[:author_name] = slice[0]
+          entry[:author_email] = slice[1]
+          entry[:date] = slice[2]
+
+          changes = slice[4].split(",")
+          entry[:additions] = changes[1].to_i unless changes[1].nil?
+          entry[:deletions] = changes[2].to_i unless changes[2].nil?
+
+          collection.push(entry)
         end
 
         collection

data/lib/gitlab_git/repository.rb

@@ -1,4 +1,4 @@
-# Gitlab::Git::Gitlab::Git::Commit is a wrapper around native Grit::Repository object
+# Gitlab::Git::Commit is a wrapper around native Grit::Repository object
 # We dont want to use grit objects inside app/
 # It helps us easily migrate to rugged in future
 module Gitlab
@@ -19,22 +19,21 @@ module Gitlab
       #
       attr_accessor :path_with_namespace
 
-      # Grit repo object
-      attr_accessor :repo
-
       # Default branch in the repository
       attr_accessor :root_ref
 
+      # Grit repo object
+      attr_reader :raw
+
+      # compatibility
+      alias_method :repo, :raw
+
       def initialize(path_with_namespace, root_ref = 'master')
         @root_ref = root_ref || "master"
         @path_with_namespace = path_with_namespace
 
         # Init grit repo object
-        repo
-      end
-
-      def raw
-        repo
+        raw
       end
 
       def path_to_repo
@@ -45,59 +44,12 @@ module Gitlab
         self.class.repos_path
       end
 
-      def repo
-        @repo ||= Grit::Repo.new(path_to_repo)
+      def raw
+        @raw ||= Grit::Repo.new(path_to_repo)
       rescue Grit::NoSuchPathError
         raise NoRepository.new('no repository for such path')
       end
 
-      def commit(commit_id = nil)
-        commit = if commit_id
-                   # Find repo.refs first,
-                   # because if commit_id is "tag name",
-                   # repo.commit(commit_id) returns wrong commit sha
-                   # that is git tag object sha.
-                   ref = repo.refs.find {|r| r.name == commit_id}
-                   if ref
-                     ref.commit
-                   else
-                     repo.commit(commit_id)
-                   end
-                 else
-                   repo.commits(root_ref).first
-                 end
-
-        decorate_commit(commit) if commit
-      end
-
-      def commits_with_refs(n = 20)
-        commits = repo.branches.map { |ref| decorate_commit(ref.commit, ref) }
-
-        commits.sort! do |x, y|
-          y.committed_date <=> x.committed_date
-        end
-
-        commits[0..n]
-      end
-
-      def commits(ref, path = nil, limit = nil, offset = nil)
-        if path && path != ''
-          repo.log(ref, path, max_count: limit, skip: offset, follow: true)
-        elsif limit && offset
-          repo.commits(ref, limit.to_i, offset.to_i)
-        else
-          repo.commits(ref)
-        end.map{ |c| decorate_commit(c) }
-      end
-
-      def commits_between(from, to)
-        repo.commits_between(from, to).map { |c| decorate_commit(c) }
-      end
-
-      def last_commit_for(ref, path = nil)
-        commits(ref, path, 1).first
-      end
-
       # Returns an Array of branch names
       # sorted by name ASC
       def branch_names
@@ -106,7 +58,7 @@ module Gitlab
 
       # Returns an Array of Branches
       def branches
-        repo.branches.sort_by(&:name)
+        raw.branches.sort_by(&:name)
       end
 
       # Returns an Array of tag names
@@ -116,7 +68,7 @@ module Gitlab
 
       # Returns an Array of Tags
       def tags
-        repo.tags.sort_by(&:name).reverse
+        raw.tags.sort_by(&:name).reverse
       end
 
       # Returns an Array of branch and tag names
@@ -125,7 +77,7 @@ module Gitlab
       end
 
       def heads
-        @heads ||= repo.heads.sort_by(&:name)
+        @heads ||= raw.heads.sort_by(&:name)
       end
 
       def tree(fcommit, path = nil)
@@ -135,7 +87,7 @@ module Gitlab
       end
 
       def has_commits?
-        !!commit
+        !!Gitlab::Git::Commit.last(self)
       rescue Grit::NoSuchPathError
         false
       end
@@ -167,7 +119,7 @@ module Gitlab
       #
       def archive_repo(ref, storage_path)
         ref = ref || self.root_ref
-        commit = self.commit(ref)
+        commit = Gitlab::Git::Commit.find(self, ref)
         return nil unless commit
 
         # Build file path
@@ -180,7 +132,7 @@ module Gitlab
         # Create file if not exists
         unless File.exists?(file_path)
           FileUtils.mkdir_p File.dirname(file_path)
-          file = self.repo.archive_to_file(ref, prefix,  file_path)
+          file = self.raw.archive_to_file(ref, prefix,  file_path)
         end
 
         file_path
@@ -192,33 +144,60 @@ module Gitlab
         (size.to_f / 1024).round(2)
       end
 
-      def diffs_between(source_branch, target_branch)
-        # 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.git.native(:merge_base, {}, [target_branch, source_branch]).strip
-        repo.diff(common_commit, source_branch).map { |diff| Gitlab::Git::Diff.new(diff) }
-
-      rescue Grit::Git::GitTimeout
-        [Gitlab::Git::Diff::BROKEN_DIFF]
-      end
-
       def search_files(query, ref = nil)
         if ref.nil? || ref == ""
           ref = root_ref
         end
 
-        greps = repo.grep(query, 3, ref)
+        greps = raw.grep(query, 3, ref)
 
         greps.map do |grep|
           Gitlab::Git::BlobSnippet.new(ref, grep.content, grep.startline, grep.filename)
         end
       end
 
-      protected
+      # Delegate log to Grit method
+      #
+      # Usage.
+      #   repo.log(
+      #     ref: 'master',
+      #     path: 'app/models',
+      #     limit: 10,
+      #     offset: 5,
+      #   )
+      #
+      def log(options)
+        default_options = {
+          limit: 10,
+          offset: 0,
+          path: nil,
+          ref: root_ref,
+          follow: false
+        }
+
+        options = default_options.merge(options)
+
+        raw.log(
+          options[:ref] || root_ref,
+          options[:path],
+          max_count: options[:limit].to_i,
+          skip: options[:offset].to_i,
+          follow: options[:follow]
+        )
+      end
+
+      # Delegate commits_between to Grit method
+      #
+      def commits_between(from, to)
+        raw.commits_between(from, to)
+      end
+
+      def merge_base_commit(from, to)
+        raw.git.native(:merge_base, {}, [to, from]).strip
+      end
 
-      def decorate_commit(commit, ref = nil)
-        Gitlab::Git::Commit.new(commit, ref)
+      def diff(from, to)
+        raw.diff(from, to)
       end
     end
   end

data/lib/gitlab_git/tree.rb

@@ -9,7 +9,7 @@ module Gitlab
         @path = nil if !@path || @path == ''
 
         # Load tree from repository
-        @commit = @repository.commit(@sha)
+        @commit = Gitlab::Git::Commit.find(@repository, @sha)
         @raw_tree = @repository.tree(@commit, @path)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0.beta
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
@@ -86,9 +86,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3