commit.rb 13.1 KB
Newer Older
R
Robert Speicher 已提交
1 2 3 4
# Gitlab::Git::Commit is a wrapper around native Rugged::Commit object
module Gitlab
  module Git
    class Commit
5
      include Gitlab::EncodingHelper
R
Robert Speicher 已提交
6

7
      attr_accessor :raw_commit, :head
R
Robert Speicher 已提交
8 9 10 11 12 13 14 15 16

      SERIALIZE_KEYS = [
        :id, :message, :parent_ids,
        :authored_date, :author_name, :author_email,
        :committed_date, :committer_name, :committer_email
      ].freeze

      attr_accessor *SERIALIZE_KEYS # rubocop:disable Lint/AmbiguousOperator

17
      delegate :tree, to: :rugged_commit
D
Douwe Maan 已提交
18

R
Robert Speicher 已提交
19 20 21
      def ==(other)
        return false unless other.is_a?(Gitlab::Git::Commit)

22
        id && id == other.id
R
Robert Speicher 已提交
23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
      end

      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)

41
          repo.log(options)
R
Robert Speicher 已提交
42 43 44 45 46 47 48 49 50
        end

        # Get single commit
        #
        # Ex.
        #   Commit.find(repo, '29eda46b')
        #
        #   Commit.find(repo, 'master')
        #
51
        # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/321
R
Robert Speicher 已提交
52
        def find(repo, commit_id = "HEAD")
53
          # Already a commit?
54
          return commit_id if commit_id.is_a?(Gitlab::Git::Commit)
55 56 57

          # A rugged reference?
          commit_id = Gitlab::Git::Ref.dereference_object(commit_id)
58
          return decorate(repo, commit_id) if commit_id.is_a?(Rugged::Commit)
R
Robert Speicher 已提交
59

60 61 62 63 64 65 66 67
          # Some weird thing?
          return nil unless commit_id.is_a?(String)

          commit = repo.gitaly_migrate(:find_commit) do |is_enabled|
            if is_enabled
              repo.gitaly_commit_client.find_commit(commit_id)
            else
              obj = repo.rev_parse_target(commit_id)
R
Robert Speicher 已提交
68

69 70 71
              obj.is_a?(Rugged::Commit) ? obj : nil
            end
          end
R
Robert Speicher 已提交
72

73 74
          decorate(repo, commit) if commit
        rescue Rugged::ReferenceError, Rugged::InvalidError, Rugged::ObjectError,
75 76
               Gitlab::Git::CommandError, Gitlab::Git::Repository::NoRepository,
               Rugged::OdbError, Rugged::TreeError
R
Robert Speicher 已提交
77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111
          nil
        end

        # Get last commit for HEAD
        #
        # Ex.
        #   Commit.last(repo)
        #
        def last(repo)
          find(repo)
        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 revspecs
        # See also #repository.commits_between
        #
        # Ex.
        #   Commit.between(repo, '29eda46b', 'master')
        #
        def between(repo, base, head)
112
          Gitlab::GitalyClient.migrate(:commits_between) do |is_enabled|
113 114 115
            if is_enabled
              repo.gitaly_commit_client.between(base, head)
            else
116
              repo.rugged_commits_between(base, head).map { |c| decorate(repo, c) }
117 118
            end
          end
R
Robert Speicher 已提交
119 120 121 122
        rescue Rugged::ReferenceError
          []
        end

123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142
        # Returns commits collection
        #
        # Ex.
        #   Commit.find_all(
        #     repo,
        #     ref: 'master',
        #     max_count: 10,
        #     skip: 5,
        #     order: :date
        #   )
        #
        #   +options+ is a Hash of optional arguments to git
        #     :ref is the ref from which to begin (SHA1 or name)
        #     :max_count is the maximum number of commits to fetch
        #     :skip is the number of commits to skip
        #     :order is the commits order and allowed value is :none (default), :date,
        #        :topo, or any combination of them (in an array). Commit ordering types
        #        are documented here:
        #        http://www.rubydoc.info/github/libgit2/rugged/Rugged#SORT_NONE-constant)
        #
143
        # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/326
R
Robert Speicher 已提交
144
        def find_all(repo, options = {})
145 146 147 148 149 150 151 152 153 154
          Gitlab::GitalyClient.migrate(:find_all_commits) do |is_enabled|
            if is_enabled
              find_all_by_gitaly(repo, options)
            else
              find_all_by_rugged(repo, options)
            end
          end
        end

        def find_all_by_rugged(repo, options = {})
155 156
          actual_options = options.dup

157
          allowed_options = [:ref, :max_count, :skip, :order]
