kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix inline comment importing for 1:1 diff type

Browse source
This commit is contained in:
Valery Sizov 2016-12-05 20:34:11 +02:00
parent 32c6c9c457
commit 54221b5a3b
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/bitbucket/representation/pull_request_comment.rb
View file

@ -14,7 +14,7 @@ module Bitbucket
end end
def new_pos def new_pos
inline.fetch('to', nil) || 1 inline.fetch('to', nil) || old_pos || 1
end end
def parent_id def parent_id

26
lib/gitlab/bitbucket_import/importer.rb
View file

@ -81,10 +81,10 @@ module Gitlab
description: description, description: description,
source_project: project, source_project: project,
source_branch: pull_request.source_branch_name, source_branch: pull_request.source_branch_name,
source_branch_sha: pull_request.source_branch_sha, source_branch_sha: project.repository.rugged.lookup(pull_request.source_branch_sha).oid,
target_project: project, target_project: project,
target_branch: pull_request.target_branch_name, target_branch: pull_request.target_branch_name,
target_branch_sha: pull_request.target_branch_sha, target_branch_sha: project.repository.rugged.lookup(pull_request.target_branch_sha).oid,
state: pull_request.state, state: pull_request.state,
author_id: gitlab_user_id(project, pull_request.author), author_id: gitlab_user_id(project, pull_request.author),
assignee_id: nil, assignee_id: nil,
@ -94,7 +94,7 @@ module Gitlab
import_pull_request_comments(pull_request, merge_request) if merge_request.persisted? import_pull_request_comments(pull_request, merge_request) if merge_request.persisted?
rescue ActiveRecord::RecordInvalid rescue ActiveRecord::RecordInvalid
Rails.log.error("Bitbucket importer ERROR in #{project.path_with_namespace}: Invalid pull request #{e.message}") Rails.logger.error("Bitbucket importer ERROR in #{project.path_with_namespace}: Invalid pull request #{e.message}")
end end
end end
end end
@ -128,24 +128,36 @@ module Gitlab
begin begin
attributes = pull_request_comment_attributes(comment) attributes = pull_request_comment_attributes(comment)
attributes.merge!( attributes.merge!(
commit_id: pull_request.source_branch_sha, position: build_position(merge_request, comment),
line_code: line_code_map.fetch(comment.iid), line_code: line_code_map.fetch(comment.iid),
type: 'LegacyDiffNote') type: 'DiffNote')
merge_request.notes.create!(attributes) merge_request.notes.create!(attributes)
rescue ActiveRecord::RecordInvalid => e rescue ActiveRecord::RecordInvalid => e
Rails.log.error("Bitbucket importer ERROR in #{project.path_with_namespace}: Invalid pull request comment #{e.message}") Rails.logger.error("Bitbucket importer ERROR in #{project.path_with_namespace}: Invalid pull request comment #{e.message}")
nil nil
end end
end end
end end
def build_position(merge_request, pr_comment)
params = {
diff_refs: merge_request.diff_refs,
old_path: pr_comment.file_path,
new_path: pr_comment.file_path,
old_line: pr_comment.old_pos,
new_line: pr_comment.new_pos
}
Gitlab::Diff::Position.new(params)
end
def import_standalone_pr_comments(pr_comments, merge_request) def import_standalone_pr_comments(pr_comments, merge_request)
pr_comments.each do |comment| pr_comments.each do |comment|
begin begin
merge_request.notes.create!(pull_request_comment_attributes(comment)) merge_request.notes.create!(pull_request_comment_attributes(comment))
rescue ActiveRecord::RecordInvalid => e rescue ActiveRecord::RecordInvalid => e
Rails.log.error("Bitbucket importer ERROR in #{project.path_with_namespace}: Invalid standalone pull request comment #{e.message}") Rails.logger.error("Bitbucket importer ERROR in #{project.path_with_namespace}: Invalid standalone pull request comment #{e.message}")
nil nil
end end
end end