Anonymous avatar Anonymous committed 2d37ac7

Ignore unparsable diff blocks - they might be binary diffs.

Comments (0)

Files changed (1)

scripts/addpatchsets

         if line.startswith('diff '):
             if filename:
                 chunks = patching.ParsePatchToChunks(diff)
-                if not chunks:
-                    # diff cannot be parsed
-                    return None
-                patches.append((filename, ''.join(diff), chunks))
+                if chunks:
+                    patches.append((filename, ''.join(diff), chunks))
             diff = []
             filename = line.split()[-1]
             if filename.startswith("b/"):
     # add last patch
     if filename:
         chunks = patching.ParsePatchToChunks(diff)
-        if not chunks:
-            return None
-        patches.append((filename, ''.join(diff), chunks))
+        if chunks:
+            patches.append((filename, ''.join(diff), chunks))
     return patches
 
 def find_bases(data):
     c = connection.cursor()
     pieces = hg_splitpatch(data)
     if not pieces:
+        if verbose:
+            print "Splitting failed"
         return None, None
     bases = []
     for filename, data, chunks in pieces:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.