Merge pull request #6 from ramusus/master

support of git binary files

Author: cscorley

tests/casefiles/git-binary-files.diff

@@ -0,0 +1,4 @@
+diff --git a/project/media/i/asc.gif b/project/media/i/asc.gif
+new file mode 100755
+index 0000000..71e31ac
+Binary files /dev/null and b/project/media/i/asc.gif differ

tests/test_patch.py

@@ -620,6 +620,23 @@ def test_git_header_long(self):
         results_main = wtp.patch.parse_header(text)
         self.assertEqual(results_main, expected)
 
+    def test_git_binary_files(self):
+        with open('tests/casefiles/git-binary-files.diff') as f:
+            text = f.read()
+
+        expected = wtp.patch.header(
+                index_path = None,
+                old_path = '/dev/null',
+                old_version = '0000000',
+                new_path = 'project/media/i/asc.gif',
+                new_version = '71e31ac')
+
+        results = wtp.patch.parse_git_header(text)
+        self.assertEqual(results, expected)
+
+        results_main = wtp.patch.parse_header(text)
+        self.assertEqual(results_main, expected)
+
     def test_svn_header(self):
         with open('tests/casefiles/svn-header.diff') as f:
             text = f.read()

whatthepatch/patch.py

@@ -45,6 +45,7 @@
 git_header_old_line = re.compile('^--- (.+)$')
 git_header_new_line = re.compile('^\+\+\+ (.+)$')
 git_header_file_mode = re.compile('^(new|deleted) file mode \d{6}$')
+git_header_binary_file = re.compile('^Binary files (.+) and (.+) differ')
 
 bzr_header_index = re.compile("=== (.+)")
 bzr_header_old_line = unified_header_old_line
@@ -89,7 +90,7 @@ def parse_patch(text):
         difftext = '\n'.join(diff) + '\n'
         h = parse_header(diff)
         d = parse_diff(diff)
-        if d:
+        if h or d:
             yield diffobj(header=h, changes=d, text=difftext)
 
 def parse_header(text):
@@ -189,12 +190,11 @@ def parse_git_header(text):
     except AttributeError:
         lines = text
 
-    headers = findall_regex(lines, git_header_old_line)
-    if len(headers) == 0:
-        return None
+    # headers = findall_regex(lines, git_header_old_line)
+    # if len(headers) == 0:
+    #     return None
 
-    over = None
-    nver = None
+    over = nver = old_path = new_path = None
     while len(lines) > 1:
         g = git_header_index.match(lines[0])
         # git always has it's own special headers
@@ -210,18 +210,22 @@ def parse_git_header(text):
             if n:
                 old_path = o.group(1)
                 new_path = n.group(1)
-                if old_path.startswith('a/'):
-                    old_path = old_path[2:]
-
-                if new_path.startswith('b/'):
-                    new_path = new_path[2:]
-
-                return header(
-                        index_path = None,
-                        old_path = old_path,
-                        old_version = over,
-                        new_path = new_path,
-                        new_version = nver)
+        binary = git_header_binary_file.match(lines[0])
+        if binary:
+            old_path = binary.group(1)
+            new_path = binary.group(2)
+        if old_path and new_path:
+            if old_path.startswith('a/'):
+                old_path = old_path[2:]
+
+            if new_path.startswith('b/'):
+                new_path = new_path[2:]
+            return header(
+                    index_path = None,
+                    old_path = old_path,
+                    old_version = over,
+                    new_path = new_path,
+                    new_version = nver)
 
     return None