Merge revision 13627 to trunk.

dart/editor/build/promote.py

Index: dart/editor/build/promote.py
===================================================================
--- dart/editor/build/promote.py	(revision 13623)
+++ dart/editor/build/promote.py	(working copy)
@@ -15,6 +15,7 @@
 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'
@@ -54,6 +55,7 @@
   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',
@@ -72,6 +74,9 @@
   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')
@@ -112,8 +117,9 @@
       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:
@@ -146,6 +152,9 @@
   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