diff --git a/.gitattributes b/.gitattributes index fc02336b23..5e9c93734f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,3 +4,4 @@ tests/input/** -text tests/**/data/** -text tests/regrtest_data/** -text doc/data/messages/u/unexpected-line-ending-format/bad.py -text +doc/data/messages/m/mixed-line-endings/bad.py -text diff --git a/doc/data/messages/m/mixed-line-endings/bad.py b/doc/data/messages/m/mixed-line-endings/bad.py new file mode 100644 index 0000000000..5e6138dd11 --- /dev/null +++ b/doc/data/messages/m/mixed-line-endings/bad.py @@ -0,0 +1,2 @@ +print("Hello") # CRLF (\r\n) +print("World") # LF (\n) # [mixed-line-endings] diff --git a/doc/data/messages/m/mixed-line-endings/details.rst b/doc/data/messages/m/mixed-line-endings/details.rst deleted file mode 100644 index c1e9b976ac..0000000000 --- a/doc/data/messages/m/mixed-line-endings/details.rst +++ /dev/null @@ -1 +0,0 @@ -You can help us make the doc better `by contributing `_ ! diff --git a/doc/data/messages/m/mixed-line-endings/good.py b/doc/data/messages/m/mixed-line-endings/good.py deleted file mode 100644 index c40beb573f..0000000000 --- a/doc/data/messages/m/mixed-line-endings/good.py +++ /dev/null @@ -1 +0,0 @@ -# This is a placeholder for correct code for this message. diff --git a/doc/data/messages/m/mixed-line-endings/good/full_crlf.py b/doc/data/messages/m/mixed-line-endings/good/full_crlf.py new file mode 100644 index 0000000000..9ddeddf53d --- /dev/null +++ b/doc/data/messages/m/mixed-line-endings/good/full_crlf.py @@ -0,0 +1,2 @@ +print("Hello") # CRLF (\r\n) +print("World") # CRLF (\r\n) diff --git a/doc/data/messages/m/mixed-line-endings/good/full_lf.py b/doc/data/messages/m/mixed-line-endings/good/full_lf.py new file mode 100644 index 0000000000..05a33d48f8 --- /dev/null +++ b/doc/data/messages/m/mixed-line-endings/good/full_lf.py @@ -0,0 +1,2 @@ +print("Hello") # LF (\n) +print("World") # LF (\n) diff --git a/doc/data/messages/m/mixed-line-endings/related.rst b/doc/data/messages/m/mixed-line-endings/related.rst new file mode 100644 index 0000000000..53035f5214 --- /dev/null +++ b/doc/data/messages/m/mixed-line-endings/related.rst @@ -0,0 +1,3 @@ +- `History of CRLF and LF `_ +- `Dealing with line endings in Git `_ +- `A Collection of Useful .gitattributes Templates `_ diff --git a/doc/data/messages/u/unexpected-line-ending-format/bad.py b/doc/data/messages/u/unexpected-line-ending-format/bad.py index d8420e73c9..2d94b08137 100644 --- a/doc/data/messages/u/unexpected-line-ending-format/bad.py +++ b/doc/data/messages/u/unexpected-line-ending-format/bad.py @@ -1,2 +1,2 @@ -print("Sometimes I drink soda.") # CRLF # [unexpected-line-ending-format] -print("Sometimes I drink sulfuric acid.") # CRLF # [unexpected-line-ending-format] +print("I'm drinking tea!") # CRLF (\r\n) # [unexpected-line-ending-format] +print("I'm drinking water!") # CRLF (\r\n) # [unexpected-line-ending-format] diff --git a/doc/data/messages/u/unexpected-line-ending-format/good.py b/doc/data/messages/u/unexpected-line-ending-format/good.py index 37f46cfc47..68b26fe3a6 100644 --- a/doc/data/messages/u/unexpected-line-ending-format/good.py +++ b/doc/data/messages/u/unexpected-line-ending-format/good.py @@ -1,2 +1,2 @@ -print("I'm drinking tea!") # LF -print("I'm drinking water!") # LF +print("I'm drinking tea!") # LF (\n) +print("I'm drinking water!") # LF (\n)