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 12 matching lines @@
         deps_file = Single(basestring, empty_val=deps, required=False,
                            hidden=False),
         managed = Single(bool, empty_val=True, required=False, hidden=False),
         custom_deps = Dict(value_type=(basestring, types.NoneType)),
         custom_vars = Dict(value_type=basestring),
         safesync_url = Single(basestring, required=False),
 
         revision = Single(
             (basestring, gclient_api.RevisionResolver),
             required=False, hidden=True),
+
+        # Maps patch_project to (solution, revision).
+        #  - solution is used also as patch root.
+        #  - if revision is given, it's passed to bot_update.
+        # 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
+        #     'v8': ('v8', 'HEAD')

[Michael Achenbach, 2016/04/25 09:32:42]

Stay in sync with below (includes src). Maybe provide a less intuitive example
where the solution and project names don't match.

[tandrii(chromium), 2016/04/25 11:39:50]

Done.

+        # then a v8 patch can be applied on a chromium checkout after synching v8
+        # to it's master HEAD.
+        patch_projects = Dict(value_type=tuple),
       )
     ),
     deps_os = Dict(value_type=basestring),
     hooks = List(basestring),
     target_os = Set(basestring),
     target_os_only = Single(bool, empty_val=False, required=False),
     cache_dir = Static(cache_dir, hidden=False),
 
     # If supplied, use this as the source root (instead of the first solution's
     # checkout).
@@ skipping 96 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 = s.patch_projects

[Michael Achenbach, 2016/04/25 09:32:42]

I'd make this global, i.e. c.patch_projects, as the solution name is part of the
first item of the tuples.

[tandrii(chromium), 2016/04/25 11:39:50]

Done.

+  p['v8'] = ('src/v8', 'HEAD')

[tandrii(chromium), 2016/04/22 15:59:10]

for gerrit, this row would be duplicated with
  'v8/v8' = ('src/v8', 'HEAD')

+  p['angle/angle'] = ('src/third_party/angle', None)

[tandrii(chromium), 2016/04/22 15:59:10]

this is how gerrit looks.

+  p['blink'] = ('src/third_party/WebKit', None)

[tandrii(chromium), 2016/04/22 15:59:10]

machenbach@ i decided to specify the the full path here instead of omitting src
for consistency, as that's what code 15 lines above does anyway.

[Michael Achenbach, 2016/04/25 09:32:42]

Does blink still exist in this context? Keep it around if the old code had it.

[tandrii(chromium), 2016/04/25 11:39:50]

kept as is, but yes, i think i'll clean it up with all the todos in subsequent
CLs.

+  # TODO(tandrii): can this be done automatically for all solutions,
+  # instead of copy-pasting these 3 lines to very solution?
+  # If so, remove occurrencies in this file.
+  path, revision = s.patch_projects.get(c.PATCH_PROJECT, (None, None))

[Michael Achenbach, 2016/04/25 09:32:42]

Move to bot_update ensure_checkout and maybe to gclient sync.

[tandrii(chromium), 2016/04/25 11:39:50]

Done.

+  if path and revision:
+    c.revisions[path] = revision
 
 @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 = soln.patch_projects
+  p['luci-py'] = ('infra/luci', 'HEAD')
+  p['recipes-py'] = ('infra/recipes-py', 'HEAD')
+  # TODO(tandrii): can this be done automatically for all solutions,
+  # instead of copy-pasting these 3 lines to very solution?
+  # If so, remove occurrencies in this file.
+  path, revision = soln.patch_projects.get(c.PATCH_PROJECT, (None, None))
+  if path and revision:
+    c.revisions[path] = revision
+
 @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')