Add support for executables in git-svn patches applied on svn.

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 79 matching lines @@
   def __init__(self, filename, diff, svn_properties):
     super(FilePatchDiff, self).__init__(filename)
     if not diff:
       self._fail('File doesn\'t have a diff.')
     self.diff_header, self.diff_hunks = self._split_header(diff)
     self.svn_properties = svn_properties or []
     self.is_git_diff = self._is_git_diff_header(self.diff_header)
     self.patchlevel = 0
     if self.is_git_diff:
       self._verify_git_header()
-      assert not svn_properties
     else:
       self._verify_svn_header()
 
   def get(self):
     return self.diff_header + self.diff_hunks
 
   def set_relpath(self, relpath):
     old_filename = self.filename
     super(FilePatchDiff, self).set_relpath(relpath)
     # Update the header too.
@@ skipping 79 matching lines @@
       if new not in (self.filename, 'dev/null'):
         self._fail('Unexpected git diff output name %s.' % new)
       if old == 'dev/null' and new == 'dev/null':
         self._fail('Unexpected /dev/null git diff.')
       break
 
     if not old or not new:
       self._fail('Unexpected git diff; couldn\'t find git header.')
 
     # Handle these:
+    # new file mode \d{6}
     # rename from <>
     # rename to <>
     # copy from <>
     # copy to <>
     while lines:
       if lines[0].startswith('--- '):
         break
-      match = re.match(r'^(rename|copy) from (.+)$', lines.pop(0))
-      if not match:
+      line = lines.pop(0)
+      match = re.match(r'^(rename|copy) from (.+)$', line)
+      if match:
+        if old != match.group(2):
+          self._fail('Unexpected git diff input name for %s.' % match.group(1))
+        if not lines:
+          self._fail('Missing git diff output name for %s.' % match.group(1))
+        match = re.match(r'^(rename|copy) to (.+)$', lines.pop(0))
+        if not match:
+          self._fail('Missing git diff output name for %s.' % match.group(1))
+        if new != match.group(2):
+          self._fail('Unexpected git diff output name for %s.' % match.group(1))
         continue
-      if old != match.group(2):
-        self._fail('Unexpected git diff input name for %s.' % match.group(1))
-      if not lines:
-        self._fail('Missing git diff output name for %s.' % match.group(1))
-      match = re.match(r'^(rename|copy) to (.+)$', lines.pop(0))
-      if not match:
-        self._fail('Missing git diff output name for %s.' % match.group(1))
-      if new != match.group(2):
-        self._fail('Unexpected git diff output name for %s.' % match.group(1))
+
+      match = re.match(r'^new file mode (\d{6})$', line)
+      if match:
+        mode = match.group(1)
+        # Only look at owner ACL for executable.
+        if bool(int(mode[4]) & 4):
+          self.svn_properties.append(('svn:executable', '*'))
 
     # Handle ---/+++
     while lines:
       match = re.match(r'^--- (.*)$', lines.pop(0))
       if not match:
         continue
       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:
         self._fail('Missing git diff output name.')
@@ skipping 52 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]