Class: Gitlab::Git::Commit

Inherits:
Object
  • Object
show all
Extended by:
WrapsGitalyErrors
Includes:
EncodingHelper, RuggedImpl::Commit, Utils::StrongMemoize
Defined in:
lib/gitlab/git/commit.rb

Constant Summary collapse

MAX_COMMIT_MESSAGE_DISPLAY_SIZE =
10.megabytes
MIN_SHA_LENGTH =
7
SERIALIZE_KEYS =
[
  :id, :message, :parent_ids,
  :authored_date, :author_name, :author_email,
  :committed_date, :committer_name, :committer_email, :trailers
].freeze

Constants included from EncodingHelper

EncodingHelper::ENCODING_CONFIDENCE_THRESHOLD, EncodingHelper::ESCAPED_CHARS, EncodingHelper::UNICODE_REPLACEMENT_CHARACTER

Instance Attribute Summary collapse

Class Method Summary collapse

Instance Method Summary collapse

Methods included from WrapsGitalyErrors

wrapped_gitaly_errors

Methods included from Utils::StrongMemoize

#clear_memoization, #strong_memoize, #strong_memoized?

Methods included from EncodingHelper

#binary_io, #detect_binary?, #detect_encoding, #detect_libgit2_binary?, #encode!, #encode_binary, #encode_utf8, #encode_utf8_no_detect, #encode_utf8_with_replacement_character, #unquote_path

Methods included from RuggedImpl::Commit

#init_from_rugged, #rugged_commit, #rugged_tree_entry

Methods included from Utils::Override

#extended, extensions, #included, #method_added, #override, #prepended, #queue_verification, verify!

Methods included from RuggedImpl::UseRugged

#execute_rugged_call, #rugged_enabled_through_feature_flag?, #rugged_feature_keys, #running_puma_with_multiple_threads?, #use_rugged?

Constructor Details

#initialize(repository, raw_commit, head = nil, lazy_load_parents: false) ⇒ Commit

Returns a new instance of Commit.


200
201
202
203
204
205
206
207
208
# File 'lib/gitlab/git/commit.rb', line 200

def initialize(repository, raw_commit, head = nil, lazy_load_parents: false)
  raise "Nil as raw commit passed" unless raw_commit

  @repository = repository
  @head = head
  @lazy_load_parents = lazy_load_parents

  init_commit(raw_commit)
end

Instance Attribute Details

#headObject

Returns the value of attribute head.


12
13
14
# File 'lib/gitlab/git/commit.rb', line 12

def head
  @head
end

#raw_commitObject

Returns the value of attribute raw_commit.


12
13
14
# File 'lib/gitlab/git/commit.rb', line 12

def raw_commit
  @raw_commit
end

#repositoryObject (readonly)

Returns the value of attribute repository.


23
24
25
# File 'lib/gitlab/git/commit.rb', line 23

def repository
  @repository
end

Class Method Details

.batch_by_oid(repo, oids) ⇒ Object

Only to be used when the object ids will not necessarily have a relation to each other. The last 10 commits for a branch for example, should go through .where


169
170
171
172
173
# File 'lib/gitlab/git/commit.rb', line 169

def batch_by_oid(repo, oids)
  wrapped_gitaly_errors do
    repo.gitaly_commit_client.list_commits_by_oid(oids)
  end
end

.batch_signature_extraction(repository, commit_ids) ⇒ Object


183
184
185
# File 'lib/gitlab/git/commit.rb', line 183

def batch_signature_extraction(repository, commit_ids)
  repository.gitaly_commit_client.get_commit_signatures(commit_ids)
end

.between(repo, base, head, limit: nil) ⇒ Object

Get commits between two revspecs See also #repository.commits_between

Ex.

Commit.between(repo, '29eda46b', 'master') # all commits, ordered oldest to newest
Commit.between(repo, '29eda46b', 'master', limit: 100) # 100 newest commits, ordered oldest to newest

114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
# File 'lib/gitlab/git/commit.rb', line 114

