Generalize patch_project to patch root conversion.

recipe_modules/bot_update/api.py

 # 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.
 
 
 """Recipe module to ensure a checkout is consistant on a bot."""
 
 from recipe_engine import recipe_api
 
 
@@ skipping 67 matching lines @@
     cfg = gclient_config or self.m.gclient.c
 
     # Used by bot_update to determine if we want to run or not.
     master = self._mastername
     builder = self._buildername
     slave = self._slavename
 
     # Construct our bot_update command.  This basically be inclusive of
     # everything required for bot_update to know:
     root = patch_root
+    if root == 'TODO(TANDRII): REMOVE THIS TRANSITION TO patch_projects':
+      # This special condition is here for initial rollout of this code,
+      # because it's hard to test this change without rolling into build
+      # repository.
+      # After the switch to new code is complete, this special TODOstring will
+      # be removed in favor of "root is None"
+      assert patch_project_roots is None
+      root = self.m.gclient.calculate_patch_root(
+          self.m.properties.get('patch_project'), cfg)
+      # TODO(tandrii): get rid the condition below after transition.
+
     if root is None:
       root = cfg.solutions[0].name
       additional = self.m.rietveld.calculate_issue_root(patch_project_roots)
       if additional:
         root = self.m.path.join(root, additional)
 
     if patch:
       issue = issue or self._issue
       patchset = patchset or self._patchset
       patch_url = self._patch_url
@@ skipping 23 matching lines @@
     # Point to the oauth2 auth files if specified.
     # These paths are where the bots put their credential files.
     if patch_oauth2:
       email_file = self.m.path['build'].join(
           'site_config', '.rietveld_client_email')
       key_file = self.m.path['build'].join(
           'site_config', '.rietveld_secret_key')
     else:
       email_file = key_file = None
 
+    # Allow patch_project's revision if necessary.
+    # This is important for projects which are checked out as DEPS of the
+    # gclient solution.
+    self.m.gclient.set_patch_project_revision(
+        self.m.properties.get('patch_project'), cfg)
+
     rev_map = cfg.got_revision_mapping.as_jsonish()
 
     flags = [
         # 1. Do we want to run? (master/builder/slave).
         ['--master', master],
         ['--builder', builder],
         ['--slave', slave],
 
         # 2. What do we want to check out (spec/root/rev/rev_map).
         ['--spec', self.m.gclient.config_to_pythonish(cfg)],
@@ skipping 129 matching lines @@
 
       # bot_update actually just sets root to be the folder name of the
       # first solution.
       if step_result.json.output['did_run']:
         co_root = step_result.json.output['root']
         cwd = kwargs.get('cwd', self.m.path['slave_build'])
         if 'checkout' not in self.m.path:
           self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep))
 
     return step_result