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.

Set default options outside the raw_log method
f278e5fb · Jacob Vosmaer · ff1fa39c · f278e5fb
Commit f278e5fb authored Aug 07, 2017 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 14 deletions

repository.rb lib/gitlab/git/repository.rb +15 -14

No files found.
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -299,6 +299,21 @@ module Gitlab
      #
      # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/446
      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) }
      end

@@ -712,20 +727,6 @@ module Gitlab
      end

      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
        begin
          sha = sha_from_ref(actual_ref)