Commit f278e5fb authored by Jacob Vosmaer's avatar Jacob Vosmaer

Set default options outside the raw_log method

The raw_log method is meant to become the Gitaly RPC boundary. By
setting the defaults before doing the RPC we keep the RPC
implementation simpler. We also sidestep the unfortunate subtleties of
what happens when options[:limit] is not set, or nil.
parent ff1fa39c
...@@ -299,6 +299,21 @@ module Gitlab ...@@ -299,6 +299,21 @@ module Gitlab
# #
# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/446 # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/446
def log(options) def log(options)
default_options = {
limit: 10,
offset: 0,
path: nil,
follow: false,
skip_merges: false,
disable_walk: false,
after: nil,
before: nil
}
options = default_options.merge(options)
options[:limit] ||= 0
options[:offset] ||= 0
raw_log(options).map { |c| Commit.decorate(c) } raw_log(options).map { |c| Commit.decorate(c) }
end end
...@@ -712,20 +727,6 @@ module Gitlab ...@@ -712,20 +727,6 @@ module Gitlab
end end
def raw_log(options) def raw_log(options)
default_options = {
limit: 10,
offset: 0,
path: nil,
follow: false,
skip_merges: false,
disable_walk: false,
after: nil,
before: nil
}
options = default_options.merge(options)
options[:limit] ||= 0
options[:offset] ||= 0
actual_ref = options[:ref] || root_ref actual_ref = options[:ref] || root_ref
begin begin
sha = sha_from_ref(actual_ref) sha = sha_from_ref(actual_ref)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment