Merged r3550 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3647 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb
index 4d2c741472557dd22d0e31b461da166bcb96cf17..ed240bf3fbf881751050d0aaba020cda49838395 100644 (file)
--- a/lib/redmine/scm/adapters/bazaar_adapter.rb
+++ b/lib/redmine/scm/adapters/bazaar_adapter.rb
@@ -56,14 +56,14 @@ module Redmine
           shellout(cmd) do |io|
             prefix = "#{url}/#{path}".gsub('\\', '/')
             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|
               next unless line =~ re
-              entries << Entry.new({:name => $2.strip,
-                                    :path => ((path.empty? ? "" : "#{path}/") + $2.strip),
-                                    :kind => ($3.blank? ? 'file' : 'dir'),
+              entries << Entry.new({:name => $3.strip,
+                                    :path => ((path.empty? ? "" : "#{path}/") + $3.strip),
+                                    :kind => ($4.blank? ? 'file' : 'dir'),
                                     :size => nil,
-                                    :lastrev => Revision.new(:revision => $4.strip)
+                                    :lastrev => Revision.new(:revision => $5.strip)
                                   })
             end
           end