Reland: Use real revision mapping in bot_update module

scripts/slave/bot_update.py

 #!/usr/bin/env python
 # 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.
 
 import codecs
 import copy
 import cStringIO
 import ctypes
 import json
@@ skipping 585 matching lines @@
 def get_git_hash(revision, dir_name):
   match = "^git-svn-id: [^ ]*@%s " % create_less_than_or_equal_regex(revision)
   cmd = ['log', '-E', '--grep', match, '--format=%H', '--max-count=1']
   results = git(*cmd, cwd=dir_name).strip().splitlines()
   if results:
     return results[0]
   raise Exception('We can\'t resolve svn revision %s into a git hash' %
                   revision)
 
 
-def get_revision_mapping(root, addl_rev_map):
-  result = {}
-  if root in GOT_REVISION_MAPPINGS:
-    result.update(GOT_REVISION_MAPPINGS[root])
-  if addl_rev_map:
-    result.update(json.loads(addl_rev_map))
-  return result
-
-
 def _last_commit_for_file(filename, repo_base):
   cmd = ['log', '--format=%H', '--max-count=1', '--', filename]
   return git(*cmd, cwd=repo_base).strip()
 
 
 def need_to_run_deps2git(repo_base, deps_file, deps_git_file):
   """Checks to see if we need to run deps2git.
 
   Returns True if there was a DEPS change after the last .DEPS.git update.
   """
@@ skipping 218 matching lines @@
       if attempt == RETRIES - 1:
         raise
 
 
 def apply_issue_svn(root, patch_url):
   patch_data = call('svn', 'cat', patch_url)
   call(PATCH_TOOL, '-p0', '--remove-empty-files', '--force', '--forward',
        stdin_data=patch_data, cwd=root)
 
 
-def apply_issue_rietveld(issue, patchset, root, server, rev_map, revision):
+def apply_issue_rietveld(issue, patchset, root, server, _rev_map, revision):
   apply_issue_bin = ('apply_issue.bat' if sys.platform.startswith('win')
                      else 'apply_issue')
   call(apply_issue_bin,
        '--root_dir', root,
        '--issue', issue,
        '--patchset', patchset,
        '--no-auth',
        '--server', server,
        '--base_ref', revision,
        '--force',
@@ skipping 167 matching lines @@
   parse.add_option('--patch_url', help='Optional URL to SVN patch.')
   parse.add_option('--root', help='Repository root.')
   parse.add_option('--rietveld_server',
                    default='codereview.chromium.org',
                    help='Rietveld server.')
   parse.add_option('--specs', help='Gcilent spec.')
   parse.add_option('--master', help='Master name.')
   parse.add_option('-f', '--force', action='store_true',
                    help='Bypass check to see if we want to be run. '
                         'Should ONLY be used locally.')
-  parse.add_option('--revision_mapping')
-  parse.add_option('--revision-mapping')  # Backwards compatability.
+  parse.add_option('--revision_mapping',
+                   help='{"path/to/repo/": "property_name"}')
+  parse.add_option('--revision_mapping_file',
+                   help=('Same as revision_mapping, except its a path to a json'
+                         ' file containing that format.'))
+  parse.add_option('--revision-mapping', # Backwards compatability.
+                   help='DEPRECATED, use "revision_mapping" instead')
   # TODO(hinoka): Support root@revision format.
   parse.add_option('--revision',
                    help='Revision to check out. Can be an SVN revision number, '
                         'git hash, or any form of git ref.')
   parse.add_option('--slave_name', default=socket.getfqdn().split('.')[0],
                    help='Hostname of the current machine, '
                    'used for determining whether or not to activate.')
   parse.add_option('--builder_name', help='Name of the builder, '
                    'used for determining whether or not to activate.')
   parse.add_option('--build_dir', default=os.getcwd())
   parse.add_option('--flag_file', default=path.join(os.getcwd(),
                                                     'update.flag'))
   parse.add_option('--shallow', action='store_true',
                    help='Use shallow clones for cache repositories.')
   parse.add_option('--gyp_env', action='append', default=[],
                    help='Environment variables to pass into gclient runhooks.')
   parse.add_option('--clobber', action='store_true',
                    help='Delete checkout first, always')
   parse.add_option('-o', '--output_json',
                    help='Output JSON information into a specified file')
 
 
-  return parse.parse_args()
+  options, args = parse.parse_args()
+
+  try:
+    if options.revision_mapping_file is not None:

[hinoka, 2014/05/09 23:08:13]

"if options.revision_mapping_file" should be sufficient. same with 1065/1070

[iannucci, 2014/05/11 03:48:45]

Done.

+      if options.revision_mapping is not None:
+        print ('WARNING: revision_mapping_file was set at the same '
+               'time as revision_mapping?')

[hinoka, 2014/05/09 23:08:13]

nit: Add "Ignoring revision_mapping" to warning.

[iannucci, 2014/05/11 03:48:45]

Done.

+      with open(options.revision_mapping_file, 'r') as f:
+        options.revision_mapping = json.load(f)
+    elif options.revision_mapping is not None:
+      options.revision_mapping = json.loads(options.revision_mapping)
+  except Exception as e:
+    print (
+        'WARNING: Caught execption while parsing revision_mapping*: %s'
+        % (str(e),)
+    )
+
+  return options, args
 
 
 def main():
   # Get inputs.
   options, _ = parse_args()
   builder = options.builder_name
   slave = options.slave_name
   master = options.master
 
   # Check if this script should activate or not.
@@ skipping 100 matching lines @@
         shallow=options.shallow)
     gclient_output = ensure_checkout(**checkout_parameters)
   except GclientSyncFailed:
     print 'We failed gclient sync, lets delete the checkout and retry.'
     ensure_no_checkout(dir_names, '*')
     gclient_output = ensure_checkout(**checkout_parameters)
 
   # Revision is an svn revision, unless its a git master or past flag day.
   use_svn_rev = master not in GIT_MASTERS and not FLAG_DAY
   # Take care of got_revisions outputs.
-  revision_mapping = get_revision_mapping(svn_root, options.revision_mapping)
+  revision_mapping = GOT_REVISION_MAPPINGS.get(svn_root, {})
+  if options.revision_mapping:
+    revision_mapping.update(options.revision_mapping)
+
   got_revisions = parse_got_revision(gclient_output, revision_mapping,
                                      use_svn_rev)
 
   if options.output_json:
     # Tell recipes information such as root, got_revision, etc.
     emit_json(options.output_json,
               did_run=True,
               root=first_sln,
               patch_root=options.root,
               step_text=step_text,
@@ skipping 15 matching lines @@
                          specs=options.specs)
   all_threads.append(thr)
 
   # Sort of wait for all telemetry threads to finish.
   for thr in all_threads:
     thr.join(5)
 
 
 if __name__ == '__main__':
   sys.exit(main())