diff options
Diffstat (limited to 'lib/gitlab/conflict')
-rw-r--r-- | lib/gitlab/conflict/file.rb | 7 | ||||
-rw-r--r-- | lib/gitlab/conflict/file_collection.rb | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/lib/gitlab/conflict/file.rb b/lib/gitlab/conflict/file.rb index 2d8a21f4905..3392388a45f 100644 --- a/lib/gitlab/conflict/file.rb +++ b/lib/gitlab/conflict/file.rb @@ -6,7 +6,10 @@ module Gitlab CONTEXT_LINES = 3 - attr_reader :merge_request, :raw + attr_reader :merge_request + + # 'raw' holds the Gitlab::Git::Conflict::File that this instance wraps + attr_reader :raw delegate :type, :content, :their_path, :our_path, :our_mode, :our_blob, :repository, to: :raw @@ -107,7 +110,7 @@ module Gitlab end def line_code(line) - Gitlab::Git::DiffLineCode.generate(our_path, line.new_pos, line.old_pos) + Gitlab::Git::Conflict::LineCode.generate(our_path, line.new_pos, line.old_pos) end def create_match_line(line) diff --git a/lib/gitlab/conflict/file_collection.rb b/lib/gitlab/conflict/file_collection.rb index 573a953b2aa..fb28e80ff73 100644 --- a/lib/gitlab/conflict/file_collection.rb +++ b/lib/gitlab/conflict/file_collection.rb @@ -1,14 +1,14 @@ module Gitlab module Conflict class FileCollection - attr_reader :merge_request, :merge + attr_reader :merge_request, :resolver def initialize(merge_request) source_repo = merge_request.source_project.repository.raw our_commit = merge_request.source_branch_head.raw their_commit = merge_request.target_branch_head.raw target_repo = merge_request.target_project.repository.raw - @merge = Gitlab::Git::Merge.new(source_repo, our_commit, target_repo, their_commit) + @resolver = Gitlab::Git::Conflict::Resolver.new(source_repo, our_commit, target_repo, their_commit) @merge_request = merge_request end @@ -18,11 +18,11 @@ module Gitlab target_branch: merge_request.target_branch, commit_message: commit_message || default_commit_message } - merge.resolve_conflicts(user, files, args) + resolver.resolve_conflicts(user, files, args) end def files - @files ||= merge.conflicts.map do |conflict_file| + @files ||= resolver.conflicts.map do |conflict_file| Gitlab::Conflict::File.new(conflict_file, merge_request: merge_request) end end |