Author: stsp
Date: Sat Jun 11 10:33:17 2011
New Revision: 1134564
URL: http://svn.apache.org/viewvc?rev=1134564&view=rev
Log:
Make the svn command line client print encoding information in XML output.
* subversion/svn/util.c
(svn_cl__xml_print_header): XML output is always encoded in UTF-8, so
make sure we mention that in the XML document header.
* subversion/tests/cmdline/stat_tests.py
(status_in_xml, status_update_with_incoming_props): Adjust expected output.
* subversion/tests/cmdline/blame_tests.py
(blame_in_xml): Adjust expected output.
Modified:
subversion/trunk/subversion/svn/util.c
subversion/trunk/subversion/tests/cmdline/blame_tests.py
subversion/trunk/subversion/tests/cmdline/stat_tests.py
Modified: subversion/trunk/subversion/svn/util.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/util.c?rev=1134564&r1=1134563&r2=1134564&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/util.c (original)
+++ subversion/trunk/subversion/svn/util.c Sat Jun 11 10:33:17 2011
@@ -1049,8 +1049,8 @@ svn_cl__xml_print_header(const char *tag
{
svn_stringbuf_t *sb = svn_stringbuf_create("", pool);
- /* <?xml version="1.0"?> */
- svn_xml_make_header(&sb, pool);
+ /* <?xml version="1.0" encoding="UTF-8"?> */
+ svn_xml_make_header2(&sb, "UTF-8", pool);
/* "<TAGNAME>" */
svn_xml_make_open_tag(&sb, pool, svn_xml_normal, tagname, NULL);
Modified: subversion/trunk/subversion/tests/cmdline/blame_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/blame_tests.py?rev=1134564&r1=1134563&r2=1134564&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/blame_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/blame_tests.py Sat Jun 11
10:33:17 2011
@@ -217,7 +217,7 @@ def blame_in_xml(sbox):
else:
raise svntest.Failure
- template = ['<?xml version="1.0"?>\n',
+ template = ['<?xml version="1.0" encoding="UTF-8"?>\n',
'<blame>\n',
'<target\n',
' path="' + file_path + '">\n',
Modified: subversion/trunk/subversion/tests/cmdline/stat_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/stat_tests.py?rev=1134564&r1=1134563&r2=1134564&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/stat_tests.py Sat Jun 11 10:33:17
2011
@@ -917,7 +917,7 @@ def status_in_xml(sbox):
else:
raise svntest.Failure
- template = ["<?xml version=\"1.0\"?>\n",
+ template = ['<?xml version="1.0" encoding="UTF-8"?>\n',
"<status>\n",
"<target\n",
" path=\"%s\">\n" % (file_path),
@@ -1224,7 +1224,7 @@ def status_update_with_incoming_props(sb
else:
raise svntest.Failure
- xout = ["<?xml version=\"1.0\"?>\n",
+ xout = ['<?xml version="1.0" encoding="UTF-8"?>\n',
"<status>\n",
"<target\n",
" path=\"%s\">\n" % (wc_dir),
