Teach bot_update to support patching deps in solutions other than the patch_root

scripts/slave/bot_update.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 # TODO(hinoka): Use logging.
 
 import cStringIO
 import codecs
 import collections
@@ skipping 1239 matching lines @@
   # Get a checkout of each solution, without DEPS or hooks.
   # Calling git directly because there is no way to run Gclient without
   # invoking DEPS.
   print 'Fetching Git checkout'
   git_ref = git_checkout(solutions, revisions, shallow, with_branch_heads)
 
   patches = None
   if patch_url:
     patches = get_svn_patch(patch_url)
 
+  already_patched = []
   for solution in solutions:
-    # At first, only patch top-level DEPS.
-    if patch_root == solution['name']:
+    if (patch_root == solution['name'] or
+        solution['name'].startswith(patch_root + '/')):
+      relative_root = solution['name'][len(patch_root) + 1:]

[Ryan Tseng, 2014/09/08 18:00:45]

blerg, I was trying to do this with more posixpath join/split operations rather
than string manipulations, but for the purpose of the P0 this'll do (also python
doesn't have any good way to do this out of the box).

[agable, 2014/09/08 18:23:24]

This is the generic path way. The only additional utility path gives us is
"common prefix", but that operates on a character level, not a path component
level, which means that it isn't actually helpful here.

+      target = '/'.join([relative_root, 'DEPS']).lstrip('/')
       if patches:
-        apply_svn_patch(patch_root, patches, whitelist=['DEPS'])
+        apply_svn_patch(patch_root, patches, whitelist=[target])
+        already_patched.append(target)

[Ryan Tseng, 2014/09/08 18:00:45]

This can be done outside of the if/else block (and named "potential_deps") to
save a line.

[agable, 2014/09/08 18:23:24]

I'd only be comfortable doing that if the below was an "else", not an "elif".
I'm only adding files to "already_patched" if they've actually already been
patched, not just if we thought we maybe should have patched them.

       elif issue:
         apply_rietveld_issue(issue, patchset, patch_root, rietveld_server,
-                            revision_mapping, git_ref, whitelist=['DEPS'])
-      break
+                            revision_mapping, git_ref, whitelist=[target])
+        already_patched.append(target)
 
   if buildspec:
     buildspecs2git(first_sln, buildspec)
   else:
     # Run deps2git if there is a DEPS change after the last .DEPS.git commit.
     for solution in solutions:
       ensure_deps2git(solution, shallow)
 
   # Ensure our build/ directory is set up with the correct .gclient file.
   gclient_configure(solutions, target_os, target_os_only)
@@ skipping 12 matching lines @@
     # TODO(hinoka): Remove this when the official builders run their own
     #               runhooks step.
     gclient_runhooks(gyp_env)
 
   # Finally, ensure that all DEPS are pinned to the correct revision.
   dir_names = [sln['name'] for sln in solutions]
   ensure_deps_revisions(gclient_output.get('solutions', {}),
                         dir_names, revisions)
   # Apply the rest of the patch here (sans DEPS)
   if patches:
-    apply_svn_patch(patch_root, patches, blacklist=['DEPS'])
+    apply_svn_patch(patch_root, patches, blacklist=already_patched)
   elif issue:
     apply_rietveld_issue(issue, patchset, patch_root, rietveld_server,
-                         revision_mapping, git_ref, blacklist=['DEPS'])
+                         revision_mapping, git_ref, blacklist=already_patched)
 
   # Reset the deps_file point in the solutions so that hooks get run properly.
   for sln in solutions:
     sln['deps_file'] = sln.get('deps_file', 'DEPS').replace('.DEPS.git', 'DEPS')
   gclient_configure(solutions, target_os, target_os_only)
 
   return gclient_output
 
 
 def parse_revisions(revisions, root):
@@ skipping 321 matching lines @@
   except Exception:
     # Unexpected failure.
     emit_flag(options.flag_file)
     raise
   else:
     emit_flag(options.flag_file)
 
 
 if __name__ == '__main__':
   sys.exit(main())