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

checkout.py

Index: checkout.py
diff --git a/checkout.py b/checkout.py
index 68781cb4c78ba61655c271bddafebc5af127541c..15d548cdb6ee8004ad0ba47e0dbcb2efd006f63c 100644
--- a/checkout.py
+++ b/checkout.py
@@ -707,10 +707,14 @@ class GitCheckout(CheckoutBase):
     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."""