Bug 187571 – UTF-16 XHTML files need svn:mime-type to be handled correctly by Windows SVN

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Ross Kirsling]

UTF-16 XHTML files need svn:mime-type to be handled correctly by Windows SVN

[Ross Kirsling]

Created attachment 344794 [details]
Patch

[Ross Kirsling]

Created attachment 344797 [details]
Patch (manual)

[Ross Kirsling]

What's currently happening is that when Windows SVN turns upstream LFs into local CRLFs, it's not realizing that the files are UTF-16 and so it turns 00 0A into the invalid sequence 00 0D 0A instead of the correct 00 0D 00 0A.

This does not occur for dom/xhtml/level3/core/documentgetxmlencoding03.xhtml, which already has svn:mime-type set to text/xml, therefore adding this property to the other three files should rectify the issue.

[Ross Kirsling]

Created attachment 344799 [details]
Patch (manual)

[Ross Kirsling]

Wow. This isn't submittable via webkit-patch so I'm having to manually upload an `svn diff`, but it seems the patch won't apply purely because the revision number keeps changing upstream?

It may be necessary to land this manually.

[Fujii Hironori]

I think you shold remove 'svn:eol-style' property.
http://svnbook.red-bean.com/en/1.7/svn.advanced.props.file-portability.html#svn.advanced.props.special.eol-style

There is one more UTF-16 file, external_foo.ent. Do you need to change this, too?

> $ svn pl -v http://svn.webkit.org/repository/webkit/trunk/LayoutTests/dom/xhtml/level3/core/{documentgetinputencoding03.xhtml,documentgetxmlencoding03.xhtml,entitygetinputencoding02.xhtml,entitygetxmlversion02.xhtml,external_foo.ent}
> 'http://svn.webkit.org/repository/webkit/trunk/LayoutTests/dom/xhtml/level3/core/documentgetinputencoding03.xhtml' の属性:
>   svn:eol-style
>     native
> 'http://svn.webkit.org/repository/webkit/trunk/LayoutTests/dom/xhtml/level3/core/documentgetxmlencoding03.xhtml' の属性:
>   svn:mime-type
>     text/xml
> 'http://svn.webkit.org/repository/webkit/trunk/LayoutTests/dom/xhtml/level3/core/entitygetinputencoding02.xhtml' の属性:
>   svn:eol-style
>     native
> 'http://svn.webkit.org/repository/webkit/trunk/LayoutTests/dom/xhtml/level3/core/entitygetxmlversion02.xhtml' の属性:
>   svn:eol-style
>     native
> 'http://svn.webkit.org/repository/webkit/trunk/LayoutTests/dom/xhtml/level3/core/external_foo.ent' の属性:
>   svn:eol-style
>     native

[Ross Kirsling]

(In reply to Fujii Hironori from comment #6)
> I think you shold remove 'svn:eol-style' property.
> http://svnbook.red-bean.com/en/1.7/svn.advanced.props.file-portability.
> html#svn.advanced.props.special.eol-style

I believe this shouldn't matter, as it seems that 00 0D will be inserted on Windows either way, but I can do so for consistency.

> There is one more UTF-16 file, external_foo.ent. Do you need to change this,
> too?

Interesting! Looks like that one's not having problems because it doesn't contain a newline, but it too could be updated for consistency.

[Ross Kirsling]

Created attachment 344815 [details]
Patch (manual)

[Ross Kirsling]

At any rate, the attached file can be `svn patch`ed locally without issue.

[Fujii Hironori]

(In reply to Ross Kirsling from comment #7)
> (In reply to Fujii Hironori from comment #6)
> > I think you shold remove 'svn:eol-style' property.
> > http://svnbook.red-bean.com/en/1.7/svn.advanced.props.file-portability.
> > html#svn.advanced.props.special.eol-style
> 
> I believe this shouldn't matter, as it seems that 00 0D will be inserted on
> Windows either way, but I can do so for consistency.

For example,
http://svn.webkit.org/repository/webkit/trunk/LayoutTests/fast/css/visited-link-hang-expected.txt
has only svn:eol-style:native, but no svn:mime-type.
If this file is checked out by using Windows SVN, it will be converted to CR-LF style.

[Alex Christensen]

Comment on attachment 344815 [details]
Patch (manual)

r=me
You'll probably need to manually commit this with svn commit.

[Ross Kirsling]

Committed r233776: <https://trac.webkit.org/changeset/233776>

[Radar WebKit Bug Importer]

<rdar://problem/42131850>

[WebKit Commit Bot]

Re-opened since this is blocked by bug 187614

[Ross Kirsling]

ChangeLog ended up in r233776, propsets in r233779:
https://trac.webkit.org/changeset/233779/webkit

Sorry for the ruckus.