Continue to the next file after a conflict in apply_patch.

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 only for git.
 """
 
 import fnmatch
@@ skipping 59 matching lines @@
   for item in stdout:
     item = item.strip()
     if not item:
       continue
     output += ''.join('  %s\n' % line for line in item.splitlines())
   return output
 
 
 class PatchApplicationFailed(Exception):
   """Patch failed to be applied."""
-  def __init__(self, p, status):
-    super(PatchApplicationFailed, self).__init__(p, status)
-    self.patch = p
-    self.status = status
-
-  @property
-  def filename(self):
-    if self.patch:
-      return self.patch.filename
+  def __init__(self, errors, verbose):
+    super(PatchApplicationFailed, self).__init__(errors, verbose)
+    self.errors = errors
+    self.verbose = verbose
 
   def __str__(self):
     out = []
-    if self.filename:
-      out.append('Failed to apply patch for %s:' % self.filename)
-    if self.status:
-      out.append(self.status)
-    if self.patch:
-      out.append('Patch: %s' % self.patch.dump())
+    for e in self.errors:
+      p, status = e
+      if p and p.filename:
+        out.append('Failed to apply patch for %s:' % p.filename)
+      if status:
+        out.append(status)
+      if p and self.verbose:
+        out.append('Patch: %s' % p.dump())
     return '\n'.join(out)
 
 
 class CheckoutBase(object):
   # Set to None to have verbose output.
   VOID = subprocess2.VOID
 
   def __init__(self, root_dir, project_name, post_processors):
     """
     Args:
@@ skipping 136 matching lines @@
     The changes remain staged on the current branch.
     """
     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, '-t', self.remote_branch,
            '--quiet'])
 
+    errors = []
     for index, p in enumerate(patches):
       stdout = []
       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
@@ skipping 22 matching lines @@
             cmd = ['apply', '--index', '-3', '-p%s' % p.patchlevel]
             if verbose:
               cmd.append('--verbose')
             stdout.append(self._check_output_git(cmd, stdin=p.get(True)))
         for post in post_processors:
           post(self, p)
         if verbose:
           print p.filename
           print align_stdout(stdout)
       except OSError, e:
-        raise PatchApplicationFailed(p, '%s%s' % (align_stdout(stdout), e))
+        errors.append((p, '%s%s' % (align_stdout(stdout), e)))
       except subprocess.CalledProcessError, e:
-        raise PatchApplicationFailed(
-            p,
+        errors.append((p,
             'While running %s;\n%s%s' % (
               ' '.join(e.cmd),
               align_stdout(stdout),
-              align_stdout([getattr(e, 'stdout', '')])))
+              align_stdout([getattr(e, 'stdout', '')]))))
+    if errors:
+      raise PatchApplicationFailed(errors, verbose)
     found_files = self._check_output_git(
         ['diff', '--ignore-submodules',
          '--name-only', '--staged']).splitlines(False)
     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,)
       if unpatched_files:
         print 'Found unpatched files: %r' % (unpatched_files,)
@@ skipping 109 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