##// END OF EJS Templates
jro_apps » redmine
RSS
Subversion adapter: ignore directories with no commit date (#1370)....
Jean-Philippe Lang -
r1486:6d5db302eeab
parent child
Show More
Side by Side Unified
Context file:
r1486:6d5db302eeab Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,184 +1,187
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 << credentials_string
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 CommandFailed
51 51 return nil
52 52 end
53 53
54 54 # Returns an Entries collection
55 55 # or nil if the given path doesn't exist in the repository
56 56 def entries(path=nil, identifier=nil)
57 57 path ||= ''
58 58 identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
59 59 entries = Entries.new
60 60 cmd = "#{SVN_BIN} list --xml #{target(path)}@#{identifier}"
61 61 cmd << credentials_string
62 62 shellout(cmd) do |io|
63 63 output = io.read
64 64 begin
65 65 doc = REXML::Document.new(output)
66 66 doc.elements.each("lists/list/entry") do |entry|
67 # Skip directory if there is no commit date (usually that
68 # means that we don't have read access to it)
69 next if entry.attributes['kind'] == 'dir' && entry.elements['commit'].elements['date'].nil?
67 70 entries << Entry.new({:name => entry.elements['name'].text,
68 71 :path => ((path.empty? ? "" : "#{path}/") + entry.elements['name'].text),
69 72 :kind => entry.attributes['kind'],
70 73 :size => (entry.elements['size'] and entry.elements['size'].text).to_i,
71 74 :lastrev => Revision.new({
72 75 :identifier => entry.elements['commit'].attributes['revision'],
73 76 :time => Time.parse(entry.elements['commit'].elements['date'].text).localtime,
74 77 :author => (entry.elements['commit'].elements['author'] ? entry.elements['commit'].elements['author'].text : "")
75 78 })
76 79 })
77 80 end
78 81 rescue Exception => e
79 82 logger.error("Error parsing svn output: #{e.message}")
80 83 logger.error("Output was:\n #{output}")
81 84 end
82 85 end
83 86 return nil if $? && $?.exitstatus != 0
84 87 logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
85 88 entries.sort_by_name
86 89 end
87 90
88 91 def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
89 92 path ||= ''
90 93 identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : "HEAD"
91 94 identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : 1
92 95 revisions = Revisions.new
93 96 cmd = "#{SVN_BIN} log --xml -r #{identifier_from}:#{identifier_to}"
94 97 cmd << credentials_string
95 98 cmd << " --verbose " if options[:with_paths]
96 99 cmd << ' ' + target(path)
97 100 shellout(cmd) do |io|
98 101 begin
99 102 doc = REXML::Document.new(io)
100 103 doc.elements.each("log/logentry") do |logentry|
101 104 paths = []
102 105 logentry.elements.each("paths/path") do |path|
103 106 paths << {:action => path.attributes['action'],
104 107 :path => path.text,
105 108 :from_path => path.attributes['copyfrom-path'],
106 109 :from_revision => path.attributes['copyfrom-rev']
107 110 }
108 111 end
109 112 paths.sort! { |x,y| x[:path] <=> y[:path] }
110 113
111 114 revisions << Revision.new({:identifier => logentry.attributes['revision'],
112 115 :author => (logentry.elements['author'] ? logentry.elements['author'].text : ""),
113 116 :time => Time.parse(logentry.elements['date'].text).localtime,
114 117 :message => logentry.elements['msg'].text,
115 118 :paths => paths
116 119 })
117 120 end
118 121 rescue
119 122 end
120 123 end
121 124 return nil if $? && $?.exitstatus != 0
122 125 revisions
123 126 end
124 127
125 128 def diff(path, identifier_from, identifier_to=nil, type="inline")
126 129 path ||= ''
127 130 identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : ''
128 131 identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : (identifier_from.to_i - 1)
129 132
130 133 cmd = "#{SVN_BIN} diff -r "
131 134 cmd << "#{identifier_to}:"
132 135 cmd << "#{identifier_from}"
133 136 cmd << " #{target(path)}@#{identifier_from}"
134 137 cmd << credentials_string
135 138 diff = []
136 139 shellout(cmd) do |io|
137 140 io.each_line do |line|
138 141 diff << line
139 142 end
140 143 end
141 144 return nil if $? && $?.exitstatus != 0
142 145 DiffTableList.new diff, type
143 146 end
144 147
145 148 def cat(path, identifier=nil)
146 149 identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
147 150 cmd = "#{SVN_BIN} cat #{target(path)}@#{identifier}"
148 151 cmd << credentials_string
149 152 cat = nil
150 153 shellout(cmd) do |io|
151 154 io.binmode
152 155 cat = io.read
153 156 end
154 157 return nil if $? && $?.exitstatus != 0
155 158 cat
156 159 end
157 160
158 161 def annotate(path, identifier=nil)
159 162 identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
160 163 cmd = "#{SVN_BIN} blame #{target(path)}@#{identifier}"
161 164 cmd << credentials_string
162 165 blame = Annotate.new
163 166 shellout(cmd) do |io|
164 167 io.each_line do |line|
165 168 next unless line =~ %r{^\s*(\d+)\s*(\S+)\s(.*)$}
166 169 blame.add_line($3.rstrip, Revision.new(:identifier => $1.to_i, :author => $2.strip))
167 170 end
168 171 end
169 172 return nil if $? && $?.exitstatus != 0
170 173 blame
171 174 end
172 175
173 176 private
174 177
175 178 def credentials_string
176 179 str = ''
177 180 str << " --username #{shell_quote(@login)}" unless @login.blank?
178 181 str << " --password #{shell_quote(@password)}" unless @login.blank? || @password.blank?
179 182 str
180 183 end
181 184 end
182 185 end
183 186 end
184 187 end
General Comments 0
You need to be logged in to leave comments. Login now