##// END OF EJS Templates
Added 2 log messages in SubversionAdapter#entries....
Jean-Philippe Lang -
r732:83eed09109ba
parent child
Show More
@@ -1,173 +1,175
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
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 # Get info about the svn repository
30 30 def info
31 31 cmd = "#{SVN_BIN} info --xml #{target('')}"
32 32 cmd << " --username #{@login} --password #{@password}" if @login
33 33 info = nil
34 34 shellout(cmd) do |io|
35 35 begin
36 36 doc = REXML::Document.new(io)
37 37 #root_url = doc.elements["info/entry/repository/root"].text
38 38 info = Info.new({:root_url => doc.elements["info/entry/repository/root"].text,
39 39 :lastrev => Revision.new({
40 40 :identifier => doc.elements["info/entry/commit"].attributes['revision'],
41 41 :time => Time.parse(doc.elements["info/entry/commit/date"].text).localtime,
42 42 :author => (doc.elements["info/entry/commit/author"] ? doc.elements["info/entry/commit/author"].text : "")
43 43 })
44 44 })
45 45 rescue
46 46 end
47 47 end
48 48 return nil if $? && $?.exitstatus != 0
49 49 info
50 50 rescue Errno::ENOENT => e
51 51 return nil
52 52 end
53 53
54 54 # Returns the entry identified by path and revision identifier
55 55 # or nil if entry doesn't exist in the repository
56 56 def entry(path=nil, identifier=nil)
57 57 e = entries(path, identifier)
58 58 e ? e.first : nil
59 59 end
60 60
61 61 # Returns an Entries collection
62 62 # or nil if the given path doesn't exist in the repository
63 63 def entries(path=nil, identifier=nil)
64 64 path ||= ''
65 65 identifier = 'HEAD' unless identifier and identifier > 0
66 66 entries = Entries.new
67 67 cmd = "#{SVN_BIN} list --xml #{target(path)}@#{identifier}"
68 68 cmd << " --username #{@login} --password #{@password}" if @login
69 69 shellout(cmd) do |io|
70 70 begin
71 71 doc = REXML::Document.new(io)
72 72 doc.elements.each("lists/list/entry") do |entry|
73 73 entries << Entry.new({:name => entry.elements['name'].text,
74 74 :path => ((path.empty? ? "" : "#{path}/") + entry.elements['name'].text),
75 75 :kind => entry.attributes['kind'],
76 76 :size => (entry.elements['size'] and entry.elements['size'].text).to_i,
77 77 :lastrev => Revision.new({
78 78 :identifier => entry.elements['commit'].attributes['revision'],
79 79 :time => Time.parse(entry.elements['commit'].elements['date'].text).localtime,
80 80 :author => (entry.elements['commit'].elements['author'] ? entry.elements['commit'].elements['author'].text : "")
81 81 })
82 82 })
83 83 end
84 rescue
84 rescue Exception => e
85 logger.info("Error parsing svn output: #{e.message}")
85 86 end
86 87 end
87 88 return nil if $? && $?.exitstatus != 0
89 logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
88 90 entries.sort_by_name
89 91 rescue Errno::ENOENT => e
90 92 raise CommandFailed
91 93 end
92 94
93 95 def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
94 96 path ||= ''
95 97 identifier_from = 'HEAD' unless identifier_from and identifier_from.to_i > 0
96 98 identifier_to = 1 unless identifier_to and identifier_to.to_i > 0
97 99 revisions = Revisions.new
98 100 cmd = "#{SVN_BIN} log --xml -r #{identifier_from}:#{identifier_to}"
99 101 cmd << " --username #{@login} --password #{@password}" if @login
100 102 cmd << " --verbose " if options[:with_paths]
101 103 cmd << target(path)
102 104 shellout(cmd) do |io|
103 105 begin
104 106 doc = REXML::Document.new(io)
105 107 doc.elements.each("log/logentry") do |logentry|
106 108 paths = []
107 109 logentry.elements.each("paths/path") do |path|
108 110 paths << {:action => path.attributes['action'],
109 111 :path => path.text,
110 112 :from_path => path.attributes['copyfrom-path'],
111 113 :from_revision => path.attributes['copyfrom-rev']
112 114 }
113 115 end
114 116 paths.sort! { |x,y| x[:path] <=> y[:path] }
115 117
116 118 revisions << Revision.new({:identifier => logentry.attributes['revision'],
117 119 :author => (logentry.elements['author'] ? logentry.elements['author'].text : ""),
118 120 :time => Time.parse(logentry.elements['date'].text).localtime,
119 121 :message => logentry.elements['msg'].text,
120 122 :paths => paths
121 123 })
122 124 end
123 125 rescue
124 126 end
125 127 end
126 128 return nil if $? && $?.exitstatus != 0
127 129 revisions
128 130 rescue Errno::ENOENT => e
129 131 raise CommandFailed
130 132 end
131 133
132 134 def diff(path, identifier_from, identifier_to=nil, type="inline")
133 135 path ||= ''
134 136 if identifier_to and identifier_to.to_i > 0
135 137 identifier_to = identifier_to.to_i
136 138 else
137 139 identifier_to = identifier_from.to_i - 1
138 140 end
139 141 cmd = "#{SVN_BIN} diff -r "
140 142 cmd << "#{identifier_to}:"
141 143 cmd << "#{identifier_from}"
142 144 cmd << "#{target(path)}@#{identifier_from}"
143 145 cmd << " --username #{@login} --password #{@password}" if @login
144 146 diff = []
145 147 shellout(cmd) do |io|
146 148 io.each_line do |line|
147 149 diff << line
148 150 end
149 151 end
150 152 return nil if $? && $?.exitstatus != 0
151 153 DiffTableList.new diff, type
152 154 rescue Errno::ENOENT => e
153 155 raise CommandFailed
154 156 end
155 157
156 158 def cat(path, identifier=nil)
157 159 identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
158 160 cmd = "#{SVN_BIN} cat #{target(path)}@#{identifier}"
159 161 cmd << " --username #{@login} --password #{@password}" if @login
160 162 cat = nil
161 163 shellout(cmd) do |io|
162 164 io.binmode
163 165 cat = io.read
164 166 end
165 167 return nil if $? && $?.exitstatus != 0
166 168 cat
167 169 rescue Errno::ENOENT => e
168 170 raise CommandFailed
169 171 end
170 172 end
171 173 end
172 174 end
173 175 end
General Comments 0
You need to be logged in to leave comments. Login now