Merge revision 13627 to trunk.

dart/editor/build/promote.py

 #!/usr/bin/env python
 # 
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 # Dart Editor promote and google storage cleanup tools.
 
 import gsutil
 import optparse
 import os
 import subprocess
 import sys
 
 from os.path import join
 
 CONTINUOUS = 'gs://dart-editor-archive-continuous'
+TRUNK = 'gs://dart-editor-archive-trunk'
 TESTING = 'gs://dart-editor-archive-testing'
 INTEGRATION = 'gs://dart-editor-archive-integration'
 RELEASE = 'gs://dart-editor-archive-release'
 
 DART_PATH = os.path.join('..', '..', '..', 'dart')
 
 def _BuildOptions():
   """Setup the argument processing for this program.
 
   Returns:
@@ skipping 19 matching lines @@
 
       promote revision 567 from integration to release
         python gsTool.py promote --integration --revision=567"""
 
 
   result = optparse.OptionParser(usage=usage)
   result.set_default('gsbucketuri', 'gs://dart-editor-archive-continuous')
   result.set_default('keepcount', 1000)
   result.set_default('dryrun', False)
   result.set_default('continuous', False)
+  result.set_default('trunk', False)
   result.set_default('integration', False)
   result.set_default('testing', False)
   group = optparse.OptionGroup(result, 'Cleanup',
                                'options used to cleanup Google Storage')
   group.add_option('--keepcount',
                    type='int',
                    help='Numer of Builds to keep.',
                    action='store')
   result.add_option_group(group)
 
   group = optparse.OptionGroup(result, 'Promote',
                                'options used to promote code')
   group.add_option('--revision',
                    help='The svn revision to promote',
                    action='store')
   group.add_option('--continuous',
                    help='Promote from continuous',
                    action='store_true')
+  group.add_option('--trunk',
+                   help='Promote from trunk',
+                   action='store_true')
   group.add_option('--integration',
                    help='Promote from integration',
                    action='store_true')
   result.add_option_group(group)
 
   result.add_option('--gsbucketuri',
                     help='Dart Continuous Google Storage bucket URI.',
                     action='store')
   result.add_option('--gsutilloc',
                     help='location of gsutil the program',
@@ skipping 20 matching lines @@
     print 'At least one command must be specified'
     parser.print_help()
     sys.exit(1)
 
   if args[0] == 'promote':
     command = 'promote'
     if options.revision is None:
       print 'You must specify a --revision to specify which revision to promote'
       parser.print_help()
       sys.exit(3)
-    if not (options.continuous or options.integration or options.testing):
-      print 'You must specify one of --continuous or --integration or --testing'
+    if not (options.continuous or options.integration or 
+            options.testing or options.trunk):
+      print 'You must specify --continuous, --integration, --testing, or --trunk'
       parser.print_help()
       sys.exit(4)
     if options.continuous and options.integration:
       print 'continuous and integration can not be specified at the same time'
       parser.print_help()
       sys.exit(5)
     if (options.continuous or options.integration) and options.testing:
       print """Warning --continuous or --integration  and --testing are
        specified.  The --testing flag will take precedence and all data will
        go to the testing bucket {0}""".format(TESTING)
@@ skipping 12 matching lines @@
 
   if options.testing:
     bucket_from = CONTINUOUS
     bucket_to = TESTING
     print """The --testing attribute is specified.  All data will go to the
     testing bucket {0}.  Press enter to continue""".format(TESTING)
     raw_input('Press Enter to continue')
   elif options.continuous:
     bucket_from = CONTINUOUS
     bucket_to = INTEGRATION
+  elif options.trunk:
+    bucket_from = TRUNK
+    bucket_to = INTEGRATION
   elif options.integration:
     bucket_from = INTEGRATION
     bucket_to = RELEASE
 
   if command == 'cleanup':
     #if the testing flag is set remove the date from the testing bucket
     if options.testing:
       bucket = TESTING
     #otherwise use the value passed as --gsbucketuri
     else:
@@ skipping 106 matching lines @@
   if directory is not None:
     cwd = os.getcwd()
     os.chdir(directory)
   subprocess.call(cmd, env=os.environ)
   if directory is not None:
     os.chdir(cwd)
 
 
 if __name__ == '__main__':
   sys.exit(main())