qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: John Snow <jsnow@redhat.com>
To: Eric Blake <eblake@redhat.com>, qemu-devel@nongnu.org
Cc: crosa@redhat.com
Subject: Re: [PATCH] maint: Tell git that *.py files should use python diff hunks
Date: Mon, 15 Feb 2021 18:05:04 -0500	[thread overview]
Message-ID: <3ba77bdb-25c4-9b31-2fa5-d1af4898a331@redhat.com> (raw)
In-Reply-To: <20210215222524.1820223-1-eblake@redhat.com>

On 2/15/21 5:25 PM, Eric Blake wrote:
> Git's default hunk pattern recognizer favors the C language, but it
> also includes several built-in diff styles that give saner results in
> other languages.  In particular, telling git to treat all .py files as
> python changes the beginning of diff hunks as follows:
> 

As a language recommendation, "gives [improved|better|more readable] 
results".

> |  --- a/python/qemu/machine.py
> |  +++ b/python/qemu/machine.py
> | -@@ -337,12 +337,12 @@ class QEMUMachine:
> | +@@ -337,12 +337,12 @@ def _post_shutdown(self) -> None:
> |               self._qmp.close()
> 

Much better.

> which makes it much easier to tell what function a patch is touching,
> rather than a non-descript listing of what class contains the changes.
> 
> Sadly, our python files that don't use .py suffix (such as numerous
> iotests) do not benefit from this glob.
> 

Probably not a big deal, since those generally don't have class-based 
code anyway.

> Reported-by: John Snow <jsnow@redhat.com>
> Signed-off-by: Eric Blake <eblake@redhat.com>

Reviewed-by: John Snow <jsnow@redhat.com>

> ---
>   .gitattributes | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/.gitattributes b/.gitattributes
> index 3d2fe2ecda8b..3e03ee01c0d9 100644
> --- a/.gitattributes
> +++ b/.gitattributes
> @@ -1,2 +1,3 @@
>   *.c.inc         diff=c
>   *.h.inc         diff=c
> +*.py            diff=python
> 



  reply	other threads:[~2021-02-15 23:06 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-15 22:25 [PATCH] maint: Tell git that *.py files should use python diff hunks Eric Blake
2021-02-15 23:05 ` John Snow [this message]
2021-02-16  3:12 ` Cleber Rosa

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=3ba77bdb-25c4-9b31-2fa5-d1af4898a331@redhat.com \
    --to=jsnow@redhat.com \
    --cc=crosa@redhat.com \
    --cc=eblake@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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).