jro_apps/redmine Commit - r4566:a6f05b5e56fd

scm: mercurial: diff '-c' option supports above Mercurial 1.2 (#3724, #7253)....

Toshi MARUYAMA -

r4566:a6f05b5e56fd

parent child

Context file:

r4566:a6f05b5e56fd

lib/redmine/scm/adapters/mercurial_adapter.rb +5 -1

                     def diff(path, identifier_from, identifier_to=nil)
                       path ||= ''
                       diff_args = ''
+                      diff = []
                       if identifier_to
                         diff_args = "-r #{hgrev(identifier_to)} -r #{hgrev(identifier_from)}"
                       else
+                        if self.class.client_version_above?([1, 2])
                           diff_args = "-c #{hgrev(identifier_from)}"
+                        else
+                          return []
+                        end
                       end
                       cmd = "#{HG_BIN} -R #{target('')} diff --nodates --git #{diff_args}"
                       cmd << " -I #{target(path)}" unless path.empty?
-                      diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line

test/functional/repositories_mercurial_controller_test.rb +5 -1

                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
-                Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
+                @repository = Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
+                assert @repository
               end
               if File.directory?(REPOSITORY_PATH)
                     get :diff, :id => 3, :rev => 4
                     assert_response :success
                     assert_template 'diff'
+                    if @repository.scm.class.client_version_above?([1, 2])
                       # Line 22 removed
                       assert_tag :tag => 'th',
                                  :content => '22',
                                                :content => /def remove/ }
                     end
                   end
+                end
                 def test_annotate
                   get :annotate, :id => 3, :path => ['sources', 'watchers_controller.rb']

test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb +6 0

                   end
                   def test_diff
+                    if @adapter.class.client_version_above?([1, 2])
                       assert_nil @adapter.diff(nil, '100000')
+                    end
                     assert_nil @adapter.diff(nil, '100000', '200000')
                     [2, '400bb8672109', '400', 400].each do |r1|
                       diff1 = @adapter.diff(nil, r1)
+                      if @adapter.class.client_version_above?([1, 2])
                         assert_equal 28, diff1.size
                         buf = diff1[24].gsub(/\r\n|\r|\n/, "")
                         assert_equal "+    return true unless klass.respond_to?('watched_by')", buf
+                      else
+                        assert_equal 0, diff1.size
+                      end
                       [4, 'def6d2f1254a'].each do |r2|
                         diff2 = @adapter.diff(nil,r1,r2)
                         assert_equal 50, diff2.size

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages