summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-08-11 10:11:01 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-08-11 10:11:01 +0000
commit2f35428c722e2a011feaa700ae595049ed5ebb11 (patch)
tree50548a41d72c4fad3f5c108e103371403da29615
parentcfc5f0f5e4cb5a9b52aaf81d1c80c2d7774279a6 (diff)
parentb21539cc57148c68aa99ac9ec705d2b1ff2a7b04 (diff)
downloadgitlab-ce-2f35428c722e2a011feaa700ae595049ed5ebb11.tar.gz
Merge branch 'gitlab-git-expose-raw-log' into 'master'
Expose the raw_log method See merge request !13434
-rw-r--r--lib/gitlab/git/repository.rb33
1 files changed, 17 insertions, 16 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 371f8797ff2..7000b173075 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -324,6 +324,23 @@ module Gitlab
raw_log(options).map { |c| Commit.decorate(self, c) }
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)
gitaly_migrate(:count_commits) do |is_enabled|
if is_enabled
@@ -733,22 +750,6 @@ module Gitlab
sort_branches(branches, sort_by)
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)
options[:path].present? ||
options[:disable_walk] ||