158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182

          actual_options.keep_if do |key|
            allowed_options.include?(key)
          end

          default_options = { skip: 0 }
          actual_options = default_options.merge(actual_options)

          rugged = repo.rugged
          walker = Rugged::Walker.new(rugged)

          if actual_options[:ref]
            walker.push(rugged.rev_parse_oid(actual_options[:ref]))
          else
            rugged.references.each("refs/heads/*") do |ref|
              walker.push(ref.target_id)
            end
          end

          walker.sorting(rugged_sort_type(actual_options[:order]))

          commits = []
          offset = actual_options[:skip]
          limit = actual_options[:max_count]
          walker.each(offset: offset, limit: limit) do |commit|
183
            commits.push(decorate(repo, commit))
184 185 186 187 188 189 190
          end

          walker.reset

          commits
        rescue Rugged::OdbError
          []
R
Robert Speicher 已提交
191 192
        end

193 194 195 196
        def find_all_by_gitaly(repo, options = {})
          Gitlab::GitalyClient::CommitService.new(repo).find_all_commits(options)
        end

197 198
        def decorate(repository, commit, ref = nil)
          Gitlab::Git::Commit.new(repository, commit, ref)
R
Robert Speicher 已提交
199 200
        end

201 202 203 204 205 206 207 208 209 210 211 212 213
        # Returns the `Rugged` sorting type constant for one or more given
        # sort types. Valid keys are `:none`, `:topo`, and `:date`, or an array
        # containing more than one of them. `:date` uses a combination of date and
        # topological sorting to closer mimic git's native ordering.
        def rugged_sort_type(sort_type)
          @rugged_sort_types ||= {
            none: Rugged::SORT_NONE,
            topo: Rugged::SORT_TOPO,
            date: Rugged::SORT_DATE | Rugged::SORT_TOPO
          }

          @rugged_sort_types.fetch(sort_type, Rugged::SORT_NONE)
        end
214 215 216 217 218 219 220 221 222 223

        def shas_with_signatures(repository, shas)
          shas.select do |sha|
            begin
              Rugged::Commit.extract_signature(repository.rugged, sha)
            rescue Rugged::OdbError
              false
            end
          end
        end
R
Robert Speicher 已提交
224 225
      end

226
      def initialize(repository, raw_commit, head = nil)
R
Robert Speicher 已提交
227 228
        raise "Nil as raw commit passed" unless raw_commit

229 230
        case raw_commit
        when Hash
R
Robert Speicher 已提交
231
          init_from_hash(raw_commit)
232
        when Rugged::Commit
R
Robert Speicher 已提交
233
          init_from_rugged(raw_commit)
234
        when Gitaly::GitCommit
235
          init_from_gitaly(raw_commit)
R
Robert Speicher 已提交
236 237 238 239
        else
          raise "Invalid raw commit type: #{raw_commit.class}"
        end

240
        @repository = repository
R
Robert Speicher 已提交
241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271
        @head = head
      end

      def sha
        id
      end

      def short_id(length = 10)
        id.to_s[0..length]
      end

      def safe_message
        @safe_message ||= message
      end

      def created_at
        committed_date
      end

      # Was this commit committed by a different person than the original author?
      def different_committer?
        author_name != committer_name || author_email != committer_email
      end

      def parent_id
        parent_ids.first
      end

      # Shows the diff between the commit's parent and the commit.
      #
      # Cuts out the header and stats from #to_patch and returns only the diff.
272 273
      #
      # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/324
274
      def to_diff
275 276 277 278 279 280 281
        Gitlab::GitalyClient.migrate(:commit_patch) do |is_enabled|
          if is_enabled
            @repository.gitaly_commit_client.patch(id)
          else
            rugged_diff_from_parent.patch
          end
        end
R
Robert Speicher 已提交
282 283 284 285
      end

      # Returns a diff object for the changes from this commit's first parent.
      # If there is no parent, then the diff is between this commit and an
286
      # empty repo. See Repository#diff for keys allowed in the +options+
R
Robert Speicher 已提交
287 288
      # hash.
      def diff_from_parent(options = {})
289 290 291 292 293 294 295 296 297 298 299 300 301 302
        Gitlab::GitalyClient.migrate(:commit_raw_diffs) do |is_enabled|
          if is_enabled
            @repository.gitaly_commit_client.diff_from_parent(self, options)
          else
            rugged_diff_from_parent(options)
          end
        end
      end

      def rugged_diff_from_parent(options = {})
        options ||= {}
        break_rewrites = options[:break_rewrites]
        actual_options = Gitlab::Git::Diff.filter_diff_options(options)

303 304 305 306 307
        diff = if rugged_commit.parents.empty?
                 rugged_commit.diff(actual_options.merge(reverse: true))
               else
                 rugged_commit.parents[0].diff(rugged_commit, actual_options)
               end
