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

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
332d88cd · Jean-Philippe Lang · 6511e942 · 332d88cd
Commit 332d88cd authored Mar 06, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

bazaar_adapter.rb lib/redmine/scm/adapters/bazaar_adapter.rb +5 -5

No files found.
--- 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