##// END OF EJS Templates
Merged r4633 from trunk....
Toshi MARUYAMA -
r4519:9f7cc355ada6
parent child
Show More
@@ -3,10 +3,10 changeset_quiet = 'This template must be used with --debug option\n'
3 3 changeset_verbose = 'This template must be used with --debug option\n'
4 4 changeset_debug = '<logentry revision="{rev}" node="{node|short}">\n<author>{author|escape}</author>\n<date>{date|isodate}</date>\n<paths>\n{files}{file_adds}{file_dels}{file_copies}</paths>\n<msg>{desc|escape}</msg>\n{tags}</logentry>\n\n'
5 5
6 file = '<path action="M">{file|escape}</path>\n'
7 file_add = '<path action="A">{file_add|escape}</path>\n'
8 file_del = '<path action="D">{file_del|escape}</path>\n'
9 file_copy = '<path-copied copyfrom-path="{source|escape}">{name|urlescape}</path-copied>\n'
6 file = '<path action="M">{file|urlescape}</path>\n'
7 file_add = '<path action="A">{file_add|urlescape}</path>\n'
8 file_del = '<path action="D">{file_del|urlescape}</path>\n'
9 file_copy = '<path-copied copyfrom-path="{source|urlescape}">{name|urlescape}</path-copied>\n'
10 10 tag = '<tag>{tag|escape}</tag>\n'
11 11 header='<?xml version="1.0" encoding="UTF-8" ?>\n<log>\n\n'
12 12 # footer="</log>" No newline at end of file
@@ -3,10 +3,10 changeset_quiet = 'This template must be used with --debug option\n'
3 3 changeset_verbose = 'This template must be used with --debug option\n'
4 4 changeset_debug = '<logentry revision="{rev}" node="{node|short}">\n<author>{author|escape}</author>\n<date>{date|isodatesec}</date>\n<paths>\n{file_mods}{file_adds}{file_dels}{file_copies}</paths>\n<msg>{desc|escape}</msg>\n{tags}</logentry>\n\n'
5 5
6 file_mod = '<path action="M">{file_mod|escape}</path>\n'
7 file_add = '<path action="A">{file_add|escape}</path>\n'
8 file_del = '<path action="D">{file_del|escape}</path>\n'
9 file_copy = '<path-copied copyfrom-path="{source|escape}">{name|urlescape}</path-copied>\n'
6 file_mod = '<path action="M">{file_mod|urlescape}</path>\n'
7 file_add = '<path action="A">{file_add|urlescape}</path>\n'
8 file_del = '<path action="D">{file_del|urlescape}</path>\n'
9 file_copy = '<path-copied copyfrom-path="{source|urlescape}">{name|urlescape}</path-copied>\n'
10 10 tag = '<tag>{tag|escape}</tag>\n'
11 11 header='<?xml version="1.0" encoding="UTF-8" ?>\n<log>\n\n'
12 12 # footer="</log>"
@@ -16,6 +16,7
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require 'redmine/scm/adapters/abstract_adapter'
19 require 'cgi'
19 20
20 21 module Redmine
21 22 module Scm
@@ -127,8 +128,8 module Redmine
127 128 from_rev = logentry.attributes['revision']
128 129 end
129 130 paths << {:action => path.attributes['action'],
130 :path => "/#{path.text}",
131 :from_path => from_path ? "/#{from_path}" : nil,
131 :path => "/#{CGI.unescape(path.text)}",
132 :from_path => from_path ? "/#{CGI.unescape(from_path)}" : nil,
132 133 :from_revision => from_rev ? from_rev : nil
133 134 }
134 135 end
General Comments 0
You need to be logged in to leave comments. Login now