Activate calling push-to-trunk in auto-roll script.

tools/push-to-trunk/auto_roll.py

 #!/usr/bin/env python
 # Copyright 2013 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
@@ skipping 16 matching lines @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import json
 import optparse
 import os
 import re
 import sys
 import urllib
 
 from common_includes import *
+import push_to_trunk
+from push_to_trunk import PushToTrunkOptions
+from push_to_trunk import RunPushToTrunk
 
 SETTINGS_LOCATION = "SETTINGS_LOCATION"
 
 CONFIG = {
   PERSISTFILE_BASENAME: "/tmp/v8-auto-roll-tempfile",
   DOT_GIT_LOCATION: ".git",
   SETTINGS_LOCATION: "~/.auto-roll",
 }
 
 
 class AutoRollOptions(CommonOptions):
   def __init__(self, options):
     super(AutoRollOptions, self).__init__(options)
     self.requires_editor = False
     self.status_password = options.status_password
+    self.r = options.r
+    self.c = options.c
+    self.push = getattr(options, 'push', False)
 
 
 class Preparation(Step):
   MESSAGE = "Preparation."
 
   def RunStep(self):
     self.InitialEnvironmentChecks()
     self.CommonPrepare()
 
 
@@ skipping 81 matching lines @@
     self.RestoreIfUnset("lkgr")
     self.RestoreIfUnset("tree_message")
     latest = int(self._state["latest"])
     lkgr = int(self._state["lkgr"])
     if latest == lkgr:
       print "ToT (r%d) is clean. Pushing to trunk." % latest
       self.PushTreeStatus("Tree is closed (preparing to push)")
 
       # TODO(machenbach): Call push to trunk script.
       # TODO(machenbach): Update the script before calling it.
-      # self._side_effect_handler.Command(
-      #     "tools/push-to-trunk/push-to-trunk.py",
-      #     "-f -c %s -r %s" % (self._options.c, self._options.r))
-      self.PushTreeStatus(self._state["tree_message"])
+      try:
+        if self._options.push:
+          self._side_effect_handler.Call(
+              RunPushToTrunk,
+              push_to_trunk.CONFIG,
+              PushToTrunkOptions.MakeForcedOptions(self._options.r,
+                                                   self._options.c),
+              self._side_effect_handler)
+      finally:
+        self.PushTreeStatus(self._state["tree_message"])
     else:
       print("ToT (r%d) is ahead of the LKGR (r%d). Skipping push to trunk."
             % (latest, lkgr))
 
 
 def RunAutoRoll(config,
                 options,
                 side_effect_handler=DEFAULT_SIDE_EFFECT_HANDLER):
   step_classes = [
     Preparation,
     CheckAutoRollSettings,
     CheckTreeStatus,
     FetchLatestRevision,
     CheckLastPush,
     FetchLKGR,
     PushToTrunk,
   ]
   RunScript(step_classes, config, options, side_effect_handler)
 
 
 def BuildOptions():
   result = optparse.OptionParser()
   result.add_option("-c", "--chromium", dest="c",
                     help=("Specify the path to your Chromium src/ "
                           "directory to automate the V8 roll."))
+  result.add_option("-p", "--push",
+                    help="Push to trunk if possible. Dry run if unspecified.",
+                    default=False, action="store_true")
   result.add_option("-r", "--reviewer", dest="r",
                     help=("Specify the account name to be used for reviews."))
   result.add_option("-s", "--step", dest="s",
                     help="Specify the step where to start work. Default: 0.",
                     default=0, type="int")
   result.add_option("--status-password",
                     help="A file with the password to the status app.")
   return result
 
 
 def Main():
   parser = BuildOptions()
   (options, args) = parser.parse_args()
   if not options.c or not options.r:
     print "You need to specify the chromium src location and a reviewer."
     parser.print_help()
     return 1
   RunAutoRoll(CONFIG, AutoRollOptions(options))
 
 if __name__ == "__main__":
   sys.exit(Main())