1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
# frozen_string_literal: true
class MergeRequestDiffFile < ApplicationRecord
extend SuppressCompositePrimaryKeyWarning
include BulkInsertSafe
include Gitlab::EncodingHelper
include DiffFile
belongs_to :merge_request_diff, inverse_of: :merge_request_diff_files
alias_attribute :index, :relative_order
scope :by_paths, ->(paths) do
where("new_path in (?) OR old_path in (?)", paths, paths)
end
def utf8_diff
fetched_diff = merge_request_diff&.stored_externally? ? diff_export : diff
return '' if fetched_diff.blank?
encode_utf8(fetched_diff) if fetched_diff.respond_to?(:encoding)
rescue StandardError => e
log_exception('Failed fetching merge request diff', e)
''
end
def diff
content =
if merge_request_diff&.stored_externally?
merge_request_diff.opening_external_diff do |file|
file.seek(external_diff_offset)
force_encode_utf8(file.read(external_diff_size))
end
else
super
end
return content unless binary?
# If the data isn't valid base64, return it as-is, since it's almost certain
# to be a valid diff. Parsing it as a diff will fail if it's something else.
#
# https://gitlab.com/gitlab-org/gitlab/-/issues/240921
begin
content.unpack1('m0')
rescue ArgumentError
content
end
end
private
# This method is meant to be used during Project Export.
# It is identical to the behaviour in #diff with the only
# difference of caching externally stored diffs on local disk in
# temp storage location in order to improve diff export performance.
def diff_export
content = merge_request_diff.cached_external_diff do |file|
file.seek(external_diff_offset)
force_encode_utf8(file.read(external_diff_size))
end
# See #diff
if binary?
content = begin
content.unpack1('m0')
rescue ArgumentError
content
end
end
content
rescue StandardError => e
log_exception('Cached external diff export failed', e)
diff
end
def log_exception(message, exception)
log_payload = {
message: message,
merge_request_diff_file_id: id,
merge_request_diff_id: merge_request_diff&.id
}
Gitlab::ExceptionLogFormatter.format!(exception, log_payload)
Gitlab::AppLogger.warn(log_payload)
end
end
|
