Move line code generation into Gitlab::Gitconflict-resolution-refactor

Having a distinct class just for that was a bit overkill

12 files changed, 25 insertions, 43 deletions

diff --git a/lib/api/commits.rb b/lib/api/commits.rb
index 6ad97f2deb2..62565e2d522 100644
--- a/lib/api/commits.rb
+++ b/lib/api/commits.rb
@@ -186,7 +186,7 @@ module API
 
             lines.each do |line|
               next unless line.new_pos == params[:line] && line.type == params[:line_type]
-              break opts[:line_code] = Gitlab::Git::Conflict::LineCode.generate(diff.new_path, line.new_pos, line.old_pos)
+              break opts[:line_code] = Gitlab::Git.diff_line_code(diff.new_path, line.new_pos, line.old_pos)
             end
 
             break if opts[:line_code]
diff --git a/lib/api/v3/commits.rb b/lib/api/v3/commits.rb
index cbb192d5dfc..bd5c6b34d12 100644
--- a/lib/api/v3/commits.rb
+++ b/lib/api/v3/commits.rb
@@ -173,7 +173,7 @@ module API
 
               lines.each do |line|
                 next unless line.new_pos == params[:line] && line.type == params[:line_type]
-                break opts[:line_code] = Gitlab::Git::Conflict::LineCode.generate(diff.new_path, line.new_pos, line.old_pos)
+                break opts[:line_code] = Gitlab::Git.diff_line_code(diff.new_path, line.new_pos, line.old_pos)
               end
 
               break if opts[:line_code]
diff --git a/lib/github/representation/comment.rb b/lib/github/representation/comment.rb
index 0cb871630fd..83bf0b5310d 100644
--- a/lib/github/representation/comment.rb
+++ b/lib/github/representation/comment.rb
@@ -23,7 +23,7 @@ module Github
       private
 
       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?
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?
diff --git a/spec/lib/gitlab/diff/position_spec.rb b/spec/lib/gitlab/diff/position_spec.rb
index e0c775bb0e9..245f24e96d4 100644
--- a/spec/lib/gitlab/diff/position_spec.rb
+++ b/spec/lib/gitlab/diff/position_spec.rb
@@ -40,7 +40,7 @@ describe Gitlab::Diff::Position do
 
     describe "#line_code" do
       it "returns the correct line code" do
-        line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, subject.new_line, 0)
+        line_code = Gitlab::Git.diff_line_code(subject.file_path, subject.new_line, 0)
 
         expect(subject.line_code(project.repository)).to eq(line_code)
       end
@@ -108,7 +108,7 @@ describe Gitlab::Diff::Position do
 
       describe "#line_code" do
         it "returns the correct line code" do
-          line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, subject.new_line, 15)
+          line_code = Gitlab::Git.diff_line_code(subject.file_path, subject.new_line, 15)
 
           expect(subject.line_code(project.repository)).to eq(line_code)
         end
@@ -149,7 +149,7 @@ describe Gitlab::Diff::Position do
 
       describe "#line_code" do
         it "returns the correct line code" do
-          line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, subject.new_line, subject.old_line)
+          line_code = Gitlab::Git.diff_line_code(subject.file_path, subject.new_line, subject.old_line)
 
           expect(subject.line_code(project.repository)).to eq(line_code)
         end
@@ -189,7 +189,7 @@ describe Gitlab::Diff::Position do
 
       describe "#line_code" do
         it "returns the correct line code" do
-          line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, 13, subject.old_line)
+          line_code = Gitlab::Git.diff_line_code(subject.file_path, 13, subject.old_line)
 
           expect(subject.line_code(project.repository)).to eq(line_code)
         end
@@ -233,7 +233,7 @@ describe Gitlab::Diff::Position do
 
       describe "#line_code" do
         it "returns the correct line code" do
-          line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, subject.new_line, 5)
+          line_code = Gitlab::Git.diff_line_code(subject.file_path, subject.new_line, 5)
 
           expect(subject.line_code(project.repository)).to eq(line_code)
         end
@@ -274,7 +274,7 @@ describe Gitlab::Diff::Position do
 
       describe "#line_code" do
         it "returns the correct line code" do
-          line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, subject.new_line, subject.old_line)
+          line_code = Gitlab::Git.diff_line_code(subject.file_path, subject.new_line, subject.old_line)
 
           expect(subject.line_code(project.repository)).to eq(line_code)
         end
@@ -314,7 +314,7 @@ describe Gitlab::Diff::Position do
 
       describe "#line_code" do
         it "returns the correct line code" do
-          line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, 4, subject.old_line)
+          line_code = Gitlab::Git.diff_line_code(subject.file_path, 4, subject.old_line)
 
           expect(subject.line_code(project.repository)).to eq(line_code)
         end
@@ -357,7 +357,7 @@ describe Gitlab::Diff::Position do
 
     describe "#line_code" do
       it "returns the correct line code" do
-        line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, 0, subject.old_line)
+        line_code = Gitlab::Git.diff_line_code(subject.file_path, 0, subject.old_line)
 
         expect(subject.line_code(project.repository)).to eq(line_code)
       end
@@ -399,7 +399,7 @@ describe Gitlab::Diff::Position do
 
     describe "#line_code" do
       it "returns the correct line code" do
-        line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, subject.new_line, 0)
+        line_code = Gitlab::Git.diff_line_code(subject.file_path, subject.new_line, 0)
 
         expect(subject.line_code(project.repository)).to eq(line_code)
       end
@@ -447,7 +447,7 @@ describe Gitlab::Diff::Position do
 
     describe "#line_code" do
       it "returns the correct line code" do
-        line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, 0, subject.old_line)
+        line_code = Gitlab::Git.diff_line_code(subject.file_path, 0, subject.old_line)
 
         expect(subject.line_code(project.repository)).to eq(line_code)
       end
diff --git a/spec/models/diff_note_spec.rb b/spec/models/diff_note_spec.rb
index 9db8a61e9ca..da972d2d86a 100644
--- a/spec/models/diff_note_spec.rb
+++ b/spec/models/diff_note_spec.rb
@@ -105,7 +105,7 @@ describe DiffNote do
 
   describe "#line_code" do
     it "returns the correct line code" do
-      line_code = Gitlab::Git::Conflict::LineCode.generate(position.file_path, position.formatter.new_line, 15)
+      line_code = Gitlab::Git.diff_line_code(position.file_path, position.formatter.new_line, 15)
 
       expect(subject.line_code).to eq(line_code)
     end