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 965 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()
+  opts, args = parse.parse_args()

[Ryan Tseng, 2014/05/09 21:33:21]

nit: options? for consistency below.

[iannucci, 2014/05/09 22:11:52]

Done.

+
+  if opts.revision_mapping_file is not None:
+    if opts.revision_mapping is not None:
+      print ('WARNING: revision_mapping_file was set at the same '
+             'time as revision_mapping?')
+    with open(opts.revision_mapping_file, 'r') as f:
+      opts.revision_mapping = json.load(f)
+
+  return opts, 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 106 matching lines @@
               patch_root=options.root,
               step_text=step_text,
               properties=got_revisions)
   else:
     # If we're not on recipes, tell annotator about our got_revisions.
     emit_properties(got_revisions)
 
 
 if __name__ == '__main__':
   sys.exit(main())