def between(repo, base, head, limit: nil)
  # In either of these cases, we are guaranteed to return no commits, so
  # shortcut the RPC call
  return [] if Gitlab::Git.blank_ref?(base) || Gitlab::Git.blank_ref?(head)

  wrapped_gitaly_errors do
    revisions = [head, "^#{base}"] # base..head
    client = repo.gitaly_commit_client

    # We must return the commits in chronological order but using both
    # limit and reverse in the Gitaly RPC would return the oldest N,
    # rather than newest N, commits, so reorder in Ruby with limit
    if limit
      client.list_commits(revisions, pagination_params: { limit: limit }).reverse!
    else
      client.list_commits(revisions, reverse: true)
    end
  end
end

.decorate(repository, commit, ref = nil) ⇒ Object


158
159
160
# File 'lib/gitlab/git/commit.rb', line 158

def decorate(repository, commit, ref = nil)
  Gitlab::Git::Commit.new(repository, commit, ref)
end

.extract_signature_lazily(repository, commit_id) ⇒ Object


175
176
177
178
179
180
181
# File 'lib/gitlab/git/commit.rb', line 175

def extract_signature_lazily(repository, commit_id)
  BatchLoader.for(commit_id).batch(key: repository) do |commit_ids, loader, args|
    batch_signature_extraction(args[:key], commit_ids).each do |commit_id, signature_data|
      loader.call(commit_id, signature_data)
    end
  end
end

.find(repo, commit_id = "HEAD") ⇒ Object

Get single commit

Ex.

Commit.find(repo, '29eda46b')

Commit.find(repo, 'master')

Gitaly migration: gitlab.com/gitlab-org/gitaly/issues/321


58
59
60
61
62
63
64
65
66
67
68
69
70
# File 'lib/gitlab/git/commit.rb', line 58

def find(repo, commit_id = "HEAD")
  # Already a commit?
  return commit_id if commit_id.is_a?(Gitlab::Git::Commit)

  # This saves us an RPC round trip.
  return unless valid?(commit_id)

  commit = find_commit(repo, commit_id)

  decorate(repo, commit) if commit
rescue Gitlab::Git::CommandError, Gitlab::Git::Repository::NoRepository, ArgumentError
  nil
end

.find_all(repo, options = {}) ⇒ Object

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: https://git-scm.com/docs/git-log#_commit_ordering

152
153
154
155
156
# File 'lib/gitlab/git/commit.rb', line 152

def find_all(repo, options = {})
  wrapped_gitaly_errors do
    Gitlab::GitalyClient::CommitService.new(repo).find_all_commits(options)
  end
end

.find_commit(repo, commit_id) ⇒ Object


72
73
74
75
76
# File 'lib/gitlab/git/commit.rb', line 72

def find_commit(repo, commit_id)
  wrapped_gitaly_errors do
    repo.gitaly_commit_client.find_commit(commit_id)
  end
end

.get_message(repository, commit_id) ⇒ Object


187
188
189
190
191
192
193
# File 'lib/gitlab/git/commit.rb', line 187

def get_message(repository, commit_id)
  BatchLoader.for(commit_id).batch(key: repository) do |commit_ids, loader, args|
    get_messages(args[:key], commit_ids).each do |commit_id, message|
      loader.call(commit_id, message)
    end
  end
end

.get_messages(repository, commit_ids) ⇒ Object


195
196
197
# File 'lib/gitlab/git/commit.rb', line 195

def get_messages(repository, commit_ids)
  repository.gitaly_commit_client.get_commit_messages(commit_ids)
end

.last(repo) ⇒ Object

Get last commit for HEAD

Ex.

Commit.last(repo)

83
84
85
# File 'lib/gitlab/git/commit.rb', line 83

def last(repo)
  find(repo)
end

.last_for_path(repo, ref, path = nil, literal_pathspec: false) ⇒ Object

Get last commit for specified path and ref

Ex.

Commit.last_for_path(repo, '29eda46b', 'app/models')

Commit.last_for_path(repo, 'master', 'Gemfile')

94
95
96
97
98
99
100
101
102
103
104
105
# File 'lib/gitlab/git/commit.rb', line 94

def last_for_path(repo, ref, path = nil, literal_pathspec: false)
  # rubocop: disable Rails/FindBy
  # This is not where..first from ActiveRecord
  where(
    repo: repo,
    ref: ref,
    path: path,
    limit: 1,
    literal_pathspec: literal_pathspec
  ).first
  # rubocop: enable Rails/FindBy
