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

patch.py

 # coding=utf8
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """Utility functions to handle patches."""
 
 import posixpath
 import os
 import re
 
@@ skipping 197 matching lines @@
 
     # Cheap check to make sure the file name is at least mentioned in the
     # 'diff' header. That the only remaining invariant.
     if not self.filename in self.diff_header:
       self._fail('Diff seems corrupted.')
 
   def _verify_git_header_process_line(self, lines, line, last_line, old, new):
     """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):
         self._fail('Unexpected git diff input name for line %s.' % line)
       if not lines or not lines[0].startswith('%s to ' % match.group(1)):
         self._fail(
             'Confused %s from/to git diff for line %s.' %
                 (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):
         self._fail('Unexpected git diff output name for line %s.' % line)
       if not last_line.startswith('%s from ' % match.group(1)):
         self._fail(
             'Confused %s from/to git diff for line %s.' %
                 (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 ('---', '+++'):
         self._fail('--- and +++ are reversed')
       self.is_new = match.group(1) == '/dev/null'
       # TODO(maruel): Use self.source_file.
       if old != self.mangle(match.group(1)) and match.group(1) != '/dev/null':
         self._fail('Unexpected git diff: %s != %s.' % (old, match.group(1)))
       if not lines or not lines[0].startswith('+++'):
         self._fail('Missing git diff output name.')
       return
 
-    # Handle "+++ "
     match = re.match(r'^\+\+\+ (.*)$', line)
     if match:
       if not last_line.startswith('---'):
         self._fail('Unexpected git diff: --- not following +++.')
       # TODO(maruel): new == self.filename.
       if new != self.mangle(match.group(1)) and '/dev/null' != match.group(1):
         # TODO(maruel): Can +++ be /dev/null? If so, assert self.is_delete ==
         # True.
         self._fail('Unexpected git diff: %s != %s.' % (new, match.group(1)))
       if lines:
@@ skipping 70 matching lines @@
     for patch in self.patches:
       patch.set_relpath(relpath)
 
   def __iter__(self):
     for patch in self.patches:
       yield patch
 
   @property
   def filenames(self):
     return [p.filename for p in self.patches]