# HG changeset patch # User Bryan O'Sullivan # Date 1346798764 25200 # Node ID cb12d3ce56072c55ad011e806d781873dc2cfe61 # Parent 0cec762790ed34c469ce67b8ca8223545c57e148 subrepo: encode unicode path names (issue3610) Subversion 1.7 changes its XML output to include an explicit encoding tag: This triggers xml.dom.minidom to always return unicode strings, causing other parts of the code to explode. We unconditionally encode path names before handing them back, which works with both str (actually a no-op) and unicode values. diff -r 0cec762790ed -r cb12d3ce5607 mercurial/subrepo.py --- a/mercurial/subrepo.py Wed Aug 15 16:31:25 2012 -0700 +++ b/mercurial/subrepo.py Tue Sep 04 15:46:04 2012 -0700 @@ -838,7 +838,7 @@ name = ''.join(c.data for c in e.getElementsByTagName('name')[0].childNodes if c.nodeType == c.TEXT_NODE) - paths.append(name) + paths.append(name.encode('utf-8')) return paths def filedata(self, name):