STORM-826 (partial): fix line endings in files that use a mix of CRLF and LF
Review Request #70 - Created Jan. 5, 2011 and submitted
| Oz Linden | Reviewers | ||
| viewer | |||
| storm-826 | |||
| None | viewer-development | ||
This is a simple change to correct existing line endings - I scanned all of viewer-development to identify files that had a mixture of CRLF and LF endings and converted them to just LF. The diff apparently won't show the change in line ending characters.... see the repo (in the issue) for the real change. I expanded the scope of this to also convert some files that were all the same CRLF endings but did not obviously need to be. I left files that were clearly windows specific alone on the theory that non-windows users probably won't need to touch them, and the windows tools might care.
Expand AllPosted (Jan. 6, 2011, 4:01 a.m.)
"View Diff" doesn't display anything and with "Download Diff", I get a patch file that doesn't change anything: It removes some lines and adds back the exact same lines, with the same line endings (just LF). The surrounding lines (in the diff context) seem also to be LF-ended, even though one of the actual original files (indra/newview/llfloaterwebcontent.h) has CRLF endings, except for the line touched by the patch. I don't know how much of these are review-board and/or diffing issues. Please point us to a hg changeset so we can review the actual change.
Posted (Jan. 6, 2011, 6:48 a.m.)
You missed indra/newview/llfloaterwebcontent.cpp Also, why not fix the only .xml with carriage returns in it: indra/newview/skins/default/xui/en/floater_web_content.xml Configuration files with carriage returns: indra/cmake/GetPrerequisites_2_8.cmake indra/cmake/LLAddBuildTest.cmake
Review request changed
Updated (Jan. 6, 2011, 10:20 a.m.)
-
- added Diff r2
-
This is a simple change to correct existing line endings - I scanned all of viewer-development to identify files that had a mixture of CRLF and LF endings and converted them to just LF. What to do about preventing future such will be dealt with separately...
This is a simple change to correct existing line endings - I scanned all of viewer-development to identify files that had a mixture of CRLF and LF endings and converted them to just LF. The diff apparently won't show the change in line ending characters.... see the repo (in the issue) for the real change. I expanded the scope of this to also convert some files that were all the same CRLF endings but did not obviously need to be. I left files that were clearly windows specific alone on the theory that non-windows users probably won't need to touch them, and the windows tools might care.
Should be ok, I see no diff on the review board at all :p I didn't actually apply the diff and check if all carriage returns are gone now, but I don't think that's the idea of the review board, is it?
Posted (Jan. 7, 2011, 8:01 a.m.)
Still CRLFs in indra/newview/skins/default/xui/en/floater_web_content.xml , which isn't windows specific, I think. Otherwise https://bitbucket.org/oz_linden/storm-826/changeset/6e6d1de23cce looks good. I'm wondering whether we should also fix indentation on lines that are touched by this change anyway. (E.g. floater_web_content.xml mixes spaces and tabs.)
Other reviews