Merge branch 'zj-remove-dead-ruby-code' into 'master'

Remove unused Ruby code

See merge request gitlab-org/gitaly!1246

7 files changed, 8 insertions, 165 deletions

diff --git a/ruby/lib/gitaly_server/ref_service.rb b/ruby/lib/gitaly_server/ref_service.rb
index bd9c21929..93bb466a1 100644
--- a/ruby/lib/gitaly_server/ref_service.rb
+++ b/ruby/lib/gitaly_server/ref_service.rb
@@ -44,23 +44,6 @@ module GitalyServer
       raise GRPC::Internal.new(e.to_s)
     end
 
-    # Post 11.10 this method can be removed
-    def delete_refs(request, call)
-      repo = Gitlab::Git::Repository.from_gitaly(request.repository, call)
-
-      begin
-        if request.refs.any?
-          repo.delete_refs(*request.refs)
-        else
-          repo.delete_all_refs_except(request.except_with_prefix)
-        end
-
-        Gitaly::DeleteRefsResponse.new
-      rescue Gitlab::Git::Repository::GitError => e
-        Gitaly::DeleteRefsResponse.new(git_error: e.message)
-      end
-    end
-
     def get_tag_messages(request, call)
       repository = Gitlab::Git::Repository.from_gitaly(request.repository, call)
 
diff --git a/ruby/lib/gitaly_server/repository_service.rb b/ruby/lib/gitaly_server/repository_service.rb
index d01ac7e96..0ed062fb8 100644
--- a/ruby/lib/gitaly_server/repository_service.rb
+++ b/ruby/lib/gitaly_server/repository_service.rb
@@ -98,31 +98,5 @@ module GitalyServer
 
       Gitaly::FindLicenseResponse.new(license_short_name: short_name || "")
     end
-
-    private
-
-    OPERATION_MAP = {
-      added: Gitaly::GetRawChangesResponse::RawChange::Operation::ADDED,
-      copied: Gitaly::GetRawChangesResponse::RawChange::Operation::COPIED,
-      deleted: Gitaly::GetRawChangesResponse::RawChange::Operation::DELETED,
-      modified: Gitaly::GetRawChangesResponse::RawChange::Operation::MODIFIED,
-      renamed: Gitaly::GetRawChangesResponse::RawChange::Operation::RENAMED,
-      type_changed: Gitaly::GetRawChangesResponse::RawChange::Operation::TYPE_CHANGED
-    }.freeze
-
-    def to_proto_raw_change(change)
-      operation = OPERATION_MAP[change.operation] || Gitaly::GetRawChangesResponse::RawChange::Operation::UNKNOWN
-
-      # Protobuf doesn't even try to call `to_s` or `to_i` where it might be needed.
-      Gitaly::GetRawChangesResponse::RawChange.new(
-        blob_id: change.blob_id.to_s,
-        size: change.blob_size.to_i,
-        new_path: change.new_path.to_s,
-        old_path: change.old_path.to_s,
-        operation: operation,
-        old_mode: change.old_mode.to_i(8),
-        new_mode: change.new_mode.to_i(8)
-      )
-    end
   end
 end
diff --git a/ruby/lib/gitlab/git/commit.rb b/ruby/lib/gitlab/git/commit.rb
index 0e8ea0fd7..1e312ba0f 100644
--- a/ruby/lib/gitlab/git/commit.rb
+++ b/ruby/lib/gitlab/git/commit.rb
@@ -103,23 +103,6 @@ module Gitlab
         @safe_message ||= message
       end
 
-      # Not to be called directly, but right now its used for tests and in old
-      # migrations
-      def rugged_diff_from_parent(options = {})
-        options ||= {}
-        break_rewrites = options[:break_rewrites]
-        actual_options = Gitlab::Git::Diff.filter_diff_options(options)
-
-        diff = if rugged_commit.parents.empty?
-                 rugged_commit.diff(actual_options.merge(reverse: true))
-               else
-                 rugged_commit.parents[0].diff(rugged_commit, actual_options)
-               end
-
-        diff.find_similar!(break_rewrites: break_rewrites)
-        diff
-      end
-
       def no_commit_message
         "--no commit message"
       end
@@ -185,7 +168,14 @@ module Gitlab
       end
 
       def to_diff
-        rugged_diff_from_parent.patch
+        diff = if rugged_commit.parents.empty?
+                 rugged_commit.diff(reverse: true)
+               else
+                 rugged_commit.parents[0].diff(rugged_commit)
+               end
+
+        diff.find_similar!
+        diff.patch
       end
 
       private
diff --git a/ruby/lib/gitlab/git/diff.rb b/ruby/lib/gitlab/git/diff.rb
deleted file mode 100644
index a7b37e240..000000000
--- a/ruby/lib/gitlab/git/diff.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-module Gitlab
-  module Git
-    class Diff
-      class << self
-        # Return a copy of the +options+ hash containing only keys that can be
-        # passed to Rugged.  Allowed options are:
-        #
-        #  :ignore_whitespace_change ::
-        #    If true, changes in amount of whitespace will be ignored.
-        #
-        #  :disable_pathspec_match ::
-        #    If true, the given +*paths+ will be applied as exact matches,
-        #    instead of as fnmatch patterns.
-        #
-        def filter_diff_options(options, default_options = {})
-          allowed_options = [:ignore_whitespace_change,
-                             :disable_pathspec_match, :paths,
-                             :max_files, :max_lines, :limits, :expanded]
-
-          if default_options
-            actual_defaults = default_options.dup
-            actual_defaults.keep_if do |key|
-              allowed_options.include?(key)
-            end
-          else
-            actual_defaults = {}
-          end
-
-          if options
-            filtered_opts = options.dup
-            filtered_opts.keep_if do |key|
-              allowed_options.include?(key)
-            end
-            filtered_opts = actual_defaults.merge(filtered_opts)
-          else
-            filtered_opts = actual_defaults
-          end
-
-          filtered_opts
-        end
-      end
-    end
-  end
-end
diff --git a/ruby/lib/gitlab/git/repository.rb b/ruby/lib/gitlab/git/repository.rb
index f511b3ef6..a696a249b 100644
--- a/ruby/lib/gitlab/git/repository.rb
+++ b/ruby/lib/gitlab/git/repository.rb
@@ -567,10 +567,6 @@ module Gitlab
         git_delete_refs(*ref_names)
       end
 
-      def delete_all_refs_except(prefixes)
-        delete_refs(*all_ref_names_except(prefixes))
-      end
-
       # Returns an Array of all ref names, except when it's matching pattern
       #
       # regexp - The pattern for ref names we don't want
diff --git a/ruby/spec/lib/gitlab/git/diff_spec.rb b/ruby/spec/lib/gitlab/git/diff_spec.rb
deleted file mode 100644
index 790b41611..000000000
--- a/ruby/spec/lib/gitlab/git/diff_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::Git::Diff do
-  describe '.filter_diff_options' do
-    let(:options) { { max_files: 100, invalid_opt: true } }
-
-    context "without default options" do
-      let(:filtered_options) { described_class.filter_diff_options(options) }
-
-      it "should filter invalid options" do
-        expect(filtered_options).not_to have_key(:invalid_opt)
-      end
-    end
-
-    context "with default options" do
-      let(:filtered_options) do
-        default_options = { max_files: 5, bad_opt: 1, ignore_whitespace_change: true }
-        described_class.filter_diff_options(options, default_options)
-      end
-
-      it "should filter invalid options" do
-        expect(filtered_options).not_to have_key(:invalid_opt)
-        expect(filtered_options).not_to have_key(:bad_opt)
-      end
-
-      it "should merge with default options" do
-        expect(filtered_options).to have_key(:ignore_whitespace_change)
-      end
-
-      it "should override default options" do
-        expect(filtered_options).to have_key(:max_files)
-        expect(filtered_options[:max_files]).to eq(100)
-      end
-    end
-  end
-end
diff --git a/ruby/spec/lib/gitlab/git/repository_spec.rb b/ruby/spec/lib/gitlab/git/repository_spec.rb
index 57b88ef59..6c056efc8 100644
--- a/ruby/spec/lib/gitlab/git/repository_spec.rb
+++ b/ruby/spec/lib/gitlab/git/repository_spec.rb
@@ -463,26 +463,6 @@ describe Gitlab::Git::Repository do # rubocop:disable Metrics/BlockLength
     end
   end
 
-  describe '#delete_all_refs_except' do
-    let(:repository) { mutable_repository }
-
-    before do
-      repository.write_ref("refs/delete/a", "0b4bc9a49b562e85de7cc9e834518ea6828729b9")
-      repository.write_ref("refs/also-delete/b", "12d65c8dd2b2676fa3ac47d955accc085a37a9c1")
-      repository.write_ref("refs/keep/c", "6473c90867124755509e100d0d35ebdc85a0b6ae")
-      repository.write_ref("refs/also-keep/d", "0b4bc9a49b562e85de7cc9e834518ea6828729b9")
-    end
-
-    it 'deletes all refs except those with the specified prefixes' do
-      repository.delete_all_refs_except(%w[refs/keep refs/also-keep refs/heads])
-      expect(repository_rugged.references.exist?("refs/delete/a")).to be(false)
-      expect(repository_rugged.references.exist?("refs/also-delete/b")).to be(false)
-      expect(repository_rugged.references.exist?("refs/keep/c")).to be(true)
-      expect(repository_rugged.references.exist?("refs/also-keep/d")).to be(true)
-      expect(repository_rugged.references.exist?("refs/heads/master")).to be(true)
-    end
-  end
-
   describe 'remotes' do
     let(:repository) { mutable_repository }
     let(:remote_name) { 'my-remote' }