Merge branch 'gitlab-git-expose-raw-log' into 'master'
Expose the raw_log method See merge request !13434
This commit is contained in:
commit
2f35428c72
1 changed files with 17 additions and 16 deletions
|
@ -324,6 +324,23 @@ module Gitlab
|
||||||
raw_log(options).map { |c| Commit.decorate(self, c) }
|
raw_log(options).map { |c| Commit.decorate(self, c) }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Used in gitaly-ruby
|
||||||
|
def raw_log(options)
|
||||||
|
actual_ref = options[:ref] || root_ref
|
||||||
|
begin
|
||||||
|
sha = sha_from_ref(actual_ref)
|
||||||
|
rescue Rugged::OdbError, Rugged::InvalidError, Rugged::ReferenceError
|
||||||
|
# Return an empty array if the ref wasn't found
|
||||||
|
return []
|
||||||
|
end
|
||||||
|
|
||||||
|
if log_using_shell?(options)
|
||||||
|
log_by_shell(sha, options)
|
||||||
|
else
|
||||||
|
log_by_walk(sha, options)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def count_commits(options)
|
def count_commits(options)
|
||||||
gitaly_migrate(:count_commits) do |is_enabled|
|
gitaly_migrate(:count_commits) do |is_enabled|
|
||||||
if is_enabled
|
if is_enabled
|
||||||
|
@ -733,22 +750,6 @@ module Gitlab
|
||||||
sort_branches(branches, sort_by)
|
sort_branches(branches, sort_by)
|
||||||
end
|
end
|
||||||
|
|
||||||
def raw_log(options)
|
|
||||||
actual_ref = options[:ref] || root_ref
|
|
||||||
begin
|
|
||||||
sha = sha_from_ref(actual_ref)
|
|
||||||
rescue Rugged::OdbError, Rugged::InvalidError, Rugged::ReferenceError
|
|
||||||
# Return an empty array if the ref wasn't found
|
|
||||||
return []
|
|
||||||
end
|
|
||||||
|
|
||||||
if log_using_shell?(options)
|
|
||||||
log_by_shell(sha, options)
|
|
||||||
else
|
|
||||||
log_by_walk(sha, options)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def log_using_shell?(options)
|
def log_using_shell?(options)
|
||||||
options[:path].present? ||
|
options[:path].present? ||
|
||||||
options[:disable_walk] ||
|
options[:disable_walk] ||
|
||||||
|
|
Loading…
Reference in a new issue