From 8a189d4d5308b2c60746a69a897dc28ed761a2c7 Mon Sep 17 00:00:00 2001 From: rick Date: Wed, 4 Aug 2010 17:03:01 -0700 Subject: [PATCH] Gollum::Page#versions sets :follow to false by default, and skips pagination options. --- lib/gollum/page.rb | 8 ++++---- test/test_page.rb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/gollum/page.rb b/lib/gollum/page.rb index 6519062a..6128314b 100644 --- a/lib/gollum/page.rb +++ b/lib/gollum/page.rb @@ -151,18 +151,18 @@ module Gollum # :page - The Integer page number (default: 1). # :per_page - The Integer max count of items to return. # :follow - Follow's a file across renames, but falls back - # to a slower Grit native call. (default: true) + # to a slower Grit native call. (default: false) # # Returns an Array of Grit::Commit. def versions(options = {}) - options[:follow] = true if !options.key?(:follow) - options = log_pagination_options(options) if options[:follow] options[:pretty] = 'raw' + options.delete :max_count + options.delete :skip log = @wiki.repo.git.native "log", options, "master", "--", @path Grit::Commit.list_from_string(@wiki.repo, log) else - @wiki.repo.log('master', @path, options) + @wiki.repo.log('master', @path, log_pagination_options(options)) end end diff --git a/test/test_page.rb b/test/test_page.rb index a1e76950..6f2376e9 100644 --- a/test/test_page.rb +++ b/test/test_page.rb @@ -39,7 +39,7 @@ context "Page" do test "page versions across renames" do page = @wiki.page 'My-Precious' assert_equal ['60f12f4254f58801b9ee7db7bca5fa8aeefaa56b', '94523d7ae48aeba575099dd12926420d8fd0425d'], - page.versions.map { |v| v.id } + page.versions(:follow => true).map { |v| v.id } end test "page versions without renames" do