308 309 310

        diff.find_similar!(break_rewrites: break_rewrites)
        diff
R
Robert Speicher 已提交
311 312
      end

313
      def deltas
314 315 316 317 318 319 320 321 322 323 324
        @deltas ||= begin
          deltas = Gitlab::GitalyClient.migrate(:commit_deltas) do |is_enabled|
            if is_enabled
              @repository.gitaly_commit_client.commit_deltas(self)
            else
              rugged_diff_from_parent.each_delta
            end
          end

          deltas.map { |delta| Gitlab::Git::Diff.new(delta) }
        end
325 326
      end

R
Robert Speicher 已提交
327 328 329 330 331 332 333 334 335 336 337 338
      def has_zero_stats?
        stats.total.zero?
      rescue
        true
      end

      def no_commit_message
        "--no commit message"
      end

      def to_hash
        serialize_keys.map.with_object({}) do |key, hash|
339
          hash[key] = send(key) # rubocop:disable GitlabSecurity/PublicSend
R
Robert Speicher 已提交
340 341 342 343 344 345 346 347
        end
      end

      def date
        committed_date
      end

      def diffs(options = {})
348
        Gitlab::Git::DiffCollection.new(diff_from_parent(options), options)
R
Robert Speicher 已提交
349 350 351
      end

      def parents
352
        parent_ids.map { |oid| self.class.find(@repository, oid) }.compact
R
Robert Speicher 已提交
353 354 355
      end

      def stats
356
        Gitlab::Git::CommitStats.new(@repository, self)
R
Robert Speicher 已提交
357 358 359 360
      end

      def to_patch(options = {})
        begin
361
          rugged_commit.to_mbox(options)
R
Robert Speicher 已提交
362
        rescue Rugged::InvalidError => ex
A
Alexis Reigel 已提交
363
          if ex.message =~ /commit \w+ is a merge commit/i
R
Robert Speicher 已提交
364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408
            'Patch format is not currently supported for merge commits.'
          end
        end
      end

      # Get a collection of Rugged::Reference objects for this commit.
      #
      # Ex.
      #   commit.ref(repo)
      #
      def refs(repo)
        repo.refs_hash[id]
      end

      # Get ref names collection
      #
      # Ex.
      #   commit.ref_names(repo)
      #
      def ref_names(repo)
        refs(repo).map do |ref|
          ref.name.sub(%r{^refs/(heads|remotes|tags)/}, "")
        end
      end

      def message
        encode! @message
      end

      def author_name
        encode! @author_name
      end

      def author_email
        encode! @author_email
      end

      def committer_name
        encode! @committer_name
      end

      def committer_email
        encode! @committer_email
      end

409 410 411 412 413 414 415 416
      def rugged_commit
        @rugged_commit ||= if raw_commit.is_a?(Rugged::Commit)
                             raw_commit
                           else
                             @repository.rev_parse_target(id)
                           end
      end

417 418 419 420
      def merge_commit?
        parent_ids.size > 1
      end

R
Robert Speicher 已提交
421 422 423 424 425 426
      private

      def init_from_hash(hash)
        raw_commit = hash.symbolize_keys

        serialize_keys.each do |key|
427
          send("#{key}=", raw_commit[key]) # rubocop:disable GitlabSecurity/PublicSend
R
Robert Speicher 已提交
428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446
        end
      end

      def init_from_rugged(commit)
        author = commit.author
        committer = commit.committer

        @raw_commit = commit
        @id = commit.oid
        @message = commit.message
        @authored_date = author[:time]
        @committed_date = committer[:time]
        @author_name = author[:name]
        @author_email = author[:email]
        @committer_name = committer[:name]
        @committer_email = committer[:email]
        @parent_ids = commit.parents.map(&:oid)
      end

447 448 449 450 451 452
      def init_from_gitaly(commit)
        @raw_commit = commit
        @id = commit.id
        # TODO: Once gitaly "takes over" Rugged consider separating the
        # subject from the message to make it clearer when there's one
        # available but not the other.
453
        @message = (commit.body.presence || commit.subject).dup
454
        @authored_date = Time.at(commit.author.date.seconds).utc
455 456
        @author_name = commit.author.name.dup
        @author_email = commit.author.email.dup
457
        @committed_date = Time.at(commit.committer.date.seconds).utc
458 459 460 461 462
        @committer_name = commit.committer.name.dup
        @committer_email = commit.committer.email.dup
        @parent_ids = commit.parent_ids
      end

R
Robert Speicher 已提交
463 464 465 466 467 468
      def serialize_keys
        SERIALIZE_KEYS
      end
    end
  end
end