end

.shas_with_signatures(repository, shas) ⇒ Object


162
163
164
# File 'lib/gitlab/git/commit.rb', line 162

def shas_with_signatures(repository, shas)
  Gitlab::GitalyClient::CommitService.new(repository).filter_shas_with_signatures(shas)
end

.where(options) ⇒ Object

Get commits collection

Ex.

Commit.where(
  repo: repo,
  ref: 'master',
  path: 'app/models',
  limit: 10,
  offset: 5,
)

43
44
45
46
47
48
# File 'lib/gitlab/git/commit.rb', line 43

def where(options)
  repo = options.delete(:repo)
  raise 'Gitlab::Git::Repository is required' unless repo.respond_to?(:log)

  repo.log(options)
end

Instance Method Details

#==(other) ⇒ Object


25
26
27
28
29
# File 'lib/gitlab/git/commit.rb', line 25

def ==(other)
  return false unless other.is_a?(Gitlab::Git::Commit)

  id && id == other.id
end

#author_emailObject


338
339
340
# File 'lib/gitlab/git/commit.rb', line 338

def author_email
  encode! @author_email
end

#author_nameObject


334
335
336
# File 'lib/gitlab/git/commit.rb', line 334

def author_name
  encode! @author_name
end

#authored_dateObject


258
259
260
261
262
# File 'lib/gitlab/git/commit.rb', line 258

def authored_date
  strong_memoize(:authored_date) do
    init_date_from_gitaly(raw_commit.author) if raw_commit
  end
end

#commit_tree_entry(path) ⇒ Object


364
365
366
367
368
369
370
371
372
373
374
375
376
377
# File 'lib/gitlab/git/commit.rb', line 364

def commit_tree_entry(path)
  # We're only interested in metadata, so limit actual data to 1 byte
  # since Gitaly doesn't support "send no data" option.
  entry = @repository.gitaly_commit_client.tree_entry(id, path, 1)
  return unless entry

  # To be compatible with the rugged format
  entry = entry.to_h
  entry.delete(:data)
  entry[:name] = File.basename(path)
  entry[:type] = entry[:type].downcase

  entry
end

#committed_dateObject


252
253
254
255
256
# File 'lib/gitlab/git/commit.rb', line 252

def committed_date
  strong_memoize(:committed_date) do
    init_date_from_gitaly(raw_commit.committer) if raw_commit
  end
end

#committer_emailObject


346
347
348
# File 'lib/gitlab/git/commit.rb', line 346

def committer_email
  encode! @committer_email
end

#committer_nameObject


342
343
344
# File 'lib/gitlab/git/commit.rb', line 342

def committer_name
  encode! @committer_name
end

#created_atObject


233
234
235
# File 'lib/gitlab/git/commit.rb', line 233

def created_at
  committed_date
end

#dateObject


295
296
297
# File 'lib/gitlab/git/commit.rb', line 295

def date
  committed_date
end

#deltasObject


272
273
274
275
276
277
# File 'lib/gitlab/git/commit.rb', line 272

def deltas
  @deltas ||= begin
    deltas = @repository.gitaly_commit_client.commit_deltas(self)
    deltas.map { |delta| Gitlab::Git::Diff.new(delta) }
  end
end

#diff_from_parent(options = {}) ⇒ Object

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 empty repo. See Repository#diff for keys allowed in the options hash.


268
269
270
# File 'lib/gitlab/git/commit.rb', line 268

def diff_from_parent(options = {})
  @repository.gitaly_commit_client.diff_from_parent(self, options)
end

#different_committer?Boolean

Was this commit committed by a different person than the original author?

Returns:

  • (Boolean)

238
239
240
# File 'lib/gitlab/git/commit.rb', line 238

def different_committer?
  author_name != committer_name || author_email != committer_email
end

#diffs(options = {}) ⇒ Object


299
300
301
# File 'lib/gitlab/git/commit.rb', line 299

def diffs(options = {})
  Gitlab::Git::DiffCollection.new(diff_from_parent(options), options)
end

#first_ref_by_oid(repo) ⇒ Object


