Patch #236 ยป patch.txt
| 1 |
Index: lib/redmine/scm/adapters/cvs_adapter.rb |
|---|---|
| 2 |
=================================================================== |
| 3 |
--- lib/redmine/scm/adapters/cvs_adapter.rb (revision 559) |
| 4 |
+++ lib/redmine/scm/adapters/cvs_adapter.rb (working copy) |
| 5 |
@@ -142,7 +142,7 @@ |
| 6 |
|
| 7 |
if state=="entry_start" |
| 8 |
branch_map=Hash.new |
| 9 |
- if /^RCS file: #{Regexp.escape(root_url)}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line
|
| 10 |
+ if /^RCS file: #{Regexp.escape(root_url.slice(root_url.index('/')..-1))}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line
|
| 11 |
entry_path = normalize_cvs_path($1) |
| 12 |
entry_name = normalize_path(File.basename($1)) |
| 13 |
logger.debug("Path #{entry_path} <=> Name #{entry_name}")
|
| 14 |
@@ -188,7 +188,7 @@ |
| 15 |
yield Revision.new({
|
| 16 |
:time => date, |
| 17 |
:author => author, |
| 18 |
- :message=>commit_log.chomp, |
| 19 |
+ :message=> Iconv.new('UTF-8',Setting.repositories_encodings).iconv(commit_log.chomp),
|
| 20 |
:paths => [{
|
| 21 |
:revision => revision, |
| 22 |
:branch=> revBranch, |