diff options
author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-10 14:44:14 -0300 |
---|---|---|
committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-12 22:13:05 -0300 |
commit | 9fdde3693b3b49e929b7c80ccbec4abe412edb7f (patch) | |
tree | a0d6b1b4a21a2c2cc6d2322ecb410e08ef9103a4 /lib/gitlab | |
parent | faa9bd402d3521b3f7b4cc2583f8ef1b3cceb821 (diff) | |
download | gitlab-ce-9fdde3693b3b49e929b7c80ccbec4abe412edb7f.tar.gz |
Move line code generation into Gitlab::Gitconflict-resolution-refactor
Having a distinct class just for that was a bit overkill
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/bitbucket_import/importer.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/conflict/file.rb | 13 | ||||
-rw-r--r-- | lib/gitlab/diff/file.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/git.rb | 4 | ||||
-rw-r--r-- | lib/gitlab/git/conflict/file.rb | 6 | ||||
-rw-r--r-- | lib/gitlab/git/conflict/line_code.rb | 11 | ||||
-rw-r--r-- | lib/gitlab/github_import/comment_formatter.rb | 2 |
7 files changed, 11 insertions, 29 deletions
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb index 38ba5b97ed0..033ecd15749 100644 --- a/lib/gitlab/bitbucket_import/importer.rb +++ b/lib/gitlab/bitbucket_import/importer.rb @@ -241,7 +241,7 @@ module Gitlab end def generate_line_code(pr_comment) - Gitlab::Git::Conflict::LineCode.generate(pr_comment.file_path, pr_comment.new_pos, pr_comment.old_pos) + Gitlab::Git.diff_line_code(pr_comment.file_path, pr_comment.new_pos, pr_comment.old_pos) end def pull_request_comment_attributes(comment) diff --git a/lib/gitlab/conflict/file.rb b/lib/gitlab/conflict/file.rb index 3392388a45f..2a0cb640a14 100644 --- a/lib/gitlab/conflict/file.rb +++ b/lib/gitlab/conflict/file.rb @@ -110,7 +110,7 @@ module Gitlab end def line_code(line) - Gitlab::Git::Conflict::LineCode.generate(our_path, line.new_pos, line.old_pos) + Gitlab::Git.diff_line_code(our_path, line.new_pos, line.old_pos) end def create_match_line(line) @@ -174,17 +174,6 @@ module Gitlab new_path: our_path) end - # Don't try to print merge_request. - def inspect - instance_variables = [:content, :their_path, :our_path, :our_mode, :type].map do |instance_variable| - value = instance_variable_get("@#{instance_variable}") - - "#{instance_variable}=\"#{value}\"" - end - - "#<#{self.class} #{instance_variables.join(' ')}>" - end - private def map_raw_lines(raw_lines) diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb index 3f8d2041c29..ea5891a028a 100644 --- a/lib/gitlab/diff/file.rb +++ b/lib/gitlab/diff/file.rb @@ -49,7 +49,7 @@ module Gitlab def line_code(line) return if line.meta? - Gitlab::Git::Conflict::LineCode.generate(file_path, line.new_pos, line.old_pos) + Gitlab::Git.diff_line_code(file_path, line.new_pos, line.old_pos) end def line_for_line_code(code) diff --git a/lib/gitlab/git.rb b/lib/gitlab/git.rb index c78fe63f9b5..1f31cdbc96d 100644 --- a/lib/gitlab/git.rb +++ b/lib/gitlab/git.rb @@ -66,6 +66,10 @@ module Gitlab end end end + + def diff_line_code(file_path, new_line_position, old_line_position) + "#{Digest::SHA1.hexdigest(file_path)}_#{old_line_position}_#{new_line_position}" + end end end end diff --git a/lib/gitlab/git/conflict/file.rb b/lib/gitlab/git/conflict/file.rb index b2bc653904d..fc1595f1faf 100644 --- a/lib/gitlab/git/conflict/file.rb +++ b/lib/gitlab/git/conflict/file.rb @@ -19,8 +19,8 @@ module Gitlab begin @type = 'text' @lines = Gitlab::Git::Conflict::Parser.parse(content, - our_path: our_path, - their_path: their_path) + our_path: our_path, + their_path: their_path) rescue Gitlab::Git::Conflict::Parser::ParserError @type = 'text-editor' @lines = nil @@ -46,7 +46,7 @@ module Gitlab end def line_code(line) - Gitlab::Git::Conflict::LineCode.generate(our_path, line[:line_new], line[:line_old]) + Gitlab::Git.diff_line_code(our_path, line[:line_new], line[:line_old]) end def resolve_lines(resolution) diff --git a/lib/gitlab/git/conflict/line_code.rb b/lib/gitlab/git/conflict/line_code.rb deleted file mode 100644 index bdbb4c9cb83..00000000000 --- a/lib/gitlab/git/conflict/line_code.rb +++ /dev/null @@ -1,11 +0,0 @@ -module Gitlab - module Git - module Conflict - class LineCode - def self.generate(file_path, new_line_position, old_line_position) - "#{Digest::SHA1.hexdigest(file_path)}_#{old_line_position}_#{new_line_position}" - end - end - end - end -end diff --git a/lib/gitlab/github_import/comment_formatter.rb b/lib/gitlab/github_import/comment_formatter.rb index f8757507b78..8911b81ec9a 100644 --- a/lib/gitlab/github_import/comment_formatter.rb +++ b/lib/gitlab/github_import/comment_formatter.rb @@ -38,7 +38,7 @@ module Gitlab end def generate_line_code(line) - Gitlab::Git::Conflict::LineCode.generate(file_path, line.new_pos, line.old_pos) + Gitlab::Git.diff_line_code(file_path, line.new_pos, line.old_pos) end def on_diff? |