Fix applying git diff with new file mode 644 on a svn checkout.

tests/patch_test.py

 #!/usr/bin/env python
 # coding: utf-8
 # Copyright (c) 2012 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.
 
 """Unit tests for patch.py."""
 
 import logging
 import os
@@ skipping 14 matching lines @@
       filename,
       diff,
       source_filename=None,
       is_binary=False,
       is_delete=False,
       is_git_diff=False,
       is_new=False,
       patchlevel=0,
       svn_properties=None,
       nb_hunks=None):
-    svn_properties = svn_properties or []
     self.assertEquals(p.filename, filename)
     self.assertEquals(p.source_filename, source_filename)
     self.assertEquals(p.is_binary, is_binary)
     self.assertEquals(p.is_delete, is_delete)
     if hasattr(p, 'is_git_diff'):
       self.assertEquals(p.is_git_diff, is_git_diff)
     self.assertEquals(p.is_new, is_new)
     if hasattr(p, 'patchlevel'):
       self.assertEquals(p.patchlevel, patchlevel)
     if diff:
       if is_binary:
         self.assertEquals(p.get(), diff)
       else:
         self.assertEquals(p.get(True), diff)
     if hasattr(p, 'hunks'):
       self.assertEquals(len(p.hunks), nb_hunks)
     else:
       self.assertEquals(None, nb_hunks)
+    if hasattr(p, 'svn_properties'):
+      self.assertEquals(p.svn_properties, svn_properties or [])
 
   def testFilePatchDelete(self):
     p = patch.FilePatchDelete('foo', False)
     self._check_patch(p, 'foo', None, is_delete=True)
 
   def testFilePatchDeleteBin(self):
     p = patch.FilePatchDelete('foo', True)
     self._check_patch(p, 'foo', None, is_delete=True, is_binary=True)
 
   def testFilePatchBinary(self):
@@ skipping 18 matching lines @@
     self._check_patch(
         p, 'git_cl/git-cl', GIT.MODE_EXE, is_git_diff=True, patchlevel=1,
         svn_properties=[('svn:executable', '*')], nb_hunks=0)
 
   def testFilePatchDiffHeaderModeIndex(self):
     p = patch.FilePatchDiff('git_cl/git-cl', GIT.MODE_EXE_JUNK, [])
     self._check_patch(
         p, 'git_cl/git-cl', GIT.MODE_EXE_JUNK, is_git_diff=True, patchlevel=1,
         svn_properties=[('svn:executable', '*')], nb_hunks=0)
 
+  def testFilePatchDiffHeaderNotExecutable(self):
+    p = patch.FilePatchDiff(
+        'build/android/ant/create.js', GIT.NEW_NOT_EXECUTABLE, [])
+    self._check_patch(
+        p, 'build/android/ant/create.js', GIT.NEW_NOT_EXECUTABLE,
+        is_git_diff=True, patchlevel=1, is_new=True,
+        nb_hunks=1)
+
   def testFilePatchDiffSvnNew(self):
     # The code path is different for git and svn.
     p = patch.FilePatchDiff('foo', RAW.NEW, [])
     self._check_patch(p, 'foo', RAW.NEW, is_new=True, nb_hunks=1)
 
   def testFilePatchDiffGitNew(self):
     # The code path is different for git and svn.
     p = patch.FilePatchDiff('foo', GIT.NEW, [])
     self._check_patch(
         p, 'foo', GIT.NEW, is_new=True, is_git_diff=True, patchlevel=1,
@@ skipping 436 matching lines @@
       self.fail()
     except patch.UnsupportedPatchFormat:
       pass
 
 
 if __name__ == '__main__':
   logging.basicConfig(level=
       [logging.WARNING, logging.INFO, logging.DEBUG][
         min(2, sys.argv.count('-v'))])
   unittest.main()