From d48a7e148e412e4f43aba62800920c6c419092fe Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sun, 13 Mar 2011 15:03:05 +0000 Subject: [PATCH] scm: mercurial: remove unused parameters from "nodes_in_branch()" method in adapter (#7246, #4455). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5108 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/mercurial_adapter.rb | 8 +++----- .../lib/redmine/scm/adapters/mercurial_adapter_test.rb | 8 ++++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb index df021ea1c..d5266e9bf 100644 --- a/lib/redmine/scm/adapters/mercurial_adapter.rb +++ b/lib/redmine/scm/adapters/mercurial_adapter.rb @@ -220,13 +220,11 @@ module Redmine end # Returns list of nodes in the specified branch - def nodes_in_branch(branch, path=nil, identifier_from=nil, identifier_to=nil, options={}) - p1 = scm_iconv(@path_encoding, 'UTF-8', path) + def nodes_in_branch(branch, options={}) hg_args = ['rhlog', '--template', '{node|short}\n', '--rhbranch', CGI.escape(branch)] - hg_args << '--from' << CGI.escape(hgrev(identifier_from)) - hg_args << '--to' << CGI.escape(hgrev(identifier_to)) + hg_args << '--from' << CGI.escape(branch) + hg_args << '--to' << '0' hg_args << '--limit' << options[:limit] if options[:limit] - hg_args << CGI.escape(hgtarget(p1)) unless path.blank? hg(*hg_args) { |io| io.readlines.map { |e| e.chomp } } end diff --git a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb index 5c423f0c3..84f5c2978 100644 --- a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb @@ -286,21 +286,21 @@ begin 'test_branch.latin-1', 'test-branch-00', ].each do |bra| - nib0 = @adapter.nodes_in_branch(bra, '', bra, 0) + nib0 = @adapter.nodes_in_branch(bra) assert nib0 - nib1 = @adapter.nodes_in_branch(bra, '', bra, 0, :limit => 1) + nib1 = @adapter.nodes_in_branch(bra, :limit => 1) assert_equal 1, nib1.size case bra when 'branch (1)[2]&,%.-3_4' assert_equal 3, nib0.size assert_equal nib0[0], 'afc61e85bde7' - nib2 = @adapter.nodes_in_branch(bra, '', bra, 0, :limit => 2) + nib2 = @adapter.nodes_in_branch(bra, :limit => 2) assert_equal 2, nib2.size assert_equal nib2[1], '933ca60293d7' when @branch_char_1 assert_equal 2, nib0.size assert_equal nib0[1], '08ff3227303e' - nib2 = @adapter.nodes_in_branch(bra, '', bra, 0, :limit => 1) + nib2 = @adapter.nodes_in_branch(bra, :limit => 1) assert_equal 1, nib2.size assert_equal nib2[0], '7bbf4c738e71' end