From: Petr Vorel Date: Sun, 5 May 2019 20:20:05 +0000 (+0200) Subject: parser: Add missing extended header lines X-Git-Tag: v2.1.3~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b141134eb97163d285daf928ab322fde27d7dc8;p=thirdparty%2Fpatchwork.git parser: Add missing extended header lines 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]. [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 Signed-off-by: Petr Vorel Closes: #267 (cherry picked from commit 753e4572d7e8b836daf6087820c49637b3b23602) --- diff --git a/patchwork/parser.py b/patchwork/parser.py index e064b0ff..0fedaa65 100644 --- a/patchwork/parser.py +++ b/patchwork/parser.py @@ -760,7 +760,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) # @@ -790,7 +790,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: