GitLab wurde erfolgreich aktualisiert. Dank regelmäßiger Updates bleibt das THM GitLab sicher und Sie profitieren von den neuesten Funktionen. Danke für Ihre Geduld.

merge_request_diff.rb 6.05 KB
Newer Older
1
class MergeRequestDiff < ActiveRecord::Base
2
  include Sortable
3
  include Importable
4

5
  # Prevent store of diff if commits amount more then 500
6
  COMMITS_SAFE_SIZE = 100
7 8 9

  belongs_to :merge_request

10
  delegate :source_branch_sha, :target_branch_sha, :target_branch, :source_branch, to: :merge_request, prefix: nil
11 12 13

  state_machine :state, initial: :empty do
    state :collected
14 15 16
    state :overflow
    # Deprecated states: these are no longer used but these values may still occur
    # in the database.
17 18 19 20 21 22 23 24 25
    state :timeout
    state :overflow_commits_safe_size
    state :overflow_diff_files_limit
    state :overflow_diff_lines_limit
  end

  serialize :st_commits
  serialize :st_diffs

26
  after_create :reload_content, unless: :importing?
27
  after_save :keep_around_commits, unless: :importing?
28 29 30 31 32 33

  def reload_content
    reload_commits
    reload_diffs
  end

34 35
  def size
    real_size.presence || diffs.size
36 37
  end

38 39 40 41
  def diffs(options={})
    if options[:ignore_whitespace_change]
      @diffs_no_whitespace ||= begin
        compare = Gitlab::Git::Compare.new(
42
          repository.raw_repository,
43 44
          self.start_commit_sha || self.target_branch_sha,
          self.head_commit_sha || self.source_branch_sha,
45 46 47 48
        )
        compare.diffs(options)
      end
    else
49
      @diffs ||= {}
50
      @diffs[options] ||= load_diffs(st_diffs, options)
51
    end
52 53
  end

54 55 56 57 58 59 60 61
  def commits
    @commits ||= load_commits(st_commits || [])
  end

  def last_commit
    commits.first
  end

62 63 64 65
  def first_commit
    commits.last
  end

66
  def base_commit
67
    return unless self.base_commit_sha
68

69
    project.commit(self.base_commit_sha)
70 71
  end

72 73 74
  def start_commit
    return unless self.start_commit_sha

75
    project.commit(self.start_commit_sha)
76 77 78 79 80
  end

  def head_commit
    return last_commit unless self.head_commit_sha

81
    project.commit(self.head_commit_sha)
82 83
  end

84 85 86 87 88
  def compare
    @compare ||=
      begin
        # Update ref for merge request
        merge_request.fetch_ref
89

90
        Gitlab::Git::Compare.new(
91
          repository.raw_repository,
92 93 94 95
          self.target_branch_sha,
          self.source_branch_sha
        )
      end
96 97
  end

98
  private
99 100 101 102

  # Collect array of Git::Commit objects
  # between target and source branches
  def unmerged_commits
103
    commits = compare.commits
104 105

    if commits.present?
Sean McGivern's avatar
Sean McGivern committed
106
      commits = Commit.decorate(commits, merge_request.source_project).reverse
107 108 109 110 111
    end

    commits
  end

112 113 114 115 116 117 118 119
  def dump_commits(commits)
    commits.map(&:to_hash)
  end

  def load_commits(array)
    array.map { |hash| Commit.new(Gitlab::Git::Commit.new(hash), merge_request.source_project) }
  end

120 121 122
  # Reload all commits related to current merge request from repo
  # and save it as array of hashes in st_commits db field
  def reload_commits
123 124
    new_attributes = {}

125 126 127
    commit_objects = unmerged_commits

    if commit_objects.present?
128
      new_attributes[:st_commits] = dump_commits(commit_objects)
129 130
    end

131
    update_columns_serialized(new_attributes)
132 133
  end

134 135 136 137 138 139 140 141 142 143 144 145 146 147
  # Collect array of Git::Diff objects
  # between target and source branches
  def unmerged_diffs
    compare.diffs(Commit.max_diff_options)
  end

  def dump_diffs(diffs)
    if diffs.respond_to?(:map)
      diffs.map(&:to_hash)
    end
  end

  def load_diffs(raw, options)
    if raw.respond_to?(:each)
148
      if paths = options[:paths]
149
        raw = raw.select do |diff|
150
          paths.include?(diff[:old_path]) || paths.include?(diff[:new_path])
151 152 153
        end
      end

154 155 156 157 158 159
      Gitlab::Git::DiffCollection.new(raw, options)
    else
      Gitlab::Git::DiffCollection.new([])
    end
  end

160 161 162
  # Reload diffs between branches related to current merge request from repo
  # and save it as array of hashes in st_diffs db field
  def reload_diffs
163
    new_attributes = {}
164 165 166
    new_diffs = []

    if commits.size.zero?
167
      new_attributes[:state] = :empty
168
    else
169
      diff_collection = unmerged_diffs
170

171 172 173
      if diff_collection.overflow?
        # Set our state to 'overflow' to make the #empty? and #collected?
        # methods (generated by StateMachine) return false.
174
        new_attributes[:state] = :overflow
175 176
      end

177
      new_attributes[:real_size] = diff_collection.real_size
178

179 180
      if diff_collection.any?
        new_diffs = dump_diffs(diff_collection)
181
        new_attributes[:state] = :collected
182
      end
183
    end
184

185
    new_attributes[:st_diffs] = new_diffs
186

187 188 189
    new_attributes[:start_commit_sha] = self.target_branch_sha
    new_attributes[:head_commit_sha] = self.source_branch_sha
    new_attributes[:base_commit_sha] = branch_base_sha
190

191
    update_columns_serialized(new_attributes)
192 193

    keep_around_commits
194 195
  end

196 197
  def project
    merge_request.target_project
198 199 200
  end

  def repository
201
    project.repository
202
  end
203

204 205
  def branch_base_commit
    return unless self.source_branch_sha && self.target_branch_sha
206

207
    project.merge_base_commit(self.source_branch_sha, self.target_branch_sha)
208 209
  end

210 211
  def branch_base_sha
    branch_base_commit.try(:sha)
212 213
  end

214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235
  #
  # #save or #update_attributes providing changes on serialized attributes do a lot of
  # serialization and deserialization calls resulting in bad performance.
  # Using #update_columns solves the problem with just one YAML.dump per serialized attribute that we provide.
  # As a tradeoff we need to reload the current instance to properly manage time objects on those serialized
  # attributes. So to keep the same behaviour as the attribute assignment we reload the instance.
  # The difference is in the usage of
  # #write_attribute= (#update_attributes) and #raw_write_attribute= (#update_columns)
  #
  # Ex:
  #
  #   new_attributes[:st_commits].first.slice(:committed_date)
  #   => {:committed_date=>2014-02-27 11:01:38 +0200}
  #   YAML.load(YAML.dump(new_attributes[:st_commits].first.slice(:committed_date)))
  #   => {:committed_date=>2014-02-27 10:01:38 +0100}
  #
  def update_columns_serialized(new_attributes)
    return unless new_attributes.any?

    update_columns(new_attributes.merge(updated_at: current_time_from_proper_timezone))
    reload
  end
236

237
  def keep_around_commits
238 239 240
    repository.keep_around(target_branch_sha)
    repository.keep_around(source_branch_sha)
    repository.keep_around(branch_base_sha)
241
  end
242
end