Reland: Use real revision mapping in bot_update module

scripts/slave/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 slave import recipe_api
 
@@ skipping 72 matching lines @@
                 self.m.properties.get('revision'))
     # Issue and patchset must come together.
     if issue:
       assert patchset
     if patchset:
       assert issue
     if patch_url:
       # If patch_url is present, bot_update will actually ignore issue/ps.
       issue = patchset = None
 
+    rev_map = {}
+    if self.m.gclient.c:
+      rev_map = self.m.gclient.c.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', spec_string],
         ['--root', root],
         ['--revision', revision],
-        ['--revision_mapping', self.m.properties.get('revision_mapping')],
+        ['--revision_mapping_file', self.m.json.input(rev_map)],
 
         # 3. How to find the patch, if any (issue/patchset/patch_url).
         ['--issue', issue],
         ['--patchset', patchset],
         ['--patch_url', patch_url],
 
         # 4. Hookups to JSON output back into recipes.
         ['--output_json', self.m.json.output()],]
 
     # Filter out flags that are None.
     cmd = [item for flag_set in flags
            for item in flag_set if flag_set[1] is not None]
 
     # Inject Json output for testing.
-    try:
-      revision_map_data = self.m.gclient.c.got_revision_mapping
-    except AttributeError:
-      revision_map_data = {}
     git_mode = self.m.properties.get('mastername') in GIT_MASTERS
     first_sln = cfg.solutions[0].name
-    step_test_data = lambda : self.test_api.output_json(master,
-                                                        builder,
-                                                        slave,
-                                                        root,
-                                                        first_sln,
-                                                        revision_map_data,
-                                                        git_mode)
+    step_test_data = lambda: self.test_api.output_json(
+        master, builder, slave, root, first_sln, rev_map, git_mode)
 
     def followup_fn(step_result):
       if update_presentation:
         # Set properties such as got_revision.
         if 'properties' in step_result.json.output:
           properties = step_result.json.output['properties']
           for prop_name, prop_value in properties.iteritems():
             step_result.presentation.properties[prop_name] = prop_value
       # Add helpful step description in the step UI.
       if 'step_text' in step_result.json.output:
@@ skipping 14 matching lines @@
     # Set the "checkout" path for the main solution.
     # This is used by the Chromium module to figure out where to look for
     # the checkout.
     bot_update_step = self.m.step_history.last_step()
     # bot_update actually just sets root to be the folder name of the
     # first solution.
     if bot_update_step.json.output['did_run']:
       co_root = bot_update_step.json.output['root']
       cwd = kwargs.get('cwd', self.m.path['slave_build'])
       self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep))