##// END OF EJS Templates
Merged r4419 from trunk....
Jean-Philippe Lang -
r4306:b5a409791c04
parent child
Show More
@@ -1,256 +1,256
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2010 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 'uri'
20 20
21 21 module Redmine
22 22 module Scm
23 23 module Adapters
24 24 class SubversionAdapter < AbstractAdapter
25 25
26 26 # SVN executable name
27 27 SVN_BIN = "svn"
28 28
29 29 class << self
30 30 def client_version
31 31 @@client_version ||= (svn_binary_version || [])
32 32 end
33 33
34 34 def svn_binary_version
35 35 cmd = "#{SVN_BIN} --version"
36 36 version = nil
37 37 shellout(cmd) do |io|
38 38 # Read svn version in first returned line
39 if m = io.gets.to_s.match(%r{((\d+\.)+\d+)})
40 version = m[0].scan(%r{\d+}).collect(&:to_i)
39 if m = io.read.to_s.match(%r{\A(.*?)((\d+\.)+\d+)})
40 version = m[2].scan(%r{\d+}).collect(&:to_i)
41 41 end
42 42 end
43 43 return nil if $? && $?.exitstatus != 0
44 44 version
45 45 end
46 46 end
47 47
48 48 # Get info about the svn repository
49 49 def info
50 50 cmd = "#{SVN_BIN} info --xml #{target}"
51 51 cmd << credentials_string
52 52 info = nil
53 53 shellout(cmd) do |io|
54 54 output = io.read
55 55 begin
56 56 doc = ActiveSupport::XmlMini.parse(output)
57 57 #root_url = doc.elements["info/entry/repository/root"].text
58 58 info = Info.new({:root_url => doc['info']['entry']['repository']['root']['__content__'],
59 59 :lastrev => Revision.new({
60 60 :identifier => doc['info']['entry']['commit']['revision'],
61 61 :time => Time.parse(doc['info']['entry']['commit']['date']['__content__']).localtime,
62 62 :author => (doc['info']['entry']['commit']['author'] ? doc['info']['entry']['commit']['author']['__content__'] : "")
63 63 })
64 64 })
65 65 rescue
66 66 end
67 67 end
68 68 return nil if $? && $?.exitstatus != 0
69 69 info
70 70 rescue CommandFailed
71 71 return nil
72 72 end
73 73
74 74 # Returns an Entries collection
75 75 # or nil if the given path doesn't exist in the repository
76 76 def entries(path=nil, identifier=nil)
77 77 path ||= ''
78 78 identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
79 79 entries = Entries.new
80 80 cmd = "#{SVN_BIN} list --xml #{target(path)}@#{identifier}"
81 81 cmd << credentials_string
82 82 shellout(cmd) do |io|
83 83 output = io.read
84 84 begin
85 85 doc = ActiveSupport::XmlMini.parse(output)
86 86 each_xml_element(doc['lists']['list'], 'entry') do |entry|
87 87 commit = entry['commit']
88 88 commit_date = commit['date']
89 89 # Skip directory if there is no commit date (usually that
90 90 # means that we don't have read access to it)
91 91 next if entry['kind'] == 'dir' && commit_date.nil?
92 92 name = entry['name']['__content__']
93 93 entries << Entry.new({:name => URI.unescape(name),
94 94 :path => ((path.empty? ? "" : "#{path}/") + name),
95 95 :kind => entry['kind'],
96 96 :size => ((s = entry['size']) ? s['__content__'].to_i : nil),
97 97 :lastrev => Revision.new({
98 98 :identifier => commit['revision'],
99 99 :time => Time.parse(commit_date['__content__'].to_s).localtime,
100 100 :author => ((a = commit['author']) ? a['__content__'] : nil)
101 101 })
102 102 })
103 103 end
104 104 rescue Exception => e
105 105 logger.error("Error parsing svn output: #{e.message}")
106 106 logger.error("Output was:\n #{output}")
107 107 end
108 108 end
109 109 return nil if $? && $?.exitstatus != 0
110 110 logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
111 111 entries.sort_by_name
112 112 end
113 113
114 114 def properties(path, identifier=nil)
115 115 # proplist xml output supported in svn 1.5.0 and higher
116 116 return nil unless self.class.client_version_above?([1, 5, 0])
117 117
118 118 identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
119 119 cmd = "#{SVN_BIN} proplist --verbose --xml #{target(path)}@#{identifier}"
120 120 cmd << credentials_string
121 121 properties = {}
122 122 shellout(cmd) do |io|
123 123 output = io.read
124 124 begin
125 125 doc = ActiveSupport::XmlMini.parse(output)
126 126 each_xml_element(doc['properties']['target'], 'property') do |property|
127 127 properties[ property['name'] ] = property['__content__'].to_s
128 128 end
129 129 rescue
130 130 end
131 131 end
132 132 return nil if $? && $?.exitstatus != 0
133 133 properties
134 134 end
135 135
136 136 def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
137 137 path ||= ''
138 138 identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : "HEAD"
139 139 identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : 1
140 140 revisions = Revisions.new
141 141 cmd = "#{SVN_BIN} log --xml -r #{identifier_from}:#{identifier_to}"
142 142 cmd << credentials_string
143 143 cmd << " --verbose " if options[:with_paths]
144 144 cmd << " --limit #{options[:limit].to_i}" if options[:limit]
145 145 cmd << ' ' + target(path)
146 146 shellout(cmd) do |io|
147 147 output = io.read
148 148 begin
149 149 doc = ActiveSupport::XmlMini.parse(output)
150 150 each_xml_element(doc['log'], 'logentry') do |logentry|
151 151 paths = []
152 152 each_xml_element(logentry['paths'], 'path') do |path|
153 153 paths << {:action => path['action'],
154 154 :path => path['__content__'],
155 155 :from_path => path['copyfrom-path'],
156 156 :from_revision => path['copyfrom-rev']
157 157 }
158 158 end if logentry['paths'] && logentry['paths']['path']
159 159 paths.sort! { |x,y| x[:path] <=> y[:path] }
160 160
161 161 revisions << Revision.new({:identifier => logentry['revision'],
162 162 :author => (logentry['author'] ? logentry['author']['__content__'] : ""),
163 163 :time => Time.parse(logentry['date']['__content__'].to_s).localtime,
164 164 :message => logentry['msg']['__content__'],
165 165 :paths => paths
166 166 })
167 167 end
168 168 rescue
169 169 end
170 170 end
171 171 return nil if $? && $?.exitstatus != 0
172 172 revisions
173 173 end
174 174
175 175 def diff(path, identifier_from, identifier_to=nil, type="inline")
176 176 path ||= ''
177 177 identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : ''
178 178 identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : (identifier_from.to_i - 1)
179 179
180 180 cmd = "#{SVN_BIN} diff -r "
181 181 cmd << "#{identifier_to}:"
182 182 cmd << "#{identifier_from}"
183 183 cmd << " #{target(path)}@#{identifier_from}"
184 184 cmd << credentials_string
185 185 diff = []
186 186 shellout(cmd) do |io|
187 187 io.each_line do |line|
188 188 diff << line
189 189 end
190 190 end
191 191 return nil if $? && $?.exitstatus != 0
192 192 diff
193 193 end
194 194
195 195 def cat(path, identifier=nil)
196 196 identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
197 197 cmd = "#{SVN_BIN} cat #{target(path)}@#{identifier}"
198 198 cmd << credentials_string
199 199 cat = nil
200 200 shellout(cmd) do |io|
201 201 io.binmode
202 202 cat = io.read
203 203 end
204 204 return nil if $? && $?.exitstatus != 0
205 205 cat
206 206 end
207 207
208 208 def annotate(path, identifier=nil)
209 209 identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
210 210 cmd = "#{SVN_BIN} blame #{target(path)}@#{identifier}"
211 211 cmd << credentials_string
212 212 blame = Annotate.new
213 213 shellout(cmd) do |io|
214 214 io.each_line do |line|
215 215 next unless line =~ %r{^\s*(\d+)\s*(\S+)\s(.*)$}
216 216 blame.add_line($3.rstrip, Revision.new(:identifier => $1.to_i, :author => $2.strip))
217 217 end
218 218 end
219 219 return nil if $? && $?.exitstatus != 0
220 220 blame
221 221 end
222 222
223 223 private
224 224
225 225 def credentials_string
226 226 str = ''
227 227 str << " --username #{shell_quote(@login)}" unless @login.blank?
228 228 str << " --password #{shell_quote(@password)}" unless @login.blank? || @password.blank?
229 229 str << " --no-auth-cache --non-interactive"
230 230 str
231 231 end
232 232
233 233 # Helper that iterates over the child elements of a xml node
234 234 # MiniXml returns a hash when a single child is found or an array of hashes for multiple children
235 235 def each_xml_element(node, name)
236 236 if node && node[name]
237 237 if node[name].is_a?(Hash)
238 238 yield node[name]
239 239 else
240 240 node[name].each do |element|
241 241 yield element
242 242 end
243 243 end
244 244 end
245 245 end
246 246
247 247 def target(path = '')
248 248 base = path.match(/^\//) ? root_url : url
249 249 uri = "#{base}/#{path}"
250 250 uri = URI.escape(URI.escape(uri), '[]')
251 251 shell_quote(uri.gsub(/[?<>\*]/, ''))
252 252 end
253 253 end
254 254 end
255 255 end
256 256 end
General Comments 0
You need to be logged in to leave comments. Login now