[windows] bpo-27425: Be more explicit in .gitattributes #840

zware · 2017-03-27T05:35:23Z

This is largely a direct conversion of .hgeol, assuming I understand the rules of .gitattributes correctly. I also went through and made sure there were actually examples of each entry checked in.

A big difference here is that some of the test files (in test_email, xmltestdata, etc) are no longer marked as binary but rather just -text which should mean that they are not subject to EOL conversion, but git diff provides a nice text diff including line ending changes.

It also expands on .hgeol a bit, with a few more Windows-specific files marked as CRLF.

mention-bot · 2017-03-27T05:35:24Z

@zware, thanks for your PR! By analyzing the history of the files in this pull request, we identified @vsajip to be a potential reviewer.

serhiy-storchaka · 2017-03-27T07:13:52Z

.gitattributes

+Lib/test/coding20731.py -text
+
+# Third party code
+Modules/zlib/** -text


Why the text attribute is unset? Third party code shouldn't be edited, but it can be read as a text.

To avoid EOL conversion on code that's not ours. There's one file in particular in zlib that caused issues when @doko42 updated our copy of zlib before the GitHub migration; I'm frankly not sure why it's not causing issues currently.

This is not the only foreign code. libffi, libmpdec, blake2b, Keccak. The only file with non-LF line ending in zlib/ is zlib.map.

serhiy-storchaka · 2017-03-27T07:16:52Z

.gitattributes

+Modules/zlib/** -text
+Modules/expat/** -text
+
+# CRLF files


Shouldn't the text attribute be set if use the eol attribute?

tbh even if I use Windows I still perfer LF over CRLF for endlines. Although I use Notepad++, I would have liked if Windows notepad was to show files with LF line endings just like it would with files with CRLF. However it does not in Windows 7 all the way up to Windows 10 and it annoys me forcing me to use Notepad++ to begin with although with Notepad++ I also get syntax highlighting that Windows Notepad also does not have. Although even then I like LF more because it can safe a little bit more space than CRLF(\r\n) would.

Be nice if there was an Windows update for Windows 7 and newer that would patch Windows Notepad to allow proper and easily read files with LF as if it was in CRLF.

Anyways @zooba mind forwarding my Windows Notepad issues to the proper team to patch it on Windows 7 SP1 and newer for me please?

@serhiy-storchaka According to the gitattributes docs:

eol
This attribute sets a specific line-ending style to be used in the working directory. It enables end-of-line conversion without any content checks, effectively setting the text attribute.

@AraHaan This is not the place to discuss well-known issues with Notepad. It is also not the place to ask personal favors of anybody.

All examples in the gitattributes docs use eol only together with text.

serhiy-storchaka · 2017-03-27T07:19:08Z

Lib/venv/scripts/nt/activate.bat

+set "PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%"
+
+:END
+echo test


Is this the debugging artifact?

Apparently so, good catch!

serhiy-storchaka · 2017-03-27T07:23:13Z

.gitattributes

+
+# Text files that should not be subject to eol conversion
+Lib/test/cjkencodings/* -text
+Lib/test/decimaltestdata/*.decTest -text


They are text files.

As best I can tell, -text in .gitattributes just means "don't change the end-of-line character used in this file regardless of settings like core.autocrlf or core.eol". Editing the file and running git diff still results in a readable diff (preventing that is controlled by -diff, which is included in the binary macro).

*.decTest files are read in test_decimal.py as text files. No need to prevent changing the end-of-line character.

But they are imported from elsewhere, and it would be good to keep them the same as they were imported. @skrah may have an opinion on this.

Most of them are imported from http://speleotrove.com/decimal/dectest.html (dectest.zip).

I agree with Zachary.

Should they be converted to CRLF line ending as in decTest.zip?

Which ones? I just opened Lib/test/decimaltestdata/ddInvert.decTest and it's DOS as expected.

I just opened the first file abs.decTest and it has LF line ending.

Okay, then it would be reasonable to convert all files that are also in decTest.zip to CRLF.

Conversion of course not necessarily as part of this issue, unless someone has the patience to do that. ;)

serhiy-storchaka

LGTM, but I would prefer to add explicit text if eof= is used (official .gitattributes examples add it). And either remove zlib and expat or add other third party code directories.

Also updates checked-in line endings on some files

Also updates checked-in line endings on some files.

Also fixed a few more line endings that were missed in GH-840, which were causing failure.

…2080) (GH-2092) (cherry picked from commit 0afbabe) Also fixes some line endings missed in GH-840 backport.

…2080) (GH-2093) (cherry picked from commit 0afbabe) Also fixes some line endings missed in GH-840 backport.

Also updates checked-in line endings in several files.

the-knights-who-say-ni added the CLA signed label Mar 27, 2017

berkerpeksag approved these changes Mar 27, 2017

View reviewed changes

serhiy-storchaka reviewed Mar 27, 2017

View reviewed changes

vstinner mentioned this pull request Mar 27, 2017

[3.5][windows] bpo-27425: Add .gitattributes, fix Windows tests #844

Merged

vstinner added the OS-windows label Mar 27, 2017

vstinner changed the title ~~bpo-27425: Be more explicit in .gitattributes~~ [windows] bpo-27425: Be more explicit in .gitattributes Mar 27, 2017

serhiy-storchaka approved these changes Apr 2, 2017

View reviewed changes

zware added 2 commits June 4, 2017 14:16

Be more explicit in .gitattributes

d699c78

Use 'text' tag with 'eol=', don't bother with third-party stuff

74f2885

zware force-pushed the update_gitattributes branch from 7841d57 to c74bc40 Compare June 4, 2017 19:42

Commit line ending fixes

1e61282

zware force-pushed the update_gitattributes branch from c74bc40 to 1e61282 Compare June 4, 2017 19:50

Mariatta added needs backport to 2.7 labels Jun 9, 2017

zware merged commit 6b6e687 into python:master Jun 10, 2017

zware deleted the update_gitattributes branch June 10, 2017 19:58

This was referenced Jun 10, 2017

[3.6] bpo-27425: Be more explicit in .gitattributes #2083

Merged

[3.5] bpo-27425: Be more explicit in .gitattributes #2084

Merged

[2.7] bpo-27425: Be more explicit in .gitattributes #2086

Merged

zware added a commit that referenced this pull request Jun 10, 2017

[3.6] bpo-27425: Be more explicit in .gitattributes (GH-840) (GH-2083)

964c261

Also updates checked-in line endings on some files

zware added a commit that referenced this pull request Jun 10, 2017

[3.5] bpo-27425: Be more explicit in .gitattributes (GH-840) (GH-2084)

afa6a38

Also updates checked-in line endings on some files.

zware added a commit to zware/cpython that referenced this pull request Jun 11, 2017

Fix more line endings (pythonGH-840)

60cda64

zware added a commit to zware/cpython that referenced this pull request Jun 11, 2017

Fix more line endings (pythonGH-840)

c38c591

zware added a commit to zware/cpython that referenced this pull request Jun 11, 2017

Fix more line endings (pythonGH-840)

e657b76

zware added a commit that referenced this pull request Jun 11, 2017

Show what's changed when Travis fails regen check (GH-2095)

3f8f16d

Also fixed a few more line endings that were missed in GH-840, which were causing failure.

zware added a commit that referenced this pull request Jun 11, 2017

[3.6] Use Travis to make sure all generated files are up to date (GH-…

f57e34b

…2080) (GH-2092) (cherry picked from commit 0afbabe) Also fixes some line endings missed in GH-840 backport.

zware added a commit that referenced this pull request Jun 11, 2017

[3.5] Use Travis to make sure all generated files are up to date (GH-…

80bdbf6

…2080) (GH-2093) (cherry picked from commit 0afbabe) Also fixes some line endings missed in GH-840 backport.

zware added a commit that referenced this pull request Jun 11, 2017

[2.7] bpo-27425: Be more explicit in .gitattributes (GH-840) (GH-2086)

5fe8ac6

Also updates checked-in line endings in several files.

Mariatta removed needs backport to 2.7 labels Jun 17, 2017

Uh oh!

[windows] bpo-27425: Be more explicit in .gitattributes #840

[windows] bpo-27425: Be more explicit in .gitattributes #840

Uh oh!

Conversation

zware commented Mar 27, 2017

Uh oh!

mention-bot commented Mar 27, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

AraHaan Mar 27, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

serhiy-storchaka Mar 27, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

skrah Mar 27, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

serhiy-storchaka left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

AraHaan Mar 27, 2017 •

edited

Loading

serhiy-storchaka Mar 27, 2017 •

edited

Loading

skrah Mar 27, 2017 •

edited

Loading