scm: mercurial: change diff option from --git to --config diff.git=false (#7253).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4688 e93f8b46-1217-0410-a6f0-8f06a7374b81

scm: mercurial: change diff option from --git to --config diff.git=false (#7253).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4688 e93f8b46-1217-0410-a6f0-8f06a7374b81
80b329d0 · Toshi MARUYAMA · 331cdbed · 80b329d0 · 80b329d0
Commit 80b329d0 authored Jan 11, 2011 by Toshi MARUYAMA
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

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

mercurial_adapter_test.rb test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb +2 -2

No files found.
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -164,7 +164,7 @@ module Redmine
              return []
            end
          end
-          cmd = "#{HG_BIN} -R #{target('')} diff --nodates --git #{diff_args}"
+          cmd = "#{HG_BIN} -R #{target('')} --config diff.git=false diff --nodates #{diff_args}"
          cmd << " -I #{target(path)}" unless path.empty?
          shellout(cmd) do |io|
            io.each_line do |line|

--- a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
@@ -58,8 +58,8 @@ begin
          end
          [4, 'def6d2f1254a'].each do |r2|
            diff2 = @adapter.diff(nil,r1,r2)
-            assert_equal 50, diff2.size
-            buf =  diff2[42].gsub(/\r\n|\r|\n/, "")
+            assert_equal 49, diff2.size
+            buf =  diff2[41].gsub(/\r\n|\r|\n/, "")
            assert_equal "+class WelcomeController < ApplicationController", buf
            diff3 = @adapter.diff('sources/watchers_controller.rb', r1, r2)
            assert_equal 20, diff3.size