##// END OF EJS Templates
scm: mercurial: fix Ruby 1.9 "hg diff" test fails (#7518)....
Toshi MARUYAMA -
r4739:7a3d385b8e53
parent child
Show More
@@ -170,10 +170,13 module Redmine
170 hg_args << '-c' << hgrev(identifier_from)
170 hg_args << '-c' << hgrev(identifier_from)
171 end
171 end
172 hg_args << CGI.escape(hgtarget(path)) unless path.blank?
172 hg_args << CGI.escape(hgtarget(path)) unless path.blank?
173
173 diff = []
174 hg *hg_args do |io|
174 hg *hg_args do |io|
175 io.collect
175 io.each_line do |line|
176 diff << line
177 end
176 end
178 end
179 diff
177 rescue HgCommandAborted
180 rescue HgCommandAborted
178 nil # means not found
181 nil # means not found
179 end
182 end
General Comments 0
You need to be logged in to leave comments. Login now