322
323
324
325
326
327
328
# File 'lib/gitlab/git/commit.rb', line 322

def first_ref_by_oid(repo)
  ref = repo.refs_by_oid(oid: id, limit: 1)&.first

  return unless ref

  strip_ref_prefix(ref)
end

#gitaly_commit?Boolean

Returns:

  • (Boolean)

354
355
356
# File 'lib/gitlab/git/commit.rb', line 354

def gitaly_commit?
  raw_commit.is_a?(Gitaly::GitCommit)
end

#has_zero_stats?Boolean

Returns:

  • (Boolean)

279
280
281
282
283
# File 'lib/gitlab/git/commit.rb', line 279

def has_zero_stats?
  stats.total == 0
rescue StandardError
  true
end

#init_commit(raw_commit) ⇒ Object


210
211
212
213
214
215
216
217
218
219
# File 'lib/gitlab/git/commit.rb', line 210

def init_commit(raw_commit)
  case raw_commit
  when Hash
    init_from_hash(raw_commit)
  when Gitaly::GitCommit
    init_from_gitaly(raw_commit)
  else
    raise "Invalid raw commit type: #{raw_commit.class}"
  end
end

#merge_commit?Boolean

Returns:

  • (Boolean)

350
351
352
# File 'lib/gitlab/git/commit.rb', line 350

def merge_commit?
  parent_ids.size > 1
end

#messageObject


330
331
332
# File 'lib/gitlab/git/commit.rb', line 330

def message
  encode! @message
end

#no_commit_messageObject


285
286
287
# File 'lib/gitlab/git/commit.rb', line 285

def no_commit_message
  "No commit message"
end

#parent_idObject


248
249
250
# File 'lib/gitlab/git/commit.rb', line 248

def parent_id
  parent_ids.first
end

#parent_idsObject


242
243
244
245
246
# File 'lib/gitlab/git/commit.rb', line 242

def parent_ids
  return @parent_ids unless @lazy_load_parents

  @parent_ids ||= @repository.commit(id).parent_ids
end

#parentsObject


303
304
305
# File 'lib/gitlab/git/commit.rb', line 303

def parents
  parent_ids.map { |oid| self.class.find(@repository, oid) }.compact
end

#ref_names(repo) ⇒ Object

Get ref names collection

Ex.

commit.ref_names(repo)

316
317
318
319
320
# File 'lib/gitlab/git/commit.rb', line 316

def ref_names(repo)
  refs(repo).map do |ref|
    strip_ref_prefix(ref)
  end
end

#safe_messageObject


229
230
231
# File 'lib/gitlab/git/commit.rb', line 229

def safe_message
  @safe_message ||= message
end

#shaObject


221
222
223
# File 'lib/gitlab/git/commit.rb', line 221

def sha
  id
end

#short_id(length = 10) ⇒ Object


225
226
227
# File 'lib/gitlab/git/commit.rb', line 225

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

#statsObject


307
308
309
# File 'lib/gitlab/git/commit.rb', line 307

def stats
  Gitlab::Git::CommitStats.new(@repository, self)
end

#to_gitaly_commitObject


379
380
381
382
383
384
385
386
387
388
389
390
391
# File 'lib/gitlab/git/commit.rb', line 379

def to_gitaly_commit
  return raw_commit if gitaly_commit?

  message_split = raw_commit.message.split("\n", 2)
  Gitaly::GitCommit.new(
    id: raw_commit.oid,
    subject: message_split[0] ? message_split[0].chomp.b : "",
    body: raw_commit.message.b,
    parent_ids: raw_commit.parent_ids,
    author: gitaly_commit_author_from_raw(raw_commit.author),
    committer: gitaly_commit_author_from_raw(raw_commit.committer)
  )
end

#to_hashObject


289
290
291
292
293
# File 'lib/gitlab/git/commit.rb', line 289

def to_hash
  serialize_keys.map.with_object({}) do |key, hash|
    hash[key] = send(key) # rubocop:disable GitlabSecurity/PublicSend
  end
end

#tree_entry(path) ⇒ Object


358
359
360
361
362
# File 'lib/gitlab/git/commit.rb', line 358

def tree_entry(path)
  return unless path.present?

  commit_tree_entry(path)
end