kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makes test pass with Bazaar 2.1.0 (#5002). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3550 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2010-03-06 20:14:09 +00:00
parent 6511e94233
commit 332d88cd67
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/redmine/scm/adapters/bazaar_adapter.rb
View File

@ -56,14 +56,14 @@ module Redmine
shellout(cmd) do |io| shellout(cmd) do |io|
prefix = "#{url}/#{path}".gsub('\\', '/') prefix = "#{url}/#{path}".gsub('\\', '/')
logger.debug "PREFIX: #{prefix}" logger.debug "PREFIX: #{prefix}"
re = %r{^V\s+#{Regexp.escape(prefix)}(\/?)([^\/]+)(\/?)\s+(\S+)$} re = %r{^V\s+(#{Regexp.escape(prefix)})?(\/?)([^\/]+)(\/?)\s+(\S+)$}
io.each_line do |line| io.each_line do |line|
next unless line =~ re next unless line =~ re
entries << Entry.new({:name => $2.strip, entries << Entry.new({:name => $3.strip,
:path => ((path.empty? ? "" : "#{path}/") + $2.strip), :path => ((path.empty? ? "" : "#{path}/") + $3.strip),
:kind => ($3.blank? ? 'file' : 'dir'), :kind => ($4.blank? ? 'file' : 'dir'),
:size => nil, :size => nil,
:lastrev => Revision.new(:revision => $4.strip) :lastrev => Revision.new(:revision => $5.strip)
}) })
end end
end end