| @@ -30,7 +30,7 module Redmine | |||
|
|
30 | 30 | cmd = "#{BZR_BIN} revno #{target('')}" |
|
|
31 | 31 | info = nil |
|
|
32 | 32 | shellout(cmd) do |io| |
|
|
33 | if io.read =~ %r{^(\d+)$} | |
|
|
33 | if io.read =~ %r{^(\d+)\r?$} | |
|
|
34 | 34 | info = Info.new({:root_url => url, |
|
|
35 | 35 | :lastrev => Revision.new({ |
|
|
36 | 36 | :identifier => $1 |
| @@ -56,7 +56,7 module Redmine | |||
|
|
56 | 56 | shellout(cmd) do |io| |
|
|
57 | 57 | prefix = "#{url}/#{path}".gsub('\\', '/') |
|
|
58 | 58 | logger.debug "PREFIX: #{prefix}" |
|
|
59 | re = %r{^V\s+(#{Regexp.escape(prefix)})?(\/?)([^\/]+)(\/?)\s+(\S+)$} | |
|
|
59 | re = %r{^V\s+(#{Regexp.escape(prefix)})?(\/?)([^\/]+)(\/?)\s+(\S+)\r?$} | |
|
|
60 | 60 | io.each_line do |line| |
|
|
61 | 61 | next unless line =~ re |
|
|
62 | 62 | entries << Entry.new({:name => $3.strip, |
General Comments 0
You need to be logged in to leave comments.
Login now