git diff can have 'new file mode' for new files and 'new mode' for current files

patch.py

Index: patch.py
diff --git a/patch.py b/patch.py
index a7eef3f24fc2f1468dc25ff35c79a999b2c83155..77bb15991065f4fefd363335e26e59cad19dffa6 100644
--- a/patch.py
+++ b/patch.py
@@ -215,10 +215,10 @@ class FilePatchDiff(FilePatchBase):
     """Processes a single line of the header.
 
     Returns True if it should continue looping.
+
+    Format is described to
+    http://www.kernel.org/pub/software/scm/git/docs/git-diff.html
     """
-    # Handle these:
-    #  rename from <>
-    #  copy from <>
     match = re.match(r'^(rename|copy) from (.+)$', line)
     if match:
       if old != match.group(2):
@@ -229,9 +229,6 @@ class FilePatchDiff(FilePatchBase):
                 (match.group(1), line))
       return
 
-    # Handle these:
-    #  rename to <>
-    #  copy to <>
     match = re.match(r'^(rename|copy) to (.+)$', line)
     if match:
       if new != match.group(2):
@@ -242,15 +239,14 @@ class FilePatchDiff(FilePatchBase):
                 (match.group(1), line))
       return
 
-    # Handle "new file mode \d{6}"
-    match = re.match(r'^new file mode (\d{6})$', line)
+    match = re.match(r'^new(| file) mode (\d{6})$', line)
     if match:
-      mode = match.group(1)
+      mode = match.group(2)
       # Only look at owner ACL for executable.
+      # TODO(maruel): Add support to remove a property.
       if bool(int(mode[4]) & 1):
         self.svn_properties.append(('svn:executable', '*'))
 
-    # Handle "--- "
     match = re.match(r'^--- (.*)$', line)
     if match:
       if last_line[:3] in ('---', '+++'):
@@ -263,7 +259,6 @@ class FilePatchDiff(FilePatchBase):
         self._fail('Missing git diff output name.')
       return
 
-    # Handle "+++ "
     match = re.match(r'^\+\+\+ (.*)$', line)
     if match:
       if not last_line.startswith('---'):