depot_tools/commit_queue: add command line flags for experimental and triggered builders

commit_queue.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """Access the commit queue from the command line.
 """
 
 __version__ = '0.1'
 
@@ skipping 149 matching lines @@
     {
       'master_name': [
         'builder_name',
         'another_builder'
       ],
       'another_master': [
         'third_builder'
       ]
     }
   """
-  _, args = parser.parse_args(args)
+  parser.add_option('--include-experimental', action='store_true')
+  parser.add_option('--exclude-experimental', action='store_false',
+                    dest='include_experimental')
+  parser.add_option('--include-triggered', action='store_true')
+  parser.add_option('--exclude-triggered', action='store_false',
+                    dest='include_triggered')
+  # The defaults have been chosen because of backward compatbility.
+  parser.set_defaults(include_experimental=True, include_triggered=True)
+  options, args = parser.parse_args(args)
   if len(args) != 1:
     parser.error('Expected a single path to CQ config. Got: %s' %
                  ' '.join(args))
-  print json.dumps(get_master_builder_map(args[0]))
+  print json.dumps(get_master_builder_map(
+      args[0],
+      include_experimental=options.include_experimental,
+      include_triggered=options.include_triggered))
 
 CMDbuilders.func_usage_more = '<path-to-cq-config>'
 
 
 def CMDvalidate(parser, args):
   """Validates a CQ config.
 
   Takes a single argument - path to the CQ config to be validated. Returns 0 on
   valid config, non-zero on invalid config. Errors and warnings are printed to
   screen.
@@ skipping 89 matching lines @@
   return CMDhelp(parser, args)
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   try:
     sys.exit(main())
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)