Move Gitlab::Diff::LineCode to module Gitlab::Git

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::Diff::LineCode.generate(diff.new_path, line.new_pos, line.old_pos)
+              break opts[:line_code] = Gitlab::Git::DiffLineCode.generate(diff.new_path, line.new_pos, line.old_pos)
             end
             break if opts[:line_code]

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::Diff::LineCode.generate(diff.new_path, line.new_pos, line.old_pos)
+                break opts[:line_code] = Gitlab::Git::DiffLineCode.generate(diff.new_path, line.new_pos, line.old_pos)
               end
               break if opts[:line_code]

lib/github/representation/comment.rb

@@ -23,7 +23,7 @@ module Github
       private
       def generate_line_code(line)
-        Gitlab::Diff::LineCode.generate(file_path, line.new_pos, line.old_pos)
+        Gitlab::Git::DiffLineCode.generate(file_path, line.new_pos, line.old_pos)
       end
       def on_diff?

lib/gitlab/bitbucket_import/importer.rb

@@ -241,7 +241,7 @@ module Gitlab
       end
       def generate_line_code(pr_comment)
-        Gitlab::Diff::LineCode.generate(pr_comment.file_path, pr_comment.new_pos, pr_comment.old_pos)
+        Gitlab::Git::DiffLineCode.generate(pr_comment.file_path, pr_comment.new_pos, pr_comment.old_pos)
       end
       def pull_request_comment_attributes(comment)

lib/gitlab/conflict/file.rb

@@ -163,7 +163,7 @@ module Gitlab
       end
       def line_code(line)
-        Gitlab::Diff::LineCode.generate(our_path, line.new_pos, line.old_pos)
+        Gitlab::Git::DiffLineCode.generate(our_path, line.new_pos, line.old_pos)
       end
       def create_match_line(line)

lib/gitlab/diff/file.rb

@@ -49,7 +49,7 @@ module Gitlab
       def line_code(line)
         return if line.meta?
-        Gitlab::Diff::LineCode.generate(file_path, line.new_pos, line.old_pos)
+        Gitlab::Git::DiffLineCode.generate(file_path, line.new_pos, line.old_pos)
       end
       def line_for_line_code(code)

lib/gitlab/diff/line_code.rb → lib/gitlab/git/diff_line_code.rb

 module Gitlab
-  module Diff
-    class LineCode
+  module Git
+    class DiffLineCode
       def self.generate(file_path, new_line_position, old_line_position)
         "#{Digest::SHA1.hexdigest(file_path)}_#{old_line_position}_#{new_line_position}"
       end

lib/gitlab/github_import/comment_formatter.rb

@@ -38,7 +38,7 @@ module Gitlab
       end
       def generate_line_code(line)
-        Gitlab::Diff::LineCode.generate(file_path, line.new_pos, line.old_pos)
+        Gitlab::Git::DiffLineCode.generate(file_path, line.new_pos, line.old_pos)
       end
       def on_diff?

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::Diff::LineCode.generate(subject.file_path, subject.new_line, 0)
+        line_code = Gitlab::Git::DiffLineCode.generate(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::Diff::LineCode.generate(subject.file_path, subject.new_line, 15)
+          line_code = Gitlab::Git::DiffLineCode.generate(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::Diff::LineCode.generate(subject.file_path, subject.new_line, subject.old_line)
+          line_code = Gitlab::Git::DiffLineCode.generate(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::Diff::LineCode.generate(subject.file_path, 13, subject.old_line)
+          line_code = Gitlab::Git::DiffLineCode.generate(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::Diff::LineCode.generate(subject.file_path, subject.new_line, 5)
+          line_code = Gitlab::Git::DiffLineCode.generate(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::Diff::LineCode.generate(subject.file_path, subject.new_line, subject.old_line)
+          line_code = Gitlab::Git::DiffLineCode.generate(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::Diff::LineCode.generate(subject.file_path, 4, subject.old_line)
+          line_code = Gitlab::Git::DiffLineCode.generate(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::Diff::LineCode.generate(subject.file_path, 0, subject.old_line)
+        line_code = Gitlab::Git::DiffLineCode.generate(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::Diff::LineCode.generate(subject.file_path, subject.new_line, 0)
+        line_code = Gitlab::Git::DiffLineCode.generate(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::Diff::LineCode.generate(subject.file_path, 0, subject.old_line)
+        line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, 0, subject.old_line)
         expect(subject.line_code(project.repository)).to eq(line_code)
       end

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::Diff::LineCode.generate(position.file_path, position.formatter.new_line, 15)
+      line_code = Gitlab::Git::DiffLineCode.generate(position.file_path, position.formatter.new_line, 15)
       expect(subject.line_code).to eq(line_code)
     end