Revert of Bot update cleanup

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
 
 
+# This is just for testing, to indicate if a master is using a Git scheduler
+# or not.
+SVN_MASTERS = (
+    'experimental.svn',
+)
+
 
 def jsonish_to_python(spec, is_top=False):
   """Turn a json spec into a python parsable object.
 
   This exists because Gclient specs, while resembling json, is actually
   ingested using a python "eval()".  Therefore a bit of plumming is required
   to turn our newly constructed Gclient spec into a gclient-readable spec.
   """
   ret = ''
   if is_top:  # We're the 'top' level, so treat this dict as a suite.
@@ skipping 33 matching lines @@
     kwargs.setdefault('env', {})
     kwargs['env'].setdefault('PATH', '%(PATH)s')
     kwargs['env']['PATH'] = self.m.path.pathsep.join([
         kwargs['env']['PATH'], str(self._module.PACKAGE_DIRECTORY)])
     return self.m.python(name, bot_update_path, cmd, **kwargs)
 
   @property
   def properties(self):
       return self._properties
 
-  # Note: force is ignored.
   def ensure_checkout(self, gclient_config=None, suffix=None,
                       patch=True, update_presentation=True,
-                      force=True, patch_root=None, no_shallow=False,
+                      force=False, patch_root=None, no_shallow=False,
                       with_branch_heads=False, refs=None,
                       patch_project_roots=None, patch_oauth2=False,
                       output_manifest=True, clobber=False,
                       root_solution_revision=None, **kwargs):
     refs = refs or []
     # We can re-use the gclient spec from the gclient module, since all the
     # data bot_update needs is already configured into the gclient spec.
     cfg = gclient_config or self.m.gclient.c
     spec_string = jsonish_to_python(cfg.as_jsonish(), True)
 
+    # Used by bot_update to determine if we want to run or not.
+    master = self.m.properties['mastername']
+    builder = self.m.properties['buildername']
+    slave = self.m.properties['slavename']
+
     # Construct our bot_update command.  This basically be inclusive of
     # everything required for bot_update to know:
     root = patch_root
     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:
@@ skipping 31 matching lines @@
       key_file = self.m.path['build'].join(
           'site_config', '.rietveld_secret_key')
     else:
       email_file = key_file = None
 
     rev_map = {}
     if self.m.gclient.c:
       rev_map = self.m.gclient.c.got_revision_mapping.as_jsonish()
 
     flags = [
-        # 1. What do we want to check out (spec/root/rev/rev_map).
+        # 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_mapping_file', self.m.json.input(rev_map)],
         ['--git-cache-dir', self.m.path['git_cache']],
 
-        # 2. How to find the patch, if any (issue/patchset/patch_url).
+        # 3. How to find the patch, if any (issue/patchset/patch_url).
         ['--issue', issue],
         ['--patchset', patchset],
         ['--patch_url', patch_url],
         ['--rietveld_server', self.m.properties.get('rietveld')],
         ['--gerrit_repo', gerrit_repo],
         ['--gerrit_ref', gerrit_ref],
         ['--apply_issue_email_file', email_file],
         ['--apply_issue_key_file', key_file],
 
-        # 3. Hookups to JSON output back into recipes.
+        # 4. Hookups to JSON output back into recipes.
         ['--output_json', self.m.json.output()],]
 
 
     # Collect all fixed revisions to simulate them in the json output.
     # Fixed revision are the explicit input revisions of bot_update.py, i.e.
     # every command line parameter "--revision name@value".
     fixed_revisions = {}
 
     revisions = {}
     for solution in cfg.solutions:
@@ skipping 19 matching lines @@
     # Add extra fetch refspecs.
     for ref in refs:
       flags.append(['--refs', ref])
 
     # 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]
 
     if clobber:
       cmd.append('--clobber')
+    if force:
+      cmd.append('--force')
     if no_shallow:
       cmd.append('--no_shallow')
     if output_manifest:
       cmd.append('--output_manifest')
     if with_branch_heads or cfg.with_branch_heads:
       cmd.append('--with_branch_heads')
 
     # Inject Json output for testing.
+    git_mode = self.m.properties.get('mastername') not in SVN_MASTERS
     first_sln = cfg.solutions[0].name
     step_test_data = lambda: self.test_api.output_json(
-        root, first_sln, rev_map, self.m.properties.get('fail_patch', False),
+        master, builder, slave, root, first_sln, rev_map, git_mode, force,
+        self.m.properties.get('fail_patch', False),
         output_manifest=output_manifest, fixed_revisions=fixed_revisions)
 
     # Add suffixes to the step name, if specified.
     name = 'bot_update'
     if not patch:
       name += ' (without patch)'
     if suffix:
       name += ' - %s' % suffix
 
     # Ah hah! Now that everything is in place, lets run bot_update!
@@ skipping 47 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