Fix handling of file renames.

checkout.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.
 """Manages a project checkout.
 
 Includes support for svn, git-svn and git.
 """
 
 from __future__ import with_statement
 import ConfigParser
 import fnmatch
 import logging
 import os
 import re
+import shutil
 import subprocess
 import sys
 import tempfile
 
 import patch
 import scm
 import subprocess2
 
 
 def get_code_review_setting(path, key,
@@ skipping 104 matching lines @@
           dirname = os.path.dirname(p.filename)
           full_dir = os.path.join(self.project_path, dirname)
           if dirname and not os.path.isdir(full_dir):
             os.makedirs(full_dir)
 
           filepath = os.path.join(self.project_path, p.filename)
           if p.is_binary:
             with open(filepath, 'wb') as f:
               f.write(p.get())
           else:
+            if p.source_filename:
+              # Copy the file first.
+              if os.path.isfile(filepath):
+                raise PatchApplicationFailed(
+                    p.filename, 'File exist but was about to be overwriten')
+              shutil.copy2(
+                  os.path.join(self.project_path, p.source_filename), filepath)

[Dirk Pranke, 2011/09/28 23:39:27]

I'm a bit confused by this. Won't the file usually exist (and you'll get the
exception raised)?

[M-A Ruel, 2011/09/29 14:15:58]

Added a check to be explicit about the consistency of the FilePatchBase
instance. See patch.py line 130 for similar check.

             if p.diff_hunks:
               stdout = subprocess2.check_output(
-                  ['patch', '-p%s' % p.patchlevel],
-                  stdin=p.get(),
+                  ['patch', '-u', '--binary', '-p%s' % p.patchlevel],
+                  stdin=p.get(False),
                   stderr=subprocess2.STDOUT,
                   cwd=self.project_path)
             elif p.is_new and not os.path.exists(filepath):
               # There is only a header. Just create the file.
               open(filepath, 'w').close()
         for post in post_processors:
           post(self, p)
       except OSError, e:
         raise PatchApplicationFailed(p.filename, '%s%s' % (stdout, e))
       except subprocess.CalledProcessError, e:
@@ skipping 132 matching lines @@
           for dir_to_create in reversed(dirs_to_create):
             os.mkdir(os.path.join(self.project_path, dir_to_create))
             stdout += self._check_output_svn(
                 ['add', dir_to_create, '--force'], credentials=False)
 
           filepath = os.path.join(self.project_path, p.filename)
           if p.is_binary:
             with open(filepath, 'wb') as f:
               f.write(p.get())
           else:
+            if p.source_filename:
+              # Copy the file first.
+              if os.path.isfile(filepath):
+                raise PatchApplicationFailed(
+                    p.filename, 'File exist but was about to be overwriten')
+              shutil.copy2(
+                  os.path.join(self.project_path, p.source_filename), filepath)

[Dirk Pranke, 2011/09/28 23:39:27]

same question.

             if p.diff_hunks:
               cmd = ['patch', '-p%s' % p.patchlevel, '--forward', '--force']
               stdout += subprocess2.check_output(
-                  cmd, stdin=p.get(), cwd=self.project_path)
+                  cmd, stdin=p.get(False), cwd=self.project_path)
             elif p.is_new and not os.path.exists(filepath):
               # There is only a header. Just create the file if it doesn't
               # exist.
               open(filepath, 'w').close()
           if p.is_new:
             stdout += self._check_output_svn(
                 ['add', p.filename, '--force'], credentials=False)
           for prop in p.svn_properties:
             stdout += self._check_output_svn(
                 ['propset', prop[0], prop[1], p.filename], credentials=False)
@@ skipping 117 matching lines @@
 
     Ignores svn properties and raise an exception on unexpected ones.
     """
     post_processors = post_processors or self.post_processors or []
     # It this throws, the checkout is corrupted. Maybe worth deleting it and
     # trying again?
     if self.remote_branch:
       self._check_call_git(
           ['checkout', '-b', self.working_branch,
             '%s/%s' % (self.remote, self.remote_branch), '--quiet'])
-    for p in patches:
+    for index, p in enumerate(patches):
       try:
         stdout = ''
         if p.is_delete:
-          stdout += self._check_output_git(['rm', p.filename])
+          if (not os.path.exists(p.filename) and
+              any(p1.source_filename == p.filename for p1 in patches[0:index])):
+            # The file could already be deleted if a prior patch with file
+            # rename was already processed. To be sure, look at all the previous
+            # patches to see if they were a file rename.
+            pass
+          else:
+            stdout += self._check_output_git(['rm', p.filename])
         else:
           dirname = os.path.dirname(p.filename)
           full_dir = os.path.join(self.project_path, dirname)
           if dirname and not os.path.isdir(full_dir):
             os.makedirs(full_dir)
           if p.is_binary:
             with open(os.path.join(self.project_path, p.filename), 'wb') as f:
               f.write(p.get())
             stdout += self._check_output_git(['add', p.filename])
           else:
             # No need to do anything special with p.is_new or if not
             # p.diff_hunks. git apply manages all that already.
             stdout += self._check_output_git(
-                ['apply', '--index', '-p%s' % p.patchlevel], stdin=p.get())
+                ['apply', '--index', '-p%s' % p.patchlevel], stdin=p.get(True))
           for prop in p.svn_properties:
             # Ignore some known auto-props flags through .subversion/config,
             # bails out on the other ones.
             # TODO(maruel): Read ~/.subversion/config and detect the rules that
             # applies here to figure out if the property will be correctly
             # handled.
             if not prop[0] in ('svn:eol-style', 'svn:executable'):
               raise patch.UnsupportedPatchFormat(
                   p.filename,
                   'Cannot apply svn property %s to file %s.' % (
@@ skipping 251 matching lines @@
         user, message))
     return 'FAKE'
 
   @property
   def project_name(self):
     return self.checkout.project_name
 
   @property
   def project_path(self):
     return self.checkout.project_path