##// END OF EJS Templates
scm: bazaar: use "shell_quote_command" method at adapter for JRuby + Windows command name (#8825)....
Toshi MARUYAMA -
r6162:9b66e09e7f31
parent child
Show More
@@ -1,306 +1,306
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
20 20 module Redmine
21 21 module Scm
22 22 module Adapters
23 23 class BazaarAdapter < AbstractAdapter
24 24
25 25 # Bazaar executable name
26 26 BZR_BIN = Redmine::Configuration['scm_bazaar_command'] || "bzr"
27 27
28 28 class << self
29 29 def client_command
30 30 @@bin ||= BZR_BIN
31 31 end
32 32
33 33 def sq_bin
34 @@sq_bin ||= shell_quote(BZR_BIN)
34 @@sq_bin ||= shell_quote_command
35 35 end
36 36
37 37 def client_version
38 38 @@client_version ||= (scm_command_version || [])
39 39 end
40 40
41 41 def client_available
42 42 !client_version.empty?
43 43 end
44 44
45 45 def scm_command_version
46 46 scm_version = scm_version_from_command_line.dup
47 47 if scm_version.respond_to?(:force_encoding)
48 48 scm_version.force_encoding('ASCII-8BIT')
49 49 end
50 50 if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)})
51 51 m[2].scan(%r{\d+}).collect(&:to_i)
52 52 end
53 53 end
54 54
55 55 def scm_version_from_command_line
56 56 shellout("#{sq_bin} --version") { |io| io.read }.to_s
57 57 end
58 58 end
59 59
60 60 # Get info about the repository
61 61 def info
62 62 cmd_args = %w|revno|
63 63 cmd_args << bzr_target('')
64 64 info = nil
65 65 scm_cmd(*cmd_args) do |io|
66 66 if io.read =~ %r{^(\d+)\r?$}
67 67 info = Info.new({:root_url => url,
68 68 :lastrev => Revision.new({
69 69 :identifier => $1
70 70 })
71 71 })
72 72 end
73 73 end
74 74 info
75 75 rescue ScmCommandAborted
76 76 return nil
77 77 end
78 78
79 79 # Returns an Entries collection
80 80 # or nil if the given path doesn't exist in the repository
81 81 def entries(path=nil, identifier=nil, options={})
82 82 path ||= ''
83 83 entries = Entries.new
84 84 identifier = -1 unless identifier && identifier.to_i > 0
85 85 cmd_args = %w|ls -v --show-ids|
86 86 cmd_args << "-r#{identifier.to_i}"
87 87 cmd_args << bzr_target(path)
88 88 scm_cmd(*cmd_args) do |io|
89 89 prefix = "#{url}/#{path}".gsub('\\', '/')
90 90 logger.debug "PREFIX: #{prefix}"
91 91 re = %r{^V\s+(#{Regexp.escape(prefix)})?(\/?)([^\/]+)(\/?)\s+(\S+)\r?$}
92 92 io.each_line do |line|
93 93 next unless line =~ re
94 94 entries << Entry.new({:name => $3.strip,
95 95 :path => ((path.empty? ? "" : "#{path}/") + $3.strip),
96 96 :kind => ($4.blank? ? 'file' : 'dir'),
97 97 :size => nil,
98 98 :lastrev => Revision.new(:revision => $5.strip)
99 99 })
100 100 end
101 101 end
102 102 if logger && logger.debug?
103 103 logger.debug("Found #{entries.size} entries in the repository for #{target(path)}")
104 104 end
105 105 entries.sort_by_name
106 106 rescue ScmCommandAborted
107 107 return nil
108 108 end
109 109
110 110 def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
111 111 path ||= ''
112 112 identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : 'last:1'
113 113 identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : 1
114 114 revisions = Revisions.new
115 115 cmd_args = %w|log -v --show-ids|
116 116 cmd_args << "-r#{identifier_to}..#{identifier_from}"
117 117 cmd_args << bzr_target(path)
118 118 scm_cmd(*cmd_args) do |io|
119 119 revision = nil
120 120 parsing = nil
121 121 io.each_line do |line|
122 122 if line =~ /^----/
123 123 revisions << revision if revision
124 124 revision = Revision.new(:paths => [], :message => '')
125 125 parsing = nil
126 126 else
127 127 next unless revision
128 128 if line =~ /^revno: (\d+)($|\s\[merge\]$)/
129 129 revision.identifier = $1.to_i
130 130 elsif line =~ /^committer: (.+)$/
131 131 revision.author = $1.strip
132 132 elsif line =~ /^revision-id:(.+)$/
133 133 revision.scmid = $1.strip
134 134 elsif line =~ /^timestamp: (.+)$/
135 135 revision.time = Time.parse($1).localtime
136 136 elsif line =~ /^ -----/
137 137 # partial revisions
138 138 parsing = nil unless parsing == 'message'
139 139 elsif line =~ /^(message|added|modified|removed|renamed):/
140 140 parsing = $1
141 141 elsif line =~ /^ (.*)$/
142 142 if parsing == 'message'
143 143 revision.message << "#{$1}\n"
144 144 else
145 145 if $1 =~ /^(.*)\s+(\S+)$/
146 146 path = $1.strip
147 147 revid = $2
148 148 case parsing
149 149 when 'added'
150 150 revision.paths << {:action => 'A', :path => "/#{path}", :revision => revid}
151 151 when 'modified'
152 152 revision.paths << {:action => 'M', :path => "/#{path}", :revision => revid}
153 153 when 'removed'
154 154 revision.paths << {:action => 'D', :path => "/#{path}", :revision => revid}
155 155 when 'renamed'
156 156 new_path = path.split('=>').last
157 157 revision.paths << {:action => 'M', :path => "/#{new_path.strip}", :revision => revid} if new_path
158 158 end
159 159 end
160 160 end
161 161 else
162 162 parsing = nil
163 163 end
164 164 end
165 165 end
166 166 revisions << revision if revision
167 167 end
168 168 revisions
169 169 rescue ScmCommandAborted
170 170 return nil
171 171 end
172 172
173 173 def diff(path, identifier_from, identifier_to=nil)
174 174 path ||= ''
175 175 if identifier_to
176 176 identifier_to = identifier_to.to_i
177 177 else
178 178 identifier_to = identifier_from.to_i - 1
179 179 end
180 180 if identifier_from
181 181 identifier_from = identifier_from.to_i
182 182 end
183 183 diff = []
184 184 cmd_args = %w|diff|
185 185 cmd_args << "-r#{identifier_to}..#{identifier_from}"
186 186 cmd_args << bzr_target(path)
187 187 scm_cmd_no_raise(*cmd_args) do |io|
188 188 io.each_line do |line|
189 189 diff << line
190 190 end
191 191 end
192 192 diff
193 193 end
194 194
195 195 def cat(path, identifier=nil)
196 196 cat = nil
197 197 cmd_args = %w|cat|
198 198 cmd_args << "-r#{identifier.to_i}" if identifier && identifier.to_i > 0
199 199 cmd_args << bzr_target(path)
200 200 scm_cmd(*cmd_args) do |io|
201 201 io.binmode
202 202 cat = io.read
203 203 end
204 204 cat
205 205 rescue ScmCommandAborted
206 206 return nil
207 207 end
208 208
209 209 def annotate(path, identifier=nil)
210 210 blame = Annotate.new
211 211 cmd_args = %w|annotate -q --all|
212 212 cmd_args << "-r#{identifier.to_i}" if identifier && identifier.to_i > 0
213 213 cmd_args << bzr_target(path)
214 214 scm_cmd(*cmd_args) do |io|
215 215 author = nil
216 216 identifier = nil
217 217 io.each_line do |line|
218 218 next unless line =~ %r{^(\d+) ([^|]+)\| (.*)$}
219 219 rev = $1
220 220 blame.add_line($3.rstrip,
221 221 Revision.new(
222 222 :identifier => rev,
223 223 :revision => rev,
224 224 :author => $2.strip
225 225 ))
226 226 end
227 227 end
228 228 blame
229 229 rescue ScmCommandAborted
230 230 return nil
231 231 end
232 232
233 233 def self.branch_conf_path(path)
234 234 bcp = nil
235 235 m = path.match(%r{^(.*[/\\])\.bzr.*$})
236 236 if m
237 237 bcp = m[1]
238 238 else
239 239 bcp = path
240 240 end
241 241 bcp.gsub!(%r{[\/\\]$}, "")
242 242 if bcp
243 243 bcp = File.join(bcp, ".bzr", "branch", "branch.conf")
244 244 end
245 245 bcp
246 246 end
247 247
248 248 def append_revisions_only
249 249 return @aro if ! @aro.nil?
250 250 @aro = false
251 251 bcp = self.class.branch_conf_path(url)
252 252 if bcp && File.exist?(bcp)
253 253 begin
254 254 f = File::open(bcp, "r")
255 255 cnt = 0
256 256 f.each_line do |line|
257 257 l = line.chomp.to_s
258 258 if l =~ /^\s*append_revisions_only\s*=\s*(\w+)\s*$/
259 259 str_aro = $1
260 260 if str_aro.upcase == "TRUE"
261 261 @aro = true
262 262 cnt += 1
263 263 elsif str_aro.upcase == "FALSE"
264 264 @aro = false
265 265 cnt += 1
266 266 end
267 267 if cnt > 1
268 268 @aro = false
269 269 break
270 270 end
271 271 end
272 272 end
273 273 ensure
274 274 f.close
275 275 end
276 276 end
277 277 @aro
278 278 end
279 279
280 280 def scm_cmd(*args, &block)
281 281 full_args = [BZR_BIN]
282 282 full_args += args
283 283 ret = shellout(full_args.map { |e| shell_quote e.to_s }.join(' '), &block)
284 284 if $? && $?.exitstatus != 0
285 285 raise ScmCommandAborted, "bzr exited with non-zero status: #{$?.exitstatus}"
286 286 end
287 287 ret
288 288 end
289 289 private :scm_cmd
290 290
291 291 def scm_cmd_no_raise(*args, &block)
292 292 full_args = [BZR_BIN]
293 293 full_args += args
294 294 ret = shellout(full_args.map { |e| shell_quote e.to_s }.join(' '), &block)
295 295 ret
296 296 end
297 297 private :scm_cmd_no_raise
298 298
299 299 def bzr_target(path)
300 300 target(path, false)
301 301 end
302 302 private :bzr_target
303 303 end
304 304 end
305 305 end
306 306 end
General Comments 0
You need to be logged in to leave comments. Login now