From e2f1b8f047bc4a658bf2a1f6a2e8e0cc49d9331e Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Thu, 20 Jan 2022 21:51:35 +0100 Subject: [PATCH 01/10] Mark generated files with 'diff=generated' attribute --- .gitattributes | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.gitattributes b/.gitattributes index 05b0420714e1bf..da85a476b22a54 100644 --- a/.gitattributes +++ b/.gitattributes @@ -40,24 +40,6 @@ Lib/test/test_importlib/namespacedata01/* -text PCbuild/readme.txt text eol=crlf PC/readme.txt text eol=crlf -# Generated files -# https://github.com/github/linguist/blob/master/docs/overrides.md -**/clinic/*.h linguist-generated=true -Python/deepfreeze/*.c linguist-generated=true -Python/frozen_modules/*.h linguist-generated=true -Python/frozen_modules/MANIFEST linguist-generated=true -Include/internal/pycore_ast.h linguist-generated=true -Python/Python-ast.c linguist-generated=true -Include/opcode.h linguist-generated=true -Python/opcode_targets.h linguist-generated=true -Objects/typeslots.inc linguist-generated=true -*_db.h linguist-generated=true -Doc/library/token-list.inc linguist-generated=true -Include/token.h linguist-generated=true -Lib/token.py linguist-generated=true -Parser/token.c linguist-generated=true -Programs/test_frozenmain.h linguist-generated=true - # Language aware diff headers # https://tekin.co.uk/2020/10/better-git-diff-output-for-ruby-python-elixir-and-more # https://gist.github.com/tekin/12500956bd56784728e490d8cef9cb81 @@ -67,3 +49,21 @@ Programs/test_frozenmain.h linguist-generated=true *.html diff=html *.py diff=python *.md diff=markdown + +# Generated files +# https://github.com/github/linguist/blob/master/docs/overrides.md +**/clinic/*.h linguist-generated=true diff=generated +Python/deepfreeze/*.c linguist-generated=true diff=generated +Python/frozen_modules/*.h linguist-generated=true diff=generated +Python/frozen_modules/MANIFEST linguist-generated=true diff=generated +Include/internal/pycore_ast.h linguist-generated=true diff=generated +Python/Python-ast.c linguist-generated=true diff=generated +Include/opcode.h linguist-generated=true diff=generated +Python/opcode_targets.h linguist-generated=true diff=generated +Objects/typeslots.inc linguist-generated=true diff=generated +*_db.h linguist-generated=true diff=generated +Doc/library/token-list.inc linguist-generated=true diff=generated +Include/token.h linguist-generated=true diff=generated +Lib/token.py linguist-generated=true diff=generated +Parser/token.c linguist-generated=true diff=generated +Programs/test_frozenmain.h linguist-generated=true diff=generated From 4d07692e2b5bec0c76377b427966f43a585594e9 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 21 Jan 2022 13:45:09 +0100 Subject: [PATCH 02/10] Sort --- .gitattributes | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitattributes b/.gitattributes index da85a476b22a54..84e76c54da4e3f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -53,17 +53,17 @@ PC/readme.txt text eol=crlf # Generated files # https://github.com/github/linguist/blob/master/docs/overrides.md **/clinic/*.h linguist-generated=true diff=generated -Python/deepfreeze/*.c linguist-generated=true diff=generated -Python/frozen_modules/*.h linguist-generated=true diff=generated -Python/frozen_modules/MANIFEST linguist-generated=true diff=generated -Include/internal/pycore_ast.h linguist-generated=true diff=generated -Python/Python-ast.c linguist-generated=true diff=generated -Include/opcode.h linguist-generated=true diff=generated -Python/opcode_targets.h linguist-generated=true diff=generated -Objects/typeslots.inc linguist-generated=true diff=generated *_db.h linguist-generated=true diff=generated Doc/library/token-list.inc linguist-generated=true diff=generated +Include/internal/pycore_ast.h linguist-generated=true diff=generated +Include/opcode.h linguist-generated=true diff=generated Include/token.h linguist-generated=true diff=generated Lib/token.py linguist-generated=true diff=generated +Objects/typeslots.inc linguist-generated=true diff=generated Parser/token.c linguist-generated=true diff=generated Programs/test_frozenmain.h linguist-generated=true diff=generated +Python/Python-ast.c linguist-generated=true diff=generated +Python/deepfreeze/*.c linguist-generated=true diff=generated +Python/frozen_modules/*.h linguist-generated=true diff=generated +Python/frozen_modules/MANIFEST linguist-generated=true diff=generated +Python/opcode_targets.h linguist-generated=true diff=generated From 10221876af5677deb81b04f29877c9c73701f8d8 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 21 Jan 2022 13:49:48 +0100 Subject: [PATCH 03/10] Add missing Modules/config.c --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 84e76c54da4e3f..2f7eed89154bf6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -59,6 +59,7 @@ Include/internal/pycore_ast.h linguist-generated=true diff=generated Include/opcode.h linguist-generated=true diff=generated Include/token.h linguist-generated=true diff=generated Lib/token.py linguist-generated=true diff=generated +Modules/config.c linguist-generated=true diff=generated Objects/typeslots.inc linguist-generated=true diff=generated Parser/token.c linguist-generated=true diff=generated Programs/test_frozenmain.h linguist-generated=true diff=generated From e81edae8261f19821681dc1222524098c23b8615 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 21 Jan 2022 14:00:04 +0100 Subject: [PATCH 04/10] Add missing generated files: + Include/internal/pycore_ast_state.h + Lib/keyword.py + Parser/parser.c + Python/Python-ast.c + Python/stdlib_module_names.h + Tools/peg_generator/pegen/grammar_parser.py --- .gitattributes | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/.gitattributes b/.gitattributes index 2f7eed89154bf6..ef35d4e813eee8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -52,19 +52,25 @@ PC/readme.txt text eol=crlf # Generated files # https://github.com/github/linguist/blob/master/docs/overrides.md -**/clinic/*.h linguist-generated=true diff=generated -*_db.h linguist-generated=true diff=generated -Doc/library/token-list.inc linguist-generated=true diff=generated -Include/internal/pycore_ast.h linguist-generated=true diff=generated -Include/opcode.h linguist-generated=true diff=generated -Include/token.h linguist-generated=true diff=generated -Lib/token.py linguist-generated=true diff=generated -Modules/config.c linguist-generated=true diff=generated -Objects/typeslots.inc linguist-generated=true diff=generated -Parser/token.c linguist-generated=true diff=generated -Programs/test_frozenmain.h linguist-generated=true diff=generated -Python/Python-ast.c linguist-generated=true diff=generated -Python/deepfreeze/*.c linguist-generated=true diff=generated -Python/frozen_modules/*.h linguist-generated=true diff=generated -Python/frozen_modules/MANIFEST linguist-generated=true diff=generated -Python/opcode_targets.h linguist-generated=true diff=generated +**/clinic/*.h linguist-generated=true diff=generated +*_db.h linguist-generated=true diff=generated +Doc/library/token-list.inc linguist-generated=true diff=generated +Include/internal/pycore_ast.h linguist-generated=true diff=generated +Include/internal/pycore_ast_state.h linguist-generated=true diff=generated +Include/opcode.h linguist-generated=true diff=generated +Include/token.h linguist-generated=true diff=generated +Lib/keyword.py linguist-generated=true diff=generated +Lib/token.py linguist-generated=true diff=generated +Modules/config.c linguist-generated=true diff=generated +Objects/typeslots.inc linguist-generated=true diff=generated +Parser/parser.c linguist-generated=true diff=generated +Parser/token.c linguist-generated=true diff=generated +Programs/test_frozenmain.h linguist-generated=true diff=generated +Python/Python-ast.c linguist-generated=true diff=generated +Python/Python-ast.c linguist-generated=true diff=generated +Python/deepfreeze/*.c linguist-generated=true diff=generated +Python/frozen_modules/*.h linguist-generated=true diff=generated +Python/frozen_modules/MANIFEST linguist-generated=true diff=generated +Python/opcode_targets.h linguist-generated=true diff=generated +Python/stdlib_module_names.h linguist-generated=true diff=generated +Tools/peg_generator/pegen/grammar_parser.py linguist-generated=true diff=generated From 246ba2d7694f305cc14333700e2830897f722731 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 21 Jan 2022 14:04:08 +0100 Subject: [PATCH 05/10] Remove duplicate entry --- .gitattributes | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index ef35d4e813eee8..54214059605997 100644 --- a/.gitattributes +++ b/.gitattributes @@ -67,7 +67,6 @@ Parser/parser.c linguist-generated=true diff=generated Parser/token.c linguist-generated=true diff=generated Programs/test_frozenmain.h linguist-generated=true diff=generated Python/Python-ast.c linguist-generated=true diff=generated -Python/Python-ast.c linguist-generated=true diff=generated Python/deepfreeze/*.c linguist-generated=true diff=generated Python/frozen_modules/*.h linguist-generated=true diff=generated Python/frozen_modules/MANIFEST linguist-generated=true diff=generated From cde22e6ca45ad68aaaf29b9adfcfdf6989774e20 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 21 Jan 2022 14:06:24 +0100 Subject: [PATCH 06/10] Document git diff trick --- .gitattributes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitattributes b/.gitattributes index 54214059605997..e034cb5b6ea2ba 100644 --- a/.gitattributes +++ b/.gitattributes @@ -52,6 +52,10 @@ PC/readme.txt text eol=crlf # Generated files # https://github.com/github/linguist/blob/master/docs/overrides.md +# +# To automatically hide generated files in local diffs, mark them as binary: +# $ git config diff.generated.binary true +# **/clinic/*.h linguist-generated=true diff=generated *_db.h linguist-generated=true diff=generated Doc/library/token-list.inc linguist-generated=true diff=generated From 7f240e4ac6c33a261dce6dcfed7b57ac802ac237 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 21 Jan 2022 14:17:16 +0100 Subject: [PATCH 07/10] Reword comment --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index e034cb5b6ea2ba..654d69c2674586 100644 --- a/.gitattributes +++ b/.gitattributes @@ -53,7 +53,7 @@ PC/readme.txt text eol=crlf # Generated files # https://github.com/github/linguist/blob/master/docs/overrides.md # -# To automatically hide generated files in local diffs, mark them as binary: +# To always hide generated files in local diffs, mark them as binary: # $ git config diff.generated.binary true # **/clinic/*.h linguist-generated=true diff=generated From 6ab18ef1e1cfc990a0241fd8e327407aa54c4614 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 21 Jan 2022 14:24:48 +0100 Subject: [PATCH 08/10] Add missing configure and aclocal.m4 --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitattributes b/.gitattributes index 654d69c2674586..ae7cd26dbe6958 100644 --- a/.gitattributes +++ b/.gitattributes @@ -77,3 +77,5 @@ Python/frozen_modules/MANIFEST linguist-generated=true diff=generated Python/opcode_targets.h linguist-generated=true diff=generated Python/stdlib_module_names.h linguist-generated=true diff=generated Tools/peg_generator/pegen/grammar_parser.py linguist-generated=true diff=generated +aclocal.m4 linguist-generated=true diff=generated +configure linguist-generated=true diff=generated From 8cf48898d6c22c1c6b289cf4294caffe08de207b Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 21 Jan 2022 20:25:09 +0100 Subject: [PATCH 09/10] Use attr macro --- .gitattributes | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/.gitattributes b/.gitattributes index ae7cd26dbe6958..9d27984653b204 100644 --- a/.gitattributes +++ b/.gitattributes @@ -56,26 +56,28 @@ PC/readme.txt text eol=crlf # To always hide generated files in local diffs, mark them as binary: # $ git config diff.generated.binary true # -**/clinic/*.h linguist-generated=true diff=generated -*_db.h linguist-generated=true diff=generated -Doc/library/token-list.inc linguist-generated=true diff=generated -Include/internal/pycore_ast.h linguist-generated=true diff=generated -Include/internal/pycore_ast_state.h linguist-generated=true diff=generated -Include/opcode.h linguist-generated=true diff=generated -Include/token.h linguist-generated=true diff=generated -Lib/keyword.py linguist-generated=true diff=generated -Lib/token.py linguist-generated=true diff=generated -Modules/config.c linguist-generated=true diff=generated -Objects/typeslots.inc linguist-generated=true diff=generated -Parser/parser.c linguist-generated=true diff=generated -Parser/token.c linguist-generated=true diff=generated -Programs/test_frozenmain.h linguist-generated=true diff=generated -Python/Python-ast.c linguist-generated=true diff=generated -Python/deepfreeze/*.c linguist-generated=true diff=generated -Python/frozen_modules/*.h linguist-generated=true diff=generated -Python/frozen_modules/MANIFEST linguist-generated=true diff=generated -Python/opcode_targets.h linguist-generated=true diff=generated -Python/stdlib_module_names.h linguist-generated=true diff=generated -Tools/peg_generator/pegen/grammar_parser.py linguist-generated=true diff=generated -aclocal.m4 linguist-generated=true diff=generated -configure linguist-generated=true diff=generated +[attr]generated linguist-generated=true diff=generated + +**/clinic/*.c.h generated +*_db.h generated +Doc/library/token-list.inc generated +Include/internal/pycore_ast.h generated +Include/internal/pycore_ast_state.h generated +Include/opcode.h generated +Include/token.h generated +Lib/keyword.py generated +Lib/token.py generated +Modules/config.c generated +Objects/typeslots.inc generated +Parser/parser.c generated +Parser/token.c generated +Programs/test_frozenmain.h generated +Python/Python-ast.c generated +Python/deepfreeze/*.c generated +Python/frozen_modules/*.h generated +Python/frozen_modules/MANIFEST generated +Python/opcode_targets.h generated +Python/stdlib_module_names.h generated +Tools/peg_generator/pegen/grammar_parser.py generated +aclocal.m4 generated +configure generated From b2054c808ff1f27212bde7f872f0a050bea5d0ff Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 21 Jan 2022 21:24:22 +0100 Subject: [PATCH 10/10] Address review: don't set attributes for ignored files --- .gitattributes | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitattributes b/.gitattributes index 9d27984653b204..2718e63e5748ff 100644 --- a/.gitattributes +++ b/.gitattributes @@ -67,15 +67,11 @@ Include/opcode.h generated Include/token.h generated Lib/keyword.py generated Lib/token.py generated -Modules/config.c generated Objects/typeslots.inc generated Parser/parser.c generated Parser/token.c generated Programs/test_frozenmain.h generated Python/Python-ast.c generated -Python/deepfreeze/*.c generated -Python/frozen_modules/*.h generated -Python/frozen_modules/MANIFEST generated Python/opcode_targets.h generated Python/stdlib_module_names.h generated Tools/peg_generator/pegen/grammar_parser.py generated