Generalize patch_project to patch root conversion.

recipe_modules/gclient/config.py

 # Copyright 2013 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.
 
 import types
 
 from recipe_engine.config import config_item_context, ConfigGroup, BadConf
 from recipe_engine.config import ConfigList, Dict, Single, Static, Set, List
 
 from . import api as gclient_api
@@ skipping 45 matching lines @@
     #   to the solution.revision field is really terrible. I mostly blame
     #   gclient.
     # Maps 'parent_build_property' -> 'custom_var_name'
     # Maps 'parent_build_property' -> None
     # If value is None, the property value will be applied to
     # solutions[0].revision. Otherwise, it will be applied to
     # solutions[0].custom_vars['custom_var_name']
     parent_got_revision_mapping = Dict(hidden=True),
     delete_unversioned_trees = Single(bool, empty_val=True, required=False),
 
+    # Maps patch_project to (solution/path, revision).
+    #  - solution/path is then used to apply patches as patch root in
+    #    bot_update.
+    #  - if revision is given, it's passed verbatim to bot_update for
+    #    corresponding dependency.
+    # This is essentially a whitelist of which projects inside a solution
+    # can be patched automatically by bot_update based on PATCH_PROJECT
+    # property.
+    # For example, bare chromium solution has this entry in patch_projects
+    #     'angle/angle': ('src/third_party/angle', 'HEAD')
+    # then a patch to Angle project can be applied to a chromium src's
+    # checkout after first updating Angle's repo to its master's HEAD.
+    patch_projects = Dict(value_type=tuple, hidden=True),
+
     # Check out refs/branch-heads.
     # TODO (machenbach): Only implemented for bot_update atm.
     with_branch_heads = Single(
         bool,
         empty_val=False,
         required=False,
         hidden=True),
 
     GIT_MODE = Static(bool(GIT_MODE)),
     USE_MIRROR = Static(bool(USE_MIRROR)),
+    # TODO(tandrii): remove PATCH_PROJECT field.
+    # DON'T USE THIS. WILL BE REMOVED.
     PATCH_PROJECT = Static(str(PATCH_PROJECT), hidden=True),
     BUILDSPEC_VERSION= Static(BUILDSPEC_VERSION, hidden=True),
   )
 
 config_ctx = config_item_context(BaseConfig)
 
 def ChromiumSvnSubURL(c, *pieces):
   BASES = ('https://src.chromium.org',
            'svn://svn-mirror.golo.chromium.org')
   return '/'.join((BASES[c.USE_MIRROR],) + pieces)
@@ skipping 53 matching lines @@
   m['src/third_party/webrtc'] = 'got_webrtc_revision'
 
   p = c.parent_got_revision_mapping
   p['parent_got_revision'] = None
   p['parent_got_angle_revision'] = 'angle_revision'
   p['parent_got_nacl_revision'] = 'nacl_revision'
   p['parent_got_swarming_client_revision'] = 'swarming_revision'
   p['parent_got_v8_revision'] = 'v8_revision'
   p['parent_got_webrtc_revision'] = 'webrtc_revision'
 
-  # Patch project revisions are applied whenever patch_project is set. E.g. if
-  # a v8 stand-alone patch is sent to a chromium trybot, patch_project is v8
-  # and can be used to sync v8 to HEAD instead of the pinned chromium
-  # version.
-  patch_project_revisions = {
-    'v8': ('src/v8', 'HEAD'),
-  }
-
-  patch_revision = patch_project_revisions.get(c.PATCH_PROJECT)
-  # TODO(phajdan.jr): Move to proper repo and add coverage.
-  if patch_revision:  # pragma: no cover
-    c.revisions[patch_revision[0]] = patch_revision[1]
+  p = c.patch_projects
+  p['v8'] = ('src/v8', 'HEAD')
+  p['angle/angle'] = ('src/third_party/angle', None)
+  p['blink'] = ('src/third_party/WebKit', None)
 
 @config_ctx(includes=['chromium_bare'])
 def chromium_empty(c):
   c.solutions[0].deps_file = ''  # pragma: no cover
 
 @config_ctx(includes=['chromium_bare'])
 def chromium(c):
   s = c.solutions[0]
   s.custom_deps = mirror_only(c, {})
 
@@ skipping 360 matching lines @@
   soln.deps_file = 'DEPS'
   soln.managed = False
 
 @config_ctx(config_vars={'GIT_MODE': True})
 def infra(c):
   soln = c.solutions.add()
   soln.name = 'infra'
   soln.url = 'https://chromium.googlesource.com/infra/infra.git'
   c.got_revision_mapping['infra'] = 'got_revision'
 
+  p = c.patch_projects
+  p['luci-py'] = ('infra/luci', 'HEAD')
+  p['recipes-py'] = ('infra/recipes-py', 'HEAD')
+
 @config_ctx(config_vars={'GIT_MODE': True})
 def infra_internal(c):  # pragma: no cover
   soln = c.solutions.add()
   soln.name = 'infra_internal'
   soln.url = 'https://chrome-internal.googlesource.com/infra/infra_internal.git'
   c.got_revision_mapping['infra_internal'] = 'got_revision'
 
 @config_ctx(includes=['infra'])
 def luci_gae(c):
   # luci/gae is checked out as a part of infra.git solution at HEAD.
@@ skipping 14 matching lines @@
       gclient_api.RevisionFallbackChain('origin/master'))
   m = c.got_revision_mapping
   del m['infra']
   m['infra/go/src/github.com/luci/luci-go'] = 'got_revision'
 
 @config_ctx(includes=['infra'])
 def luci_py(c):
   # luci-py is checked out as part of infra just to have appengine
   # pre-installed, as that's what luci-py PRESUBMIT relies on.
   c.revisions['infra'] = 'origin/master'
+  # TODO(tandrii): make use of c.patch_projects.
   c.revisions['infra/luci'] = (
       gclient_api.RevisionFallbackChain('origin/master'))
   m = c.got_revision_mapping
   del m['infra']
   m['infra/luci'] = 'got_revision'
 
 @config_ctx(includes=['infra'])
 def recipes_py(c):
   c.revisions['infra'] = 'origin/master'
+  # TODO(tandrii): make use of c.patch_projects.
   c.revisions['infra/recipes-py'] = (
       gclient_api.RevisionFallbackChain('origin/master'))
   m = c.got_revision_mapping
   del m['infra']
   m['infra/recipes-py'] = 'got_revision'
 
 @config_ctx()
 def chrome_from_buildspec(c):  # pragma: no cover
   soln = c.solutions.add()
   soln.name = 'chrome_from_buildspec'
@@ skipping 33 matching lines @@
               'GoogleChrome/custom-tabs-client.git')
   c.got_revision_mapping['custom_tabs_client'] = 'got_revision'
 
 # TODO(phajdan.jr): Move to proper repo and add coverage.
 @config_ctx()
 def angle_top_of_tree(c):  # pragma: no cover
   """Configures the top-of-tree ANGLE in a Chromium checkout.
 
   Sets up ToT instead of the DEPS-pinned revision for ANGLE.
   """
+  # TODO(tandrii): I think patch_projects in bare_chromium fixed this.
   c.solutions[0].revision = 'HEAD'
   c.revisions['src/third_party/angle'] = 'HEAD'
 
 @config_ctx()
 def gerrit_test_cq_normal(c):
   soln = c.solutions.add()
   soln.name = 'gerrit-test-cq-normal'
   soln.url = 'https://chromium.googlesource.com/playground/gerrit-cq/normal.git'
 
 # TODO(phajdan.jr): Move to proper repo and add coverage.
 @config_ctx()
 def valgrind(c):  # pragma: no cover
   """Add Valgrind binaries to the gclient solution."""
   c.solutions[0].custom_deps['src/third_party/valgrind'] = \
     ChromiumGitURL(c, 'chromium', 'deps', 'valgrind', 'binaries')