Verify our assumptions about SCM commands deleting files from checkout

checkout.py

 # coding=utf8
 # 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.
 """Manages a project checkout.
 
 Includes support for svn, git-svn and git.
 """
 
 import ConfigParser
@@ skipping 156 matching lines @@
 
   def apply_patch(self, patches, post_processors=None, verbose=False):
     """Ignores svn properties."""
     post_processors = post_processors or self.post_processors or []
     for p in patches:
       stdout = []
       try:
         filepath = os.path.join(self.project_path, p.filename)
         if p.is_delete:
           os.remove(filepath)
+          assert(not os.path.exists(filepath))

[jochen (gone - plz use gerrit), 2014/06/05 13:33:26]

this won't work if filepath is a directory, right?

           stdout.append('Deleted.')
         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)
             stdout.append('Created missing directory %s.' % dirname)
 
           if p.is_binary:
             content = p.get()
@@ skipping 167 matching lines @@
     for p in patches:
       stdout = []
       try:
         filepath = os.path.join(self.project_path, p.filename)
         # It is important to use credentials=False otherwise credentials could
         # leak in the error message. Credentials are not necessary here for the
         # following commands anyway.
         if p.is_delete:
           stdout.append(self._check_output_svn(
               ['delete', p.filename, '--force'], credentials=False))
+          assert(not os.path.exists(filepath))
           stdout.append('Deleted.')
         else:
           # svn add while creating directories otherwise svn add on the
           # contained files will silently fail.
           # First, find the root directory that exists.
           dirname = os.path.dirname(p.filename)
           dirs_to_create = []
           while (dirname and
               not os.path.isdir(os.path.join(self.project_path, dirname))):
             dirs_to_create.append(dirname)
@@ skipping 273 matching lines @@
       try:
         filepath = os.path.join(self.project_path, p.filename)
         if p.is_delete:
           if (not os.path.exists(filepath) and
               any(p1.source_filename == p.filename for p1 in patches[0:index])):
             # The file was already deleted if a prior patch with file rename
             # was already processed because 'git apply' did it for us.
             pass
           else:
             stdout.append(self._check_output_git(['rm', p.filename]))
+            assert(not os.path.exists(filepath))
             stdout.append('Deleted.')
         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)
             stdout.append('Created missing directory %s.' % dirname)
           if p.is_binary:
             content = p.get()
             with open(filepath, 'wb') as f:
@@ skipping 159 matching lines @@
   def revisions(self, rev1, rev2):
     return self.checkout.revisions(rev1, rev2)
 
   @property
   def project_name(self):
     return self.checkout.project_name
 
   @property
   def project_path(self):
     return self.checkout.project_path