##// END OF EJS Templates
Change subversion adapter to not cache authentication and run non interactively...
Eric Davis -
r2714:1a9942ba9952
parent child
Show More
@@ -1,233 +1,234
1 1 # redMine - project management software
2 2 # Copyright (C) 2006-2007 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 'rexml/document'
20 20 require 'uri'
21 21
22 22 module Redmine
23 23 module Scm
24 24 module Adapters
25 25 class SubversionAdapter < AbstractAdapter
26 26
27 27 # SVN executable name
28 28 SVN_BIN = "svn"
29 29
30 30 class << self
31 31 def client_version
32 32 @@client_version ||= (svn_binary_version || [])
33 33 end
34 34
35 35 def svn_binary_version
36 36 cmd = "#{SVN_BIN} --version"
37 37 version = nil
38 38 shellout(cmd) do |io|
39 39 # Read svn version in first returned line
40 40 if m = io.gets.to_s.match(%r{((\d+\.)+\d+)})
41 41 version = m[0].scan(%r{\d+}).collect(&:to_i)
42 42 end
43 43 end
44 44 return nil if $? && $?.exitstatus != 0
45 45 version
46 46 end
47 47 end
48 48
49 49 # Get info about the svn repository
50 50 def info
51 51 cmd = "#{SVN_BIN} info --xml #{target('')}"
52 52 cmd << credentials_string
53 53 info = nil
54 54 shellout(cmd) do |io|
55 55 begin
56 56 doc = REXML::Document.new(io)
57 57 #root_url = doc.elements["info/entry/repository/root"].text
58 58 info = Info.new({:root_url => doc.elements["info/entry/repository/root"].text,
59 59 :lastrev => Revision.new({
60 60 :identifier => doc.elements["info/entry/commit"].attributes['revision'],
61 61 :time => Time.parse(doc.elements["info/entry/commit/date"].text).localtime,
62 62 :author => (doc.elements["info/entry/commit/author"] ? doc.elements["info/entry/commit/author"].text : "")
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(URI.escape(path))}@#{identifier}"
81 81 cmd << credentials_string
82 82 shellout(cmd) do |io|
83 83 output = io.read
84 84 begin
85 85 doc = REXML::Document.new(output)
86 86 doc.elements.each("lists/list/entry") do |entry|
87 87 commit = entry.elements['commit']
88 88 commit_date = commit.elements['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.attributes['kind'] == 'dir' && commit_date.nil?
92 92 name = entry.elements['name'].text
93 93 entries << Entry.new({:name => URI.unescape(name),
94 94 :path => ((path.empty? ? "" : "#{path}/") + name),
95 95 :kind => entry.attributes['kind'],
96 96 :size => ((s = entry.elements['size']) ? s.text.to_i : nil),
97 97 :lastrev => Revision.new({
98 98 :identifier => commit.attributes['revision'],
99 99 :time => Time.parse(commit_date.text).localtime,
100 100 :author => ((a = commit.elements['author']) ? a.text : 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(URI.escape(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 = REXML::Document.new(output)
126 126 doc.elements.each("properties/target/property") do |property|
127 127 properties[ property.attributes['name'] ] = property.text
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(URI.escape(path))
146 146 shellout(cmd) do |io|
147 147 begin
148 148 doc = REXML::Document.new(io)
149 149 doc.elements.each("log/logentry") do |logentry|
150 150 paths = []
151 151 logentry.elements.each("paths/path") do |path|
152 152 paths << {:action => path.attributes['action'],
153 153 :path => path.text,
154 154 :from_path => path.attributes['copyfrom-path'],
155 155 :from_revision => path.attributes['copyfrom-rev']
156 156 }
157 157 end
158 158 paths.sort! { |x,y| x[:path] <=> y[:path] }
159 159
160 160 revisions << Revision.new({:identifier => logentry.attributes['revision'],
161 161 :author => (logentry.elements['author'] ? logentry.elements['author'].text : ""),
162 162 :time => Time.parse(logentry.elements['date'].text).localtime,
163 163 :message => logentry.elements['msg'].text,
164 164 :paths => paths
165 165 })
166 166 end
167 167 rescue
168 168 end
169 169 end
170 170 return nil if $? && $?.exitstatus != 0
171 171 revisions
172 172 end
173 173
174 174 def diff(path, identifier_from, identifier_to=nil, type="inline")
175 175 path ||= ''
176 176 identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : ''
177 177 identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : (identifier_from.to_i - 1)
178 178
179 179 cmd = "#{SVN_BIN} diff -r "
180 180 cmd << "#{identifier_to}:"
181 181 cmd << "#{identifier_from}"
182 182 cmd << " #{target(URI.escape(path))}@#{identifier_from}"
183 183 cmd << credentials_string
184 184 diff = []
185 185 shellout(cmd) do |io|
186 186 io.each_line do |line|
187 187 diff << line
188 188 end
189 189 end
190 190 return nil if $? && $?.exitstatus != 0
191 191 diff
192 192 end
193 193
194 194 def cat(path, identifier=nil)
195 195 identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
196 196 cmd = "#{SVN_BIN} cat #{target(URI.escape(path))}@#{identifier}"
197 197 cmd << credentials_string
198 198 cat = nil
199 199 shellout(cmd) do |io|
200 200 io.binmode
201 201 cat = io.read
202 202 end
203 203 return nil if $? && $?.exitstatus != 0
204 204 cat
205 205 end
206 206
207 207 def annotate(path, identifier=nil)
208 208 identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
209 209 cmd = "#{SVN_BIN} blame #{target(URI.escape(path))}@#{identifier}"
210 210 cmd << credentials_string
211 211 blame = Annotate.new
212 212 shellout(cmd) do |io|
213 213 io.each_line do |line|
214 214 next unless line =~ %r{^\s*(\d+)\s*(\S+)\s(.*)$}
215 215 blame.add_line($3.rstrip, Revision.new(:identifier => $1.to_i, :author => $2.strip))
216 216 end
217 217 end
218 218 return nil if $? && $?.exitstatus != 0
219 219 blame
220 220 end
221 221
222 222 private
223 223
224 224 def credentials_string
225 225 str = ''
226 226 str << " --username #{shell_quote(@login)}" unless @login.blank?
227 227 str << " --password #{shell_quote(@password)}" unless @login.blank? || @password.blank?
228 str << " --no-auth-cache --non-interactive"
228 229 str
229 230 end
230 231 end
231 232 end
232 233 end
233 234 end
General Comments 0
You need to be logged in to leave comments. Login now