From: "Daniel P. Berrangé" <berrange@redhat.com>
To: Markus Armbruster <armbru@redhat.com>
Cc: Victor Toso <victortoso@redhat.com>,
qemu-devel@nongnu.org, John Snow <jsnow@redhat.com>,
Andrea Bolognani <abologna@redhat.com>
Subject: Re: [PATCH v2 02/11] scripts: qapi: black format main.py
Date: Thu, 19 Oct 2023 08:30:15 +0100 [thread overview]
Message-ID: <ZTDbB/VR1NkuDOYf@redhat.com> (raw)
In-Reply-To: <878r7zmalt.fsf@pond.sub.org>
On Thu, Oct 19, 2023 at 07:42:38AM +0200, Markus Armbruster wrote:
> Victor Toso <victortoso@redhat.com> writes:
>
> > On Wed, Oct 18, 2023 at 01:00:07PM +0200, Markus Armbruster wrote:
> >> Victor Toso <victortoso@redhat.com> writes:
> >>
> >> > flake8 complained:
> >> > ./main.py:60:1: E302 expected 2 blank lines, found 1
> >> >
> >> > Which is simple enough. My vim has black [0] enabled by default, so it
> >> > did some extra formatting. I'm proposing to follow it.
> >> >
> >> > [0] https://black.readthedocs.io/en/stable/
> >> >
> >> > Signed-off-by: Victor Toso <victortoso@redhat.com>
> >> > ---
> >> > scripts/qapi/main.py | 76 ++++++++++++++++++++++++++++----------------
> >> > 1 file changed, 48 insertions(+), 28 deletions(-)
> >>
> >> Is this all black hates about scripts/qapi/?
> >
> > No, just scripts/qapi/main.py.
> >
> >> Did you configure it in any way, and if yes, how?
> >
> > Only to reduce line length to 79.
> >
> > I can do a separate series for this, if the idea is accepted.
>
> Let's build a rough idea of how much churn this would be.
>
> We have a bit over 5000 lines:
>
> $ wc -l scripts/qapi/*py
> 419 scripts/qapi/commands.py
> 251 scripts/qapi/common.py
> 50 scripts/qapi/error.py
> 251 scripts/qapi/events.py
> 679 scripts/qapi/expr.py
> 368 scripts/qapi/gen.py
> 390 scripts/qapi/introspect.py
> 103 scripts/qapi/main.py
> 777 scripts/qapi/parser.py
> 1233 scripts/qapi/schema.py
> 71 scripts/qapi/source.py
> 387 scripts/qapi/types.py
> 429 scripts/qapi/visit.py
> 5408 total
>
> Feed them to black:
>
> $ black -q -l 75 scripts/qapi
> $ git-diff --stat
> scripts/qapi/commands.py | 448 +++++++++++++++++-----------
> scripts/qapi/common.py | 240 ++++++++++-----
> scripts/qapi/error.py | 15 +-
> scripts/qapi/events.py | 274 +++++++++++-------
> scripts/qapi/expr.py | 409 ++++++++++++++++----------
> scripts/qapi/gen.py | 187 +++++++-----
> scripts/qapi/introspect.py | 323 +++++++++++++--------
> scripts/qapi/main.py | 80 +++--
> scripts/qapi/parser.py | 370 +++++++++++++----------
> scripts/qapi/schema.py | 709 +++++++++++++++++++++++++++++----------------
> scripts/qapi/source.py | 17 +-
> scripts/qapi/types.py | 369 ++++++++++++++---------
> scripts/qapi/visit.py | 355 ++++++++++++++---------
> 13 files changed, 2383 insertions(+), 1413 deletions(-)
>
> *Ouch*
>
> Peeking at the result, I see string quote normalization. Try again with
> that switched off, and the line length relaxed:
>
> $ black -q -l 79 -S scripts/qapi
> $ git-diff --stat
> scripts/qapi/commands.py | 357 +++++++++++++++++++++------------
> scripts/qapi/common.py | 170 ++++++++++++----
> scripts/qapi/error.py | 11 +-
> scripts/qapi/events.py | 220 +++++++++++++-------
> scripts/qapi/expr.py | 261 +++++++++++++++---------
> scripts/qapi/gen.py | 114 ++++++-----
> scripts/qapi/introspect.py | 231 +++++++++++++--------
> scripts/qapi/main.py | 72 ++++---
> scripts/qapi/parser.py | 224 ++++++++++++---------
> scripts/qapi/schema.py | 488 +++++++++++++++++++++++++++++++--------------
> scripts/qapi/source.py | 7 +-
> scripts/qapi/types.py | 303 ++++++++++++++++++----------
> scripts/qapi/visit.py | 287 ++++++++++++++++----------
> 13 files changed, 1802 insertions(+), 943 deletions(-)
>
> Still massive churn.
FWIW, the .git-blame-ignore-revs file can be populated with commit
hashes afterwards, to make 'git blame' ignore the reformatting
changes. Doesn't help with people cherry-picking fixes to old
branches though, which is the other main downside of such churn.
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
next prev parent reply other threads:[~2023-10-19 7:30 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-16 15:26 [PATCH v2 00/11] qapi-go: add generator for Golang interface Victor Toso
2023-10-16 15:26 ` [PATCH v2 01/11] qapi: re-establish linting baseline Victor Toso
2023-10-16 15:26 ` [PATCH v2 02/11] scripts: qapi: black format main.py Victor Toso
2023-10-18 11:00 ` Markus Armbruster
2023-10-18 11:13 ` Daniel P. Berrangé
2023-10-18 15:23 ` Victor Toso
2023-10-19 5:42 ` Markus Armbruster
2023-10-19 7:30 ` Daniel P. Berrangé [this message]
2023-10-16 15:26 ` [PATCH v2 03/11] qapi: golang: Generate qapi's enum types in Go Victor Toso
2023-10-16 15:26 ` [PATCH v2 04/11] qapi: golang: Generate qapi's alternate " Victor Toso
2023-11-06 15:28 ` Andrea Bolognani
2023-11-06 15:52 ` Victor Toso
2023-11-06 16:12 ` Andrea Bolognani
2023-11-09 17:34 ` Andrea Bolognani
2023-11-09 19:01 ` Victor Toso
2023-11-10 9:58 ` Andrea Bolognani
2023-11-10 15:43 ` Victor Toso
2023-10-16 15:26 ` [PATCH v2 05/11] qapi: golang: Generate qapi's struct " Victor Toso
2023-10-16 15:26 ` [PATCH v2 06/11] qapi: golang: structs: Address 'null' members Victor Toso
2023-10-16 15:27 ` [PATCH v2 07/11] qapi: golang: Generate qapi's union types in Go Victor Toso
2023-11-09 17:29 ` Andrea Bolognani
2023-11-09 18:35 ` Victor Toso
2023-11-10 9:54 ` Andrea Bolognani
2023-11-10 15:45 ` Victor Toso
2023-10-16 15:27 ` [PATCH v2 08/11] qapi: golang: Generate qapi's event " Victor Toso
2023-11-09 17:59 ` Andrea Bolognani
2023-11-09 19:13 ` Victor Toso
2023-11-10 9:52 ` Andrea Bolognani
2023-10-16 15:27 ` [PATCH v2 09/11] qapi: golang: Generate qapi's command " Victor Toso
2023-10-16 15:27 ` [PATCH v2 10/11] qapi: golang: Add CommandResult type to Go Victor Toso
2023-11-09 18:24 ` Andrea Bolognani
2023-11-09 19:31 ` Victor Toso
2023-11-10 9:46 ` Andrea Bolognani
2023-10-16 15:27 ` [PATCH v2 11/11] docs: add notes on Golang code generator Victor Toso
2023-10-18 11:47 ` Markus Armbruster
2023-10-18 16:21 ` Victor Toso
2023-10-19 6:56 ` Markus Armbruster
2023-10-27 17:33 ` [PATCH v2 00/11] qapi-go: add generator for Golang interface Victor Toso
2023-10-31 16:42 ` Andrea Bolognani
2023-11-03 18:34 ` Andrea Bolognani
2023-11-06 12:00 ` Victor Toso
2023-11-09 18:35 ` Andrea Bolognani
2023-11-09 19:03 ` Victor Toso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZTDbB/VR1NkuDOYf@redhat.com \
--to=berrange@redhat.com \
--cc=abologna@redhat.com \
--cc=armbru@redhat.com \
--cc=jsnow@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=victortoso@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).