Skip to content
Snippets Groups Projects
  • Eric Blake's avatar
    991e8091
    maint: Tell git that *.py files should use python diff hunks · 991e8091
    Eric Blake authored
    
    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: default avatarJohn Snow <jsnow@redhat.com>
    Signed-off-by: default avatarEric Blake <eblake@redhat.com>
    Message-Id: <20210215222524.1820223-1-eblake@redhat.com>
    Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
    Reviewed-by: default avatarCleber Rosa <crosa@redhat.com>
    Signed-off-by: default avatarCleber Rosa <crosa@redhat.com>
    991e8091
    History
    maint: Tell git that *.py files should use python diff hunks
    Eric Blake authored
    
    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: default avatarJohn Snow <jsnow@redhat.com>
    Signed-off-by: default avatarEric Blake <eblake@redhat.com>
    Message-Id: <20210215222524.1820223-1-eblake@redhat.com>
    Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
    Reviewed-by: default avatarCleber Rosa <crosa@redhat.com>
    Signed-off-by: default avatarCleber Rosa <crosa@redhat.com>