##// END OF EJS Templates
jro_apps » redmine
RSS
scm: mercurial: change diff option from --git to --config diff.git=false (#7253)....
Toshi MARUYAMA -
r4568:80b329d031dc
parent child
Show More
Side by Side Unified
Context file:
r4568:80b329d031dc Loading diff...:
Show file before | Show file after | Hide comments
@@ -164,7 +164,7 module Redmine
164 return []
164 return []
165 end
165 end
166 end
166 end
167 cmd = "#{HG_BIN} -R #{target('')} diff --nodates --git #{diff_args}"
167 cmd = "#{HG_BIN} -R #{target('')} --config diff.git=false diff --nodates #{diff_args}"
168 cmd << " -I #{target(path)}" unless path.empty?
168 cmd << " -I #{target(path)}" unless path.empty?
169 shellout(cmd) do |io|
169 shellout(cmd) do |io|
170 io.each_line do |line|
170 io.each_line do |line|
Show file before | Show file after | Hide comments
@@ -58,8 +58,8 begin
58 end
58 end
59 [4, 'def6d2f1254a'].each do |r2|
59 [4, 'def6d2f1254a'].each do |r2|
60 diff2 = @adapter.diff(nil,r1,r2)
60 diff2 = @adapter.diff(nil,r1,r2)
61 assert_equal 50, diff2.size
61 assert_equal 49, diff2.size
62 buf = diff2[42].gsub(/\r\n|\r|\n/, "")
62 buf = diff2[41].gsub(/\r\n|\r|\n/, "")
63 assert_equal "+class WelcomeController < ApplicationController", buf
63 assert_equal "+class WelcomeController < ApplicationController", buf
64 diff3 = @adapter.diff('sources/watchers_controller.rb', r1, r2)
64 diff3 = @adapter.diff('sources/watchers_controller.rb', r1, r2)
65 assert_equal 20, diff3.size
65 assert_equal 20, diff3.size
General Comments 0
You need to be logged in to leave comments. Login now