[PULL,5/9] maint: Tell git that *.py files should use python diff hunks

Commit Message

Cleber Rosa Feb. 16, 2021, 4:57 a.m. UTC

From: Eric Blake <[e-mail]>

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:

|  --- 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()

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.

Reported-by: John Snow <[e-mail]>
Signed-off-by: Eric Blake <[e-mail]>
Message-Id: <[e-mail]>
Reviewed-by: John Snow <[e-mail]>
Reviewed-by: Cleber Rosa <[e-mail]>
Signed-off-by: Cleber Rosa <[e-mail]>
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

Patch

diff --git a/.gitattributes b/.gitattributes
index 3d2fe2ecda8..07f430e9441 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@ 
 *.c.inc         diff=c
 *.h.inc         diff=c
+*.py            diff=python