Don't have checkout.py's git apply_patch fail when files don't match

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 689 matching lines @@
       except subprocess.CalledProcessError, e:
         raise PatchApplicationFailed(
             p,
             'While running %s;\n%s%s' % (
               ' '.join(e.cmd),
               align_stdout(stdout),
               align_stdout([getattr(e, 'stdout', '')])))
     found_files = self._check_output_git(
         ['diff', '--ignore-submodules',
          '--name-only', '--staged']).splitlines(False)
-    assert sorted(patches.filenames) == sorted(found_files), (
-        'Found extra %s locally, %s not patched' % (
-            sorted(set(found_files) - set(patches.filenames)),
-            sorted(set(patches.filenames) - set(found_files))))
+    if sorted(patches.filenames) != sorted(found_files):
+      extra_files = sorted(set(found_files) - set(patches.filenames))
+      unpatched_files = sorted(set(patches.filenames) - set(found_files))
+      if extra_files:
+        print 'Found extra files: %r' % (extra_files,)

[M-A Ruel, 2014/05/12 12:35:55]

I disagree that checkout.py should ever "print" at all. It's the wrong layer.

It could have easily been fixed by noting what was staged first, before applying
patches, then using this information to not consider them. Or remove the assert
completely, it was more as an internal debugging tool.

+      if unpatched_files:
+        print 'Found unpatched files: %r' % (unpatched_files,)
+
 

[M-A Ruel, 2014/05/12 12:35:55]

One superfluous line.

   def commit(self, commit_message, user):
     """Commits, updates the commit message and pushes."""
     # TODO(hinoka): CQ no longer uses this, I think its deprecated.
     #               Delete this.
     assert self.commit_user
     assert isinstance(commit_message, unicode)
     current_branch = self._check_output_git(
         ['rev-parse', '--abbrev-ref', 'HEAD']).strip()
     assert current_branch == self.working_branch
 
@@ skipping 97 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