kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add rugged_is_ancestor method

This commit is contained in:
Jacob Vosmaer 2017-08-01 17:24:37 +02:00
parent 1a0e176ba1
commit d3ddc69b54
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/repository.rb
View File

@ -944,7 +944,7 @@ class Repository
if is_enabled if is_enabled
raw_repository.is_ancestor?(ancestor_id, descendant_id) raw_repository.is_ancestor?(ancestor_id, descendant_id)
else else
merge_base_commit(ancestor_id, descendant_id) == ancestor_id rugged_is_ancestor?(ancestor_id, descendant_id)
end end
end end
end end

7
lib/gitlab/git/repository.rb
View File

@ -353,6 +353,13 @@ module Gitlab
rugged.merge_base(from, to) rugged.merge_base(from, to)
end end
# Gitaly note: JV: check gitlab-ee before removing this method.
def rugged_is_ancestor?(ancestor_id, descendant_id)
return false if ancestor_id.nil? || descendant_id.nil?
merge_base_commit(ancestor_id, descendant_id) == ancestor_id
end
# Returns true is +from+ is direct ancestor to +to+, otherwise false # Returns true is +from+ is direct ancestor to +to+, otherwise false
def is_ancestor?(from, to) def is_ancestor?(from, to)
gitaly_commit_client.is_ancestor(from, to) gitaly_commit_client.is_ancestor(from, to)