From 87467127b6e0927d56e532f4d6adc4091ff9ef6f Mon Sep 17 00:00:00 2001
From: Maxim Rydkin <maks.rydkin@gmail.com>
Date: Thu, 24 Aug 2017 19:35:06 +0300
Subject: [PATCH] replace `is_ancestor?` with `ancestor?`

---
 app/models/deployment.rb       |  2 +-
 app/models/repository.rb       |  6 +++---
 lib/gitlab/git/repository.rb   |  2 +-
 spec/models/repository_spec.rb | 22 +++++++++++-----------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 056c49e7162..7bcded5b5e1 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -49,7 +49,7 @@ class Deployment < ActiveRecord::Base
     # created before then could have a `sha` referring to a commit that no
     # longer exists in the repository, so just ignore those.
     begin
-      project.repository.is_ancestor?(commit.id, sha)
+      project.repository.ancestor?(commit.id, sha)
     rescue Rugged::OdbError
       false
     end
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 9fb2e2aa306..cb7aba89020 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -944,7 +944,7 @@ class Repository
 
     if branch_commit
       same_head = branch_commit.id == root_ref_commit.id
-      !same_head && is_ancestor?(branch_commit.id, root_ref_commit.id)
+      !same_head && ancestor?(branch_commit.id, root_ref_commit.id)
     else
       nil
     end
@@ -958,12 +958,12 @@ class Repository
     nil
   end
 
-  def is_ancestor?(ancestor_id, descendant_id)
+  def ancestor?(ancestor_id, descendant_id)
     return false if ancestor_id.nil? || descendant_id.nil?
 
     Gitlab::GitalyClient.migrate(:is_ancestor) do |is_enabled|
       if is_enabled
-        raw_repository.is_ancestor?(ancestor_id, descendant_id)
+        raw_repository.ancestor?(ancestor_id, descendant_id)
       else
         rugged_is_ancestor?(ancestor_id, descendant_id)
       end
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index b835dec24eb..dce3a9b2d37 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -439,7 +439,7 @@ module Gitlab
       end
 
       # Returns true is +from+ is direct ancestor to +to+, otherwise false
-      def is_ancestor?(from, to)
+      def ancestor?(from, to)
         gitaly_commit_client.is_ancestor(from, to)
       end
 
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 462e92b8b62..3151649b64e 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -2036,23 +2036,23 @@ describe Repository, models: true do
     end
   end
 
-  describe '#is_ancestor?' do
+  describe '#ancestor?' do
     let(:commit) { repository.commit }
     let(:ancestor) { commit.parents.first }
 
     context 'with Gitaly enabled' do
       it 'it is an ancestor' do
-        expect(repository.is_ancestor?(ancestor.id, commit.id)).to eq(true)
+        expect(repository.ancestor?(ancestor.id, commit.id)).to eq(true)
       end
 
       it 'it is not an ancestor' do
-        expect(repository.is_ancestor?(commit.id, ancestor.id)).to eq(false)
+        expect(repository.ancestor?(commit.id, ancestor.id)).to eq(false)
       end
 
       it 'returns false on nil-values' do
-        expect(repository.is_ancestor?(nil, commit.id)).to eq(false)
-        expect(repository.is_ancestor?(ancestor.id, nil)).to eq(false)
-        expect(repository.is_ancestor?(nil, nil)).to eq(false)
+        expect(repository.ancestor?(nil, commit.id)).to eq(false)
+        expect(repository.ancestor?(ancestor.id, nil)).to eq(false)
+        expect(repository.ancestor?(nil, nil)).to eq(false)
       end
     end
 
@@ -2063,17 +2063,17 @@ describe Repository, models: true do
       end
 
       it 'it is an ancestor' do
-        expect(repository.is_ancestor?(ancestor.id, commit.id)).to eq(true)
+        expect(repository.ancestor?(ancestor.id, commit.id)).to eq(true)
       end
 
       it 'it is not an ancestor' do
-        expect(repository.is_ancestor?(commit.id, ancestor.id)).to eq(false)
+        expect(repository.ancestor?(commit.id, ancestor.id)).to eq(false)
       end
 
       it 'returns false on nil-values' do
-        expect(repository.is_ancestor?(nil, commit.id)).to eq(false)
-        expect(repository.is_ancestor?(ancestor.id, nil)).to eq(false)
-        expect(repository.is_ancestor?(nil, nil)).to eq(false)
+        expect(repository.ancestor?(nil, commit.id)).to eq(false)
+        expect(repository.ancestor?(ancestor.id, nil)).to eq(false)
+        expect(repository.ancestor?(nil, nil)).to eq(false)
       end
     end
   end