git cl try: remove --use-rietveld and related code.

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld and Gerrit."""
 
 from __future__ import print_function
@@ skipping 4652 matching lines @@
   group.add_option(
       '-p', '--property', dest='properties', action='append', default=[],
       help='Specify generic properties in the form -p key1=value1 -p '
            'key2=value2 etc. The value will be treated as '
            'json if decodable, or as string otherwise. '
            'NOTE: using this may make your try job not usable for CQ, '
            'which will then schedule another try job with default properties')
   # TODO(tandrii): if this even used?
   group.add_option(
       '-n', '--name', help='Try job name; default to current branch name')
-  # TODO(tandrii): get rid of this.
-  group.add_option(
-      '--use-rietveld', action='store_true', default=False,
-      help='DEPRECATED, NOT SUPPORTED.')
   group.add_option(
       '--buildbucket-host', default='cr-buildbucket.appspot.com',
       help='Host of buildbucket. The default host is %default.')
   parser.add_option_group(group)
   auth.add_auth_options(parser)
   options, args = parser.parse_args(args)
   auth_config = auth.extract_auth_config_from_options(options)
 
-  if options.use_rietveld:
-    parser.error('--use-rietveld is not longer supported.')
-
   # Make sure that all properties are prop=value pairs.
   bad_params = [x for x in options.properties if '=' not in x]
   if bad_params:
     parser.error('Got properties with missing "=": %s' % bad_params)
 
   if args:
     parser.error('Unknown arguments: %s' % args)
 
   cl = Changelist(auth_config=auth_config)
   if not cl.GetIssue():
@@ skipping 107 matching lines @@
             '  Instead send your job to the parent.\n'
             'Bot list: %s' % builders, file=sys.stderr)
       return 1
 
   patchset = cl.GetMostRecentPatchset()
   if patchset and patchset != cl.GetPatchset():
     print(
         '\nWARNING Mismatch between local config and server. Did a previous '
         'upload fail?\ngit-cl try always uses latest patchset from rietveld. '
         'Continuing using\npatchset %s.\n' % patchset)
-  if not options.use_rietveld:
-    try:
-      trigger_try_jobs(auth_config, cl, options, masters, 'git_cl_try')
-    except BuildbucketResponseException as ex:
-      print('ERROR: %s' % ex)
-      return 1
-    except Exception as e:
-      stacktrace = (''.join(traceback.format_stack()) + traceback.format_exc())
-      print('ERROR: Exception when trying to trigger try jobs: %s\n%s' %
-            (e, stacktrace))
-      return 1
-  else:
-    try:
-      cl.RpcServer().trigger_distributed_try_jobs(
-          cl.GetIssue(), patchset, options.name, options.clobber,
-          options.revision, masters)
-    except urllib2.HTTPError as e:
-      if e.code == 404:
-        print('404 from rietveld; '
-              'did you mean to use "git try" instead of "git cl try"?')
-        return 1
-    print('Tried jobs on:')
-
-    for (master, builders) in sorted(masters.iteritems()):
-      if master:
-        print('Master: %s' % master)
-      length = max(len(builder) for builder in builders)
-      for builder in sorted(builders):
-        print('  %*s: %s' % (length, builder, ','.join(builders[builder])))
+  try:
+    trigger_try_jobs(auth_config, cl, options, masters, 'git_cl_try')
+  except BuildbucketResponseException as ex:
+    print('ERROR: %s' % ex)
+    return 1
+  except Exception as e:
+    stacktrace = (''.join(traceback.format_stack()) + traceback.format_exc())
+    print('ERROR: Exception when trying to trigger try jobs: %s\n%s' %
+          (e, stacktrace))
+    return 1
   return 0
 
 
 def CMDtry_results(parser, args):
   """Prints info about try jobs associated with current CL."""
   group = optparse.OptionGroup(parser, 'Try job results options')
   group.add_option(
       '-p', '--patchset', type=int, help='patchset number if not current.')
   group.add_option(
       '--print-master', action='store_true', help='print master name as well.')
@@ skipping 482 matching lines @@
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   setup_color.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)