Was: fix merge problem, which cause an OSX broken build check-in: 7885b601 user: jan.nijtmans tags: ticket-d17d6e5b17

It would be nice if fossil detects this situation, so the user has the choice to change the encoding to utf-8, or answer 'y' if this is intended.

Probably missing is a 'latin-glob', 'non-utf8-glob' (any ideas for a better name?) setting.

An improvement would be to allow the 'c' response, which aborts the commit but first converts it to utf-8 (assuming iso8859-1 on UNIX and cp1252 on win32)

Another thing this change does is warn if the file contains long lines which cannot be handled by fossil. The user is given the chance to break the long lines into shorter ones. This cannot be done automatically. Maybe add a "longlines-glob" setting as well.

Feedback welcome! check-in: 609ea54f user: mistachkin tags: improve_commit_warning

...</verbatim> with an options
"links" or "links=BOOLEAN" attribute.  Improved TH1 tracing and error
reporting capabilities.  Improved documentation on how reports work.

check-in: 23c75abd user: drh tags: ticket-enhancements

Functional complete and well-tested

Still experimental, but starts looking better

Should have a LOT more testing before merging it to trunk, because it is dangerous!

The method used is as described at:
http://cygwin.com/cygwin-ug-net/using-specialnames.html The only problematic characters left are ':' and '\', all other problematic characters are handled by translating them to characters in the range U+F000 to U+F0FF

Feedback welcome.

All div.logo, div.status, div.section and div.divider parts of the html pages are not supposed to be line-wrapped. Some skins do that though the <nobr> tag, other do it by putting "white-space: nowrap;" in css.

This commit changes the skins to do the same using css in all skins.

With this change, the "timeline" and "finfo" pages become 100% html5 complient: validator.w3.org doesn't show any errors any more (just 3 warnings)

Fix continuation-byte check for UTF-8 chars > 2 bytes.

simplify utf-8 continuation byte checking, using a loop in stead of separater 2/3/4-byte versions.

src/merge3.c: In function ‘merge_3way’:
src/merge3.c:445:9: warning: ‘zPivot’ may be used uninitialized in this function
src/merge3.c:446:9: warning: ‘zOrig’ may be used uninitialized in this function
src/merge3.c:447:9: warning: ‘zOther’ may be used uninitialized in this function

Don't try to convert binary files.

Factor out main part of UTF-8 check to macro

The earlier check for FEFF was not sensible: A BOM in the middle of an UTF-16 file could easily arise when two UTF-16LE or twe UTF-16BE files are concatenated. Nothing goes wrong in that case, the BOM should just be displayed a zero-width-space. Therefore, diff should not bail out.

let looks_like_text() give different values for UTF-16 BE/LE. Not used yet.