[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/9] maint: Tell git that *.py files should use python diff hunks
From: |
Cleber Rosa |
Subject: |
[PULL 5/9] maint: Tell git that *.py files should use python diff hunks |
Date: |
Mon, 15 Feb 2021 23:57:01 -0500 |
From: Eric Blake <eblake@redhat.com>
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 <jsnow@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210215222524.1820223-1-eblake@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
.gitattributes | 1 +
1 file changed, 1 insertion(+)
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
--
2.26.2
- [PULL 0/9] Acceptance Tests and Python libs patches for 2021-02-15, Cleber Rosa, 2021/02/15
- [PULL 2/9] virtiofs_submounts.py test: Note on vmlinuz param, Cleber Rosa, 2021/02/15
- [PULL 1/9] Acceptance Tests: bump Avocado version requirement to 85.0, Cleber Rosa, 2021/02/15
- [PULL 3/9] Python: close the log file kept by QEMUMachine before reading it, Cleber Rosa, 2021/02/15
- [PULL 5/9] maint: Tell git that *.py files should use python diff hunks,
Cleber Rosa <=
- [PULL 4/9] tests/acceptance/virtio-gpu.py: preserve virtio-user-gpu log, Cleber Rosa, 2021/02/15
- [PULL 6/9] Acceptance Tests: introduce LinuxTest base class, Cleber Rosa, 2021/02/15
- [PULL 7/9] Acceptance Tests: introduce method for requiring an accelerator, Cleber Rosa, 2021/02/15
- [PULL 8/9] Acceptance Tests: fix population of public key in cloudinit image, Cleber Rosa, 2021/02/15
- [PULL 9/9] Acceptance Tests: set up existing ssh keys by default, Cleber Rosa, 2021/02/15
- Re: [PULL 0/9] Acceptance Tests and Python libs patches for 2021-02-15, Peter Maydell, 2021/02/16