Merge lp:~jelmer/brz/patch-handling into lp:brz/3.1

[Jelmer Vernooij]

Fix handling of dirty heads when parsing patches.

Fix handling of dirty heads when parsing patches.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/patches.py'
--- breezy/patches.py	2020-07-04 12:29:00 +0000
+++ breezy/patches.py	2020-09-08 02:57:53 +0000
@@ -419,7 +419,12 @@
 
     for line in iter_lines:
         if line.startswith(b'=== '):
-            if len(saved_lines) > 0:
+            if allow_dirty and beginning:
+                # Patches can have "junk" at the beginning
+                # Stripping junk from the end of patches is handled when we
+                # parse the patch
+                pass
+            elif len(saved_lines) > 0:
                 if keep_dirty and len(dirty_head) > 0:
                     yield {'saved_lines': saved_lines,
                            'dirty_head': dirty_head}