scm: mercurial: wrap revison, tag and branch with URL encoding for entries (#4455, #1981, #7246).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4989 e93f8b46-1217-0410-a6f0-8f06a7374b81

scm: mercurial: wrap revison, tag and branch with URL encoding for entries (#4455, #1981, #7246).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4989 e93f8b46-1217-0410-a6f0-8f06a7374b81
b00caa6e · Toshi MARUYAMA · Eric Davis · ce16f4a2 · b00caa6e · b00caa6e
Commit b00caa6e authored Mar 02, 2011 by Toshi MARUYAMA Committed by Eric Davis Apr 16, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

redminehelper.py lib/redmine/scm/adapters/mercurial/redminehelper.py +1 -1

mercurial_adapter.rb lib/redmine/scm/adapters/mercurial_adapter.rb +1 -1

No files found.
--- a/lib/redmine/scm/adapters/mercurial/redminehelper.py
+++ b/lib/redmine/scm/adapters/mercurial/redminehelper.py
@@ -140,7 +140,7 @@ def rhmanifest(ui, repo, path='', **opts):
    ui.write('<rhmanifest>\n')
    ui.write('<repository root="%s">\n' % _u(repo.root))
    try:
-        _manifest(ui, repo, urllib.unquote_plus(path), opts.get('rev'))
+        _manifest(ui, repo, urllib.unquote_plus(path), urllib.unquote_plus(opts.get('rev')))
    finally:
        ui.write('</repository>\n')
        ui.write('</rhmanifest>\n')

--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -130,7 +130,7 @@ module Redmine

        def entries(path=nil, identifier=nil)
          p1 = scm_iconv(@path_encoding, 'UTF-8', path)
-          manifest = hg('rhmanifest', '-r', hgrev(identifier),
+          manifest = hg('rhmanifest', '-r', CGI.escape(hgrev(identifier)),
                        CGI.escape(without_leading_slash(p1.to_s))) do |io|
            begin
              ActiveSupport::XmlMini.parse(io.read)['rhmanifest']['repository']['manifest']