Patchwork didn't recognise some patches due missing some extended header lines (e.g. "old mode" and "new mode" for renaming file mode, see [1]). Thus adding all modes from git doc [2].
Fixes: #267 [1] https://lists.ozlabs.org/pipermail/patchwork/2019-April/005741.html [2] https://git-scm.com/docs/git-diff#_generating_patches_with_p Suggested-by: Veronika Kabatova <vkaba...@redhat.com> Signed-off-by: Petr Vorel <petr.vo...@gmail.com> --- patchwork/parser.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/patchwork/parser.py b/patchwork/parser.py index 712780a..633fc71 100644 --- a/patchwork/parser.py +++ b/patchwork/parser.py @@ -752,7 +752,7 @@ def parse_patch(content): # 3 -> 4 (@@ line) # 4 -> 5 (patch content) # 5 -> 1 (run out of lines from @@-specifed count) - # 1 -> 6 (rename from / rename to / new file / index) + # 1 -> 6 (extended header lines) # 6 -> 2 (---) # 6 -> 1 (other text) # @@ -782,7 +782,15 @@ def parse_patch(content): if line.startswith('--- '): state = 2 - if line.startswith(('rename from ', 'rename to ', + # extended header lines + # @see https://git-scm.com/docs/git-diff#_generating_patches_with_p + if line.startswith(('old mode ', 'new mode ', + 'deleted file mode ', + 'new file mode ', + 'copy from ', 'copy to ', + 'rename from ', 'rename to ', + 'similarity index ', + 'dissimilarity index ', 'new file mode ', 'index ')): state = 6 elif state == 2: -- 2.21.0 _______________________________________________ Patchwork mailing list Patchwork@lists.ozlabs.org https://lists.ozlabs.org/listinfo/patchwork
