Add support for new-style trybot specifications to git_cl.py.

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."""
 
 from distutils.version import LooseVersion
@@ skipping 2079 matching lines @@
         change.LocalPaths(),
         settings.GetRoot(),
         None,
         None,
         options.verbose,
         sys.stdout)
   if not options.bot:
     parser.error('No default try builder to try, use --bot')
 
   builders_and_tests = {}
-  for bot in options.bot:
+  old_style = filter(lambda x: isinstance(x, basestring), options.bot)
+  new_style = filter(lambda x: isinstance(x, tuple), options.bot)
+
+  for bot in old_style:
     if ':' in bot:
       builder, tests = bot.split(':', 1)
       builders_and_tests.setdefault(builder, []).extend(tests.split(','))
     elif ',' in bot:
       parser.error('Specify one bot per --bot flag')
     else:
       builders_and_tests.setdefault(bot, []).append('defaulttests')
 
+  for bot, tests in new_style:
+    builders_and_tests.setdefault(bot, []).extend(tests)
+
   if options.testfilter:
     forced_tests = sum((t.split(',') for t in options.testfilter), [])
     builders_and_tests = dict(
       (b, forced_tests) for b, t in builders_and_tests.iteritems()
       if t != ['compile'])
 
   if any('triggered' in b for b in builders_and_tests):
     print >> sys.stderr, (
         'ERROR You are trying to send a job to a triggered bot.  This type of'
         ' bot requires an\ninitial job from a parent (usually a builder).  '
@@ skipping 243 matching lines @@
         ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
           'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
 
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   colorama.init()
   sys.exit(main(sys.argv[1:]))