kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Toshi MARUYAMA 2011-01-11 08:41:35 +00:00
parent 331cdbed2f
commit 80b329d031
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redmine/scm/adapters/mercurial_adapter.rb
View File

@ -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|

4
test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
View File

@ -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