NotificationsYou must be signed in to change notification settings
Fork32.1k
Star67.4k

Update generated files list and add`diff=generated` attribute#30745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Jump to bottom

Merged

miss-islington merged 10 commits intopython:mainfromerlend-aasland:git-diff

Jan 21, 2022

Merged

Update generated files list and add`diff=generated` attribute#30745

miss-islington merged 10 commits intopython:mainfromerlend-aasland:git-diff

Jan 21, 2022

Conversation

Copy link

Contributor

erlend-aasland commentedJan 21, 2022•
edited by miss-islington
Loading

As a side effect, the list of generated files is relocated after the language aware diff settings.

Closespython/core-workflow#425

Automerge-Triggered-By: GH:zware

Mark generated files with 'diff=generated' attribute

e2f1b8f

the-knights-who-say-ni added the CLA signed label

Jan 21, 2022

bedevere-bot added the awaiting review label

Jan 21, 2022

erlend-aasland added skip issue skip news and removed skip news labels

Jan 21, 2022

Erlend E. Aasland added3 commits

January 21, 2022 13:45

Sort

4d07692

Add missing Modules/config.c

1022187

Add missing generated files:

e81edae

+ 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

Copy link

ContributorAuthor

erlend-aasland commentedJan 21, 2022

FYI@isidentical, I added some of the missing generated files, mostly related to the parser.

Copy link

ContributorAuthor

erlend-aasland commentedJan 21, 2022•
edited
Loading

~~I'm considering adding a NEWS item for this.~~

erlend-aasland requested review fromzware,ambv andisidentical

January 21, 2022 13:03

erlend-aasland changed the title~~Mark generated files withdiff=generated attribute~~Update generated files list and adddiff=generated attribute

Jan 21, 2022

Erlend E. Aasland added2 commits

January 21, 2022 14:04

Remove duplicate entry

246ba2d

Document git diff trick

cde22e6

isidentical mentioned this pull request

Jan 21, 2022

bpo-40729: Update the list of auto-generated files for .gitattributes#20314

Closed

Reword comment

7f240e4

erlend-aasland added the skip news label

Jan 21, 2022

Add missing configure and aclocal.m4

6ab18ef

arhadthedev mentioned this pull request

Jan 21, 2022

bpo-46038: Mark /configure file as generated in .gitattributes#30031

Closed

Copy link

ContributorAuthor

erlend-aasland commentedJan 21, 2022

Addedconfigure andaclocal.m4 as well (this PR now superseeds#30031). I think that covers everything :)

Copy link

ContributorAuthor

erlend-aasland commentedJan 21, 2022

cc.@arhadthedev (I can't directly request your review on the PR)

isidentical approved these changes

Jan 21, 2022

View reviewed changes

Copy link

Member

isidentical left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Thanks for the PR@erlend-aasland, LGTM. Assuming this includes everything from ourmake regen-all targets

bedevere-bot added awaiting merge and removed awaiting review labels

Jan 21, 2022

arhadthedev approved these changes

Jan 21, 2022

View reviewed changes

Copy link

Member

arhadthedev left a comment•
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Looks good to me, I have no objection on who successfully pushes a solution to a problem.

~~By the way, what doesdiff=generated do? Google returned nothing relevant forgit diff generated; grepping the repository gives lots of clutter as well.~~ Edit: I found the answer inpython/core-workflow#425.

Copy link

ContributorAuthor

erlend-aasland commentedJan 21, 2022

Thanks for the PR@erlend-aasland, LGTM. Assuming this includes everything from ourmake regen-all targets

I went through the Makefile twice, but I may have overlooked something. Feel free to double check 🕵🏻

vstinner reviewed

Jan 21, 2022

View reviewed changes

.gitattributesShow resolvedHide resolved

zware approved these changes

Jan 21, 2022

View reviewed changes

.gitattributesShow resolvedHide resolved

.gitattributes OutdatedShow resolvedHide resolved

Use attr macro

8cf4889

Copy link

ContributorAuthor

erlend-aasland commentedJan 21, 2022

IMO, I don't think it is worth the hassle to backport this. Cry out if you disagree.

zware requested changes

Jan 21, 2022

View reviewed changes

.gitattributes OutdatedShow resolvedHide resolved

.gitattributesShow resolvedHide resolved

.gitattributes OutdatedShow resolvedHide resolved

bedevere-bot removed the awaiting merge label

Jan 21, 2022

Copy link

bedevere-bot commentedJan 21, 2022

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phraseI have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.