##// END OF EJS Templates
scm: mercurial: fix unit adapter annotate test fails on Windows Mercurial 1.8.4+29-e597ef52a7c2....
Toshi MARUYAMA -
r5922:3b5db24269fe
parent child
Show More
@@ -1,326 +1,327
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2011 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require 'redmine/scm/adapters/abstract_adapter'
19 19 require 'cgi'
20 20
21 21 module Redmine
22 22 module Scm
23 23 module Adapters
24 24 class MercurialAdapter < AbstractAdapter
25 25
26 26 # Mercurial executable name
27 27 HG_BIN = Redmine::Configuration['scm_mercurial_command'] || "hg"
28 28 HELPERS_DIR = File.dirname(__FILE__) + "/mercurial"
29 29 HG_HELPER_EXT = "#{HELPERS_DIR}/redminehelper.py"
30 30 TEMPLATE_NAME = "hg-template"
31 31 TEMPLATE_EXTENSION = "tmpl"
32 32
33 33 # raised if hg command exited with error, e.g. unknown revision.
34 34 class HgCommandAborted < CommandFailed; end
35 35
36 36 class << self
37 37 def client_command
38 38 @@bin ||= HG_BIN
39 39 end
40 40
41 41 def sq_bin
42 42 @@sq_bin ||= shell_quote(HG_BIN)
43 43 end
44 44
45 45 def client_version
46 46 @@client_version ||= (hgversion || [])
47 47 end
48 48
49 49 def client_available
50 50 client_version_above?([0, 9, 5])
51 51 end
52 52
53 53 def hgversion
54 54 # The hg version is expressed either as a
55 55 # release number (eg 0.9.5 or 1.0) or as a revision
56 56 # id composed of 12 hexa characters.
57 57 theversion = hgversion_from_command_line.dup
58 58 if theversion.respond_to?(:force_encoding)
59 59 theversion.force_encoding('ASCII-8BIT')
60 60 end
61 61 if m = theversion.match(%r{\A(.*?)((\d+\.)+\d+)})
62 62 m[2].scan(%r{\d+}).collect(&:to_i)
63 63 end
64 64 end
65 65
66 66 def hgversion_from_command_line
67 67 shellout("#{sq_bin} --version") { |io| io.read }.to_s
68 68 end
69 69
70 70 def template_path
71 71 @@template_path ||= template_path_for(client_version)
72 72 end
73 73
74 74 def template_path_for(version)
75 75 if ((version <=> [0,9,5]) > 0) || version.empty?
76 76 ver = "1.0"
77 77 else
78 78 ver = "0.9.5"
79 79 end
80 80 "#{HELPERS_DIR}/#{TEMPLATE_NAME}-#{ver}.#{TEMPLATE_EXTENSION}"
81 81 end
82 82 end
83 83
84 84 def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil)
85 85 super
86 86 @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding
87 87 end
88 88
89 89 def path_encoding
90 90 @path_encoding
91 91 end
92 92
93 93 def info
94 94 tip = summary['repository']['tip']
95 95 Info.new(:root_url => CGI.unescape(summary['repository']['root']),
96 96 :lastrev => Revision.new(:revision => tip['revision'],
97 97 :scmid => tip['node']))
98 98 end
99 99
100 100 def tags
101 101 as_ary(summary['repository']['tag']).map { |e| e['name'] }
102 102 end
103 103
104 104 # Returns map of {'tag' => 'nodeid', ...}
105 105 def tagmap
106 106 alist = as_ary(summary['repository']['tag']).map do |e|
107 107 e.values_at('name', 'node')
108 108 end
109 109 Hash[*alist.flatten]
110 110 end
111 111
112 112 def branches
113 113 as_ary(summary['repository']['branch']).map { |e| e['name'] }
114 114 end
115 115
116 116 # Returns map of {'branch' => 'nodeid', ...}
117 117 def branchmap
118 118 alist = as_ary(summary['repository']['branch']).map do |e|
119 119 e.values_at('name', 'node')
120 120 end
121 121 Hash[*alist.flatten]
122 122 end
123 123
124 124 def summary
125 125 return @summary if @summary
126 126 hg 'rhsummary' do |io|
127 127 output = io.read
128 128 if output.respond_to?(:force_encoding)
129 129 output.force_encoding('UTF-8')
130 130 end
131 131 begin
132 132 @summary = ActiveSupport::XmlMini.parse(output)['rhsummary']
133 133 rescue
134 134 end
135 135 end
136 136 end
137 137 private :summary
138 138
139 139 def entries(path=nil, identifier=nil, options={})
140 140 p1 = scm_iconv(@path_encoding, 'UTF-8', path)
141 141 manifest = hg('rhmanifest', '-r', CGI.escape(hgrev(identifier)),
142 142 CGI.escape(without_leading_slash(p1.to_s))) do |io|
143 143 output = io.read
144 144 if output.respond_to?(:force_encoding)
145 145 output.force_encoding('UTF-8')
146 146 end
147 147 begin
148 148 ActiveSupport::XmlMini.parse(output)['rhmanifest']['repository']['manifest']
149 149 rescue
150 150 end
151 151 end
152 152 path_prefix = path.blank? ? '' : with_trailling_slash(path)
153 153
154 154 entries = Entries.new
155 155 as_ary(manifest['dir']).each do |e|
156 156 n = scm_iconv('UTF-8', @path_encoding, CGI.unescape(e['name']))
157 157 p = "#{path_prefix}#{n}"
158 158 entries << Entry.new(:name => n, :path => p, :kind => 'dir')
159 159 end
160 160
161 161 as_ary(manifest['file']).each do |e|
162 162 n = scm_iconv('UTF-8', @path_encoding, CGI.unescape(e['name']))
163 163 p = "#{path_prefix}#{n}"
164 164 lr = Revision.new(:revision => e['revision'], :scmid => e['node'],
165 165 :identifier => e['node'],
166 166 :time => Time.at(e['time'].to_i))
167 167 entries << Entry.new(:name => n, :path => p, :kind => 'file',
168 168 :size => e['size'].to_i, :lastrev => lr)
169 169 end
170 170
171 171 entries
172 172 rescue HgCommandAborted
173 173 nil # means not found
174 174 end
175 175
176 176 def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
177 177 revs = Revisions.new
178 178 each_revision(path, identifier_from, identifier_to, options) { |e| revs << e }
179 179 revs
180 180 end
181 181
182 182 # Iterates the revisions by using a template file that
183 183 # makes Mercurial produce a xml output.
184 184 def each_revision(path=nil, identifier_from=nil, identifier_to=nil, options={})
185 185 hg_args = ['log', '--debug', '-C', '--style', self.class.template_path]
186 186 hg_args << '-r' << "#{hgrev(identifier_from)}:#{hgrev(identifier_to)}"
187 187 hg_args << '--limit' << options[:limit] if options[:limit]
188 188 hg_args << hgtarget(path) unless path.blank?
189 189 log = hg(*hg_args) do |io|
190 190 output = io.read
191 191 if output.respond_to?(:force_encoding)
192 192 output.force_encoding('UTF-8')
193 193 end
194 194 begin
195 195 # Mercurial < 1.5 does not support footer template for '</log>'
196 196 ActiveSupport::XmlMini.parse("#{output}</log>")['log']
197 197 rescue
198 198 end
199 199 end
200 200 as_ary(log['logentry']).each do |le|
201 201 cpalist = as_ary(le['paths']['path-copied']).map do |e|
202 202 [e['__content__'], e['copyfrom-path']].map do |s|
203 203 scm_iconv('UTF-8', @path_encoding, CGI.unescape(s))
204 204 end
205 205 end
206 206 cpmap = Hash[*cpalist.flatten]
207 207 paths = as_ary(le['paths']['path']).map do |e|
208 208 p = scm_iconv('UTF-8', @path_encoding, CGI.unescape(e['__content__']) )
209 209 {:action => e['action'],
210 210 :path => with_leading_slash(p),
211 211 :from_path => (cpmap.member?(p) ? with_leading_slash(cpmap[p]) : nil),
212 212 :from_revision => (cpmap.member?(p) ? le['node'] : nil)}
213 213 end.sort { |a, b| a[:path] <=> b[:path] }
214 214 yield Revision.new(:revision => le['revision'],
215 215 :scmid => le['node'],
216 216 :author => (le['author']['__content__'] rescue ''),
217 217 :time => Time.parse(le['date']['__content__']),
218 218 :message => le['msg']['__content__'],
219 219 :paths => paths)
220 220 end
221 221 self
222 222 end
223 223
224 224 # Returns list of nodes in the specified branch
225 225 def nodes_in_branch(branch, options={})
226 226 hg_args = ['rhlog', '--template', '{node|short}\n', '--rhbranch', CGI.escape(branch)]
227 227 hg_args << '--from' << CGI.escape(branch)
228 228 hg_args << '--to' << '0'
229 229 hg_args << '--limit' << options[:limit] if options[:limit]
230 230 hg(*hg_args) { |io| io.readlines.map { |e| e.chomp } }
231 231 end
232 232
233 233 def diff(path, identifier_from, identifier_to=nil)
234 234 hg_args = %w|rhdiff|
235 235 if identifier_to
236 236 hg_args << '-r' << hgrev(identifier_to) << '-r' << hgrev(identifier_from)
237 237 else
238 238 hg_args << '-c' << hgrev(identifier_from)
239 239 end
240 240 unless path.blank?
241 241 p = scm_iconv(@path_encoding, 'UTF-8', path)
242 242 hg_args << CGI.escape(hgtarget(p))
243 243 end
244 244 diff = []
245 245 hg *hg_args do |io|
246 246 io.each_line do |line|
247 247 diff << line
248 248 end
249 249 end
250 250 diff
251 251 rescue HgCommandAborted
252 252 nil # means not found
253 253 end
254 254
255 255 def cat(path, identifier=nil)
256 256 p = CGI.escape(scm_iconv(@path_encoding, 'UTF-8', path))
257 257 hg 'rhcat', '-r', CGI.escape(hgrev(identifier)), hgtarget(p) do |io|
258 258 io.binmode
259 259 io.read
260 260 end
261 261 rescue HgCommandAborted
262 262 nil # means not found
263 263 end
264 264
265 265 def annotate(path, identifier=nil)
266 266 p = CGI.escape(scm_iconv(@path_encoding, 'UTF-8', path))
267 267 blame = Annotate.new
268 268 hg 'rhannotate', '-ncu', '-r', CGI.escape(hgrev(identifier)), hgtarget(p) do |io|
269 269 io.each_line do |line|
270 270 line.force_encoding('ASCII-8BIT') if line.respond_to?(:force_encoding)
271 271 next unless line =~ %r{^([^:]+)\s(\d+)\s([0-9a-f]+):\s(.*)$}
272 272 r = Revision.new(:author => $1.strip, :revision => $2, :scmid => $3,
273 273 :identifier => $3)
274 274 blame.add_line($4.rstrip, r)
275 275 end
276 276 end
277 277 blame
278 278 rescue HgCommandAborted
279 nil # means not found or cannot be annotated
279 # means not found or cannot be annotated
280 Annotate.new
280 281 end
281 282
282 283 class Revision < Redmine::Scm::Adapters::Revision
283 284 # Returns the readable identifier
284 285 def format_identifier
285 286 "#{revision}:#{scmid}"
286 287 end
287 288 end
288 289
289 290 # Runs 'hg' command with the given args
290 291 def hg(*args, &block)
291 292 repo_path = root_url || url
292 293 full_args = [HG_BIN, '-R', repo_path, '--encoding', 'utf-8']
293 294 full_args << '--config' << "extensions.redminehelper=#{HG_HELPER_EXT}"
294 295 full_args << '--config' << 'diff.git=false'
295 296 full_args += args
296 297 ret = shellout(full_args.map { |e| shell_quote e.to_s }.join(' '), &block)
297 298 if $? && $?.exitstatus != 0
298 299 raise HgCommandAborted, "hg exited with non-zero status: #{$?.exitstatus}"
299 300 end
300 301 ret
301 302 end
302 303 private :hg
303 304
304 305 # Returns correct revision identifier
305 306 def hgrev(identifier, sq=false)
306 307 rev = identifier.blank? ? 'tip' : identifier.to_s
307 308 rev = shell_quote(rev) if sq
308 309 rev
309 310 end
310 311 private :hgrev
311 312
312 313 def hgtarget(path)
313 314 path ||= ''
314 315 root_url + '/' + without_leading_slash(path)
315 316 end
316 317 private :hgtarget
317 318
318 319 def as_ary(o)
319 320 return [] unless o
320 321 o.is_a?(Array) ? o : Array[o]
321 322 end
322 323 private :as_ary
323 324 end
324 325 end
325 326 end
326 327 end
General Comments 0
You need to be logged in to leave comments. Login now