1935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org#!/usr/bin/env python 2935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# Copyright 2013 the V8 project authors. All rights reserved. 3935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# Redistribution and use in source and binary forms, with or without 4935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# modification, are permitted provided that the following conditions are 5935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# met: 6935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# 7935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# * Redistributions of source code must retain the above copyright 8935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# notice, this list of conditions and the following disclaimer. 9935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# * Redistributions in binary form must reproduce the above 10935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# copyright notice, this list of conditions and the following 11935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# disclaimer in the documentation and/or other materials provided 12935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# with the distribution. 13935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# * Neither the name of Google Inc. nor the names of its 14935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# contributors may be used to endorse or promote products derived 15935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# from this software without specific prior written permission. 16935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# 17935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 18935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 19935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 20935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 29f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.orgimport argparse 3042ed2fc449e83fab2ccbf1b769a5e83715c9d783machenbach@chromium.orgimport os 31935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.orgimport sys 32935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.orgimport tempfile 3337be408adf363bbe682921a4a690752fa0ec33femachenbach@chromium.orgimport urllib2 34935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 35935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.orgfrom common_includes import * 36935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 37f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.orgPUSH_MESSAGE_SUFFIX = " (based on bleeding_edge revision r%d)" 38f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.orgPUSH_MESSAGE_RE = re.compile(r".* \(based on bleeding_edge revision r(\d+)\)$") 39f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org 40935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.orgclass Preparation(Step): 4190dca01eac542464c29011d239bf18f26e0b8f00machenbach@chromium.org MESSAGE = "Preparation." 42935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 43935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org def RunStep(self): 44a2c0c1516848536a514b3178d2c040b7df0ceb5bmachenbach@chromium.org self.InitialEnvironmentChecks(self.default_cwd) 45935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org self.CommonPrepare() 46af6f699b0be532b73bc2f6c9e1cf40a57fa7e234machenbach@chromium.org 4706b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org if(self["current_branch"] == self.Config("TRUNKBRANCH") 4806b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org or self["current_branch"] == self.Config("BRANCHNAME")): 49af6f699b0be532b73bc2f6c9e1cf40a57fa7e234machenbach@chromium.org print "Warning: Script started on branch %s" % self["current_branch"] 50af6f699b0be532b73bc2f6c9e1cf40a57fa7e234machenbach@chromium.org 51af9cfcbed5daf6e636e189bce451c6fafdbb127dmachenbach@chromium.org self.PrepareBranch() 5206b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org self.DeleteBranch(self.Config("TRUNKBRANCH")) 53935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 54935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 55935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.orgclass FreshBranch(Step): 5690dca01eac542464c29011d239bf18f26e0b8f00machenbach@chromium.org MESSAGE = "Create a fresh branch." 57935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 58935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org def RunStep(self): 5906b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org self.GitCreateBranch(self.Config("BRANCHNAME"), "svn/bleeding_edge") 60935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 61935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 62fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.orgclass PreparePushRevision(Step): 63fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org MESSAGE = "Check which revision to push." 64fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org 65fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org def RunStep(self): 66fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org if self._options.revision: 67fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org self["push_hash"] = self.GitSVNFindGitHash(self._options.revision) 68fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org else: 69fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org self["push_hash"] = self.GitLog(n=1, format="%H", git_hash="HEAD") 70fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org if not self["push_hash"]: # pragma: no cover 71fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org self.Die("Could not determine the git hash for the push.") 72fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org 73fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org 74935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.orgclass DetectLastPush(Step): 7590dca01eac542464c29011d239bf18f26e0b8f00machenbach@chromium.org MESSAGE = "Detect commit ID of last push to trunk." 76935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 77935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org def RunStep(self): 78f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org last_push = self._options.last_push or self.FindLastTrunkPush() 79935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org while True: 80935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org # Print assumed commit, circumventing git's pager. 81f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org print self.GitLog(n=1, git_hash=last_push) 82935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org if self.Confirm("Is the commit printed above the last push to trunk?"): 83935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org break 84f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org last_push = self.FindLastTrunkPush(parent_hash=last_push) 85f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org 86f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org if self._options.last_bleeding_edge: 87f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org # Read the bleeding edge revision of the last push from a command-line 88f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org # option. 89f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org last_push_bleeding_edge = self._options.last_bleeding_edge 90f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org else: 91f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org # Retrieve the bleeding edge revision of the last push from the text in 92f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org # the push commit message. 93f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org last_push_title = self.GitLog(n=1, format="%s", git_hash=last_push) 94f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org last_push_be_svn = PUSH_MESSAGE_RE.match(last_push_title).group(1) 95486536df718553960f9700559e80e5b10b0d5994dslomov@chromium.org if not last_push_be_svn: # pragma: no cover 96f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org self.Die("Could not retrieve bleeding edge revision for trunk push %s" 97f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org % last_push) 98f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org last_push_bleeding_edge = self.GitSVNFindGitHash(last_push_be_svn) 99486536df718553960f9700559e80e5b10b0d5994dslomov@chromium.org if not last_push_bleeding_edge: # pragma: no cover 100f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org self.Die("Could not retrieve bleeding edge git hash for trunk push %s" 101f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org % last_push) 102f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org 10386b1631344aedfc4be5dcd5237e28d0b28e5974emachenbach@chromium.org # This points to the svn revision of the last push on trunk. 104f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org self["last_push_trunk"] = last_push 10586b1631344aedfc4be5dcd5237e28d0b28e5974emachenbach@chromium.org # This points to the last bleeding_edge revision that went into the last 10686b1631344aedfc4be5dcd5237e28d0b28e5974emachenbach@chromium.org # push. 107fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org # TODO(machenbach): Do we need a check to make sure we're not pushing a 108fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org # revision older than the last push? If we do this, the output of the 109fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org # current change log preparation won't make much sense. 110f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org self["last_push_bleeding_edge"] = last_push_bleeding_edge 111935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 112935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 1134c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org# TODO(machenbach): Code similarities with bump_up_version.py. Merge after 1144c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org# turning this script into a pure git script. 1154c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.orgclass GetCurrentBleedingEdgeVersion(Step): 1164c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org MESSAGE = "Get latest bleeding edge version." 1174c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org 1184c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org def RunStep(self): 11906b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org self.GitCheckoutFile(VERSION_FILE, "svn/bleeding_edge") 1204c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org 1214c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org # Store latest version. 1224c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org self.ReadAndPersistVersion("latest_") 1234c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org self["latest_version"] = self.ArrayToVersion("latest_") 1244c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org print "Bleeding edge version: %s" % self["latest_version"] 1254c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org 1264c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org 1275697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.orgclass IncrementVersion(Step): 1285697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org MESSAGE = "Increment version number." 1295697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org 1305697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org def RunStep(self): 1315697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org # Retrieve current version from last trunk push. 13206b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org self.GitCheckoutFile(VERSION_FILE, self["last_push_trunk"]) 1335697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org self.ReadAndPersistVersion() 1344c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org self["trunk_version"] = self.ArrayToVersion("") 1354c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org 1364c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org if self["latest_build"] == "9999": # pragma: no cover 1374c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org # If version control on bleeding edge was switched off, just use the last 1384c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org # trunk version. 1394c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org self["latest_version"] = self["trunk_version"] 1404c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org 1414c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org if SortingKey(self["trunk_version"]) < SortingKey(self["latest_version"]): 1424c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org # If the version on bleeding_edge is newer than on trunk, use it. 14306b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org self.GitCheckoutFile(VERSION_FILE, "svn/bleeding_edge") 1444c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org self.ReadAndPersistVersion() 1455697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org 1465697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org if self.Confirm(("Automatically increment BUILD_NUMBER? (Saying 'n' will " 1475697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org "fire up your EDITOR on %s so you can make arbitrary " 1485697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org "changes. When you're done, save the file and exit your " 14906b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org "EDITOR.)" % VERSION_FILE)): 1504c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org 15106b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org text = FileToText(os.path.join(self.default_cwd, VERSION_FILE)) 1525697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org text = MSub(r"(?<=#define BUILD_NUMBER)(?P<space>\s+)\d*$", 1535697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org r"\g<space>%s" % str(int(self["build"]) + 1), 1545697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org text) 15506b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org TextToFile(text, os.path.join(self.default_cwd, VERSION_FILE)) 1565697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org else: 15706b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org self.Editor(os.path.join(self.default_cwd, VERSION_FILE)) 1585697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org 1595697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org # Variables prefixed with 'new_' contain the new version numbers for the 1605697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org # ongoing trunk push. 1615697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org self.ReadAndPersistVersion("new_") 1624c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org 1634c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org # Make sure patch level is 0 in a new push. 1644c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org self["new_patch"] = "0" 1654c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org 1665697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org self["version"] = "%s.%s.%s" % (self["new_major"], 1675697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org self["new_minor"], 1685697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org self["new_build"]) 1695697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org 1705697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org 171935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.orgclass PrepareChangeLog(Step): 17290dca01eac542464c29011d239bf18f26e0b8f00machenbach@chromium.org MESSAGE = "Prepare raw ChangeLog entry." 173935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 17437be408adf363bbe682921a4a690752fa0ec33femachenbach@chromium.org def Reload(self, body): 17537be408adf363bbe682921a4a690752fa0ec33femachenbach@chromium.org """Attempts to reload the commit message from rietveld in order to allow 17637be408adf363bbe682921a4a690752fa0ec33femachenbach@chromium.org late changes to the LOG flag. Note: This is brittle to future changes of 17737be408adf363bbe682921a4a690752fa0ec33femachenbach@chromium.org the web page name or structure. 17837be408adf363bbe682921a4a690752fa0ec33femachenbach@chromium.org """ 17937be408adf363bbe682921a4a690752fa0ec33femachenbach@chromium.org match = re.search(r"^Review URL: https://codereview\.chromium\.org/(\d+)$", 18037be408adf363bbe682921a4a690752fa0ec33femachenbach@chromium.org body, flags=re.M) 18137be408adf363bbe682921a4a690752fa0ec33femachenbach@chromium.org if match: 182f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org cl_url = ("https://codereview.chromium.org/%s/description" 183f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org % match.group(1)) 18437be408adf363bbe682921a4a690752fa0ec33femachenbach@chromium.org try: 1858a58f6420f995bb19fff9babb261458d49d90cb1machenbach@chromium.org # Fetch from Rietveld but only retry once with one second delay since 1868a58f6420f995bb19fff9babb261458d49d90cb1machenbach@chromium.org # there might be many revisions. 1878a58f6420f995bb19fff9babb261458d49d90cb1machenbach@chromium.org body = self.ReadURL(cl_url, wait_plan=[1]) 188486536df718553960f9700559e80e5b10b0d5994dslomov@chromium.org except urllib2.URLError: # pragma: no cover 18937be408adf363bbe682921a4a690752fa0ec33femachenbach@chromium.org pass 19037be408adf363bbe682921a4a690752fa0ec33femachenbach@chromium.org return body 19137be408adf363bbe682921a4a690752fa0ec33femachenbach@chromium.org 192935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org def RunStep(self): 193f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org self["date"] = self.GetDate() 1945697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org output = "%s: Version %s\n\n" % (self["date"], self["version"]) 19506b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org TextToFile(output, self.Config("CHANGELOG_ENTRY_FILE")) 196f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org commits = self.GitLog(format="%H", 197fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org git_hash="%s..%s" % (self["last_push_bleeding_edge"], 198fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org self["push_hash"])) 199af9cfcbed5daf6e636e189bce451c6fafdbb127dmachenbach@chromium.org 2007ff7607c2315ea91e4d13330ce14125e4bb4851amachenbach@chromium.org # Cache raw commit messages. 2017ff7607c2315ea91e4d13330ce14125e4bb4851amachenbach@chromium.org commit_messages = [ 2027ff7607c2315ea91e4d13330ce14125e4bb4851amachenbach@chromium.org [ 203f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org self.GitLog(n=1, format="%s", git_hash=commit), 204f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org self.Reload(self.GitLog(n=1, format="%B", git_hash=commit)), 205f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org self.GitLog(n=1, format="%an", git_hash=commit), 2067ff7607c2315ea91e4d13330ce14125e4bb4851amachenbach@chromium.org ] for commit in commits.splitlines() 2077ff7607c2315ea91e4d13330ce14125e4bb4851amachenbach@chromium.org ] 2087ff7607c2315ea91e4d13330ce14125e4bb4851amachenbach@chromium.org 2097ff7607c2315ea91e4d13330ce14125e4bb4851amachenbach@chromium.org # Auto-format commit messages. 2107ff7607c2315ea91e4d13330ce14125e4bb4851amachenbach@chromium.org body = MakeChangeLogBody(commit_messages, auto_format=True) 21106b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org AppendToFile(body, self.Config("CHANGELOG_ENTRY_FILE")) 212935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 2137ff7607c2315ea91e4d13330ce14125e4bb4851amachenbach@chromium.org msg = (" Performance and stability improvements on all platforms." 2147ff7607c2315ea91e4d13330ce14125e4bb4851amachenbach@chromium.org "\n#\n# The change log above is auto-generated. Please review if " 2157ff7607c2315ea91e4d13330ce14125e4bb4851amachenbach@chromium.org "all relevant\n# commit messages from the list below are included." 2167ff7607c2315ea91e4d13330ce14125e4bb4851amachenbach@chromium.org "\n# All lines starting with # will be stripped.\n#\n") 21706b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org AppendToFile(msg, self.Config("CHANGELOG_ENTRY_FILE")) 218935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 2197ff7607c2315ea91e4d13330ce14125e4bb4851amachenbach@chromium.org # Include unformatted commit messages as a reference in a comment. 2207ff7607c2315ea91e4d13330ce14125e4bb4851amachenbach@chromium.org comment_body = MakeComment(MakeChangeLogBody(commit_messages)) 22106b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org AppendToFile(comment_body, self.Config("CHANGELOG_ENTRY_FILE")) 2227ff7607c2315ea91e4d13330ce14125e4bb4851amachenbach@chromium.org 223af9cfcbed5daf6e636e189bce451c6fafdbb127dmachenbach@chromium.org 224935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.orgclass EditChangeLog(Step): 22590dca01eac542464c29011d239bf18f26e0b8f00machenbach@chromium.org MESSAGE = "Edit ChangeLog entry." 226935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 227935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org def RunStep(self): 228935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org print ("Please press <Return> to have your EDITOR open the ChangeLog " 229935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org "entry, then edit its contents to your liking. When you're done, " 230935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org "save the file and exit your EDITOR. ") 2319af454f6b1c6a921ac79ba0b9a979c73adb2ca1emachenbach@chromium.org self.ReadLine(default="") 23206b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org self.Editor(self.Config("CHANGELOG_ENTRY_FILE")) 233935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 23490dca01eac542464c29011d239bf18f26e0b8f00machenbach@chromium.org # Strip comments and reformat with correct indentation. 23506b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org changelog_entry = FileToText(self.Config("CHANGELOG_ENTRY_FILE")).rstrip() 2367ff7607c2315ea91e4d13330ce14125e4bb4851amachenbach@chromium.org changelog_entry = StripComments(changelog_entry) 23790dca01eac542464c29011d239bf18f26e0b8f00machenbach@chromium.org changelog_entry = "\n".join(map(Fill80, changelog_entry.splitlines())) 23837be408adf363bbe682921a4a690752fa0ec33femachenbach@chromium.org changelog_entry = changelog_entry.lstrip() 239935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 240486536df718553960f9700559e80e5b10b0d5994dslomov@chromium.org if changelog_entry == "": # pragma: no cover 241935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org self.Die("Empty ChangeLog entry.") 242935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 243486536df718553960f9700559e80e5b10b0d5994dslomov@chromium.org # Safe new change log for adding it later to the trunk patch. 24406b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org TextToFile(changelog_entry, self.Config("CHANGELOG_ENTRY_FILE")) 245935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 246935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 247935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.orgclass StragglerCommits(Step): 24890dca01eac542464c29011d239bf18f26e0b8f00machenbach@chromium.org MESSAGE = ("Fetch straggler commits that sneaked in since this script was " 24990dca01eac542464c29011d239bf18f26e0b8f00machenbach@chromium.org "started.") 250935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 251935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org def RunStep(self): 252f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org self.GitSVNFetch() 253f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org self.GitCheckout("svn/bleeding_edge") 254935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 255935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 256935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.orgclass SquashCommits(Step): 25790dca01eac542464c29011d239bf18f26e0b8f00machenbach@chromium.org MESSAGE = "Squash commits into one." 258935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 259935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org def RunStep(self): 260935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org # Instead of relying on "git rebase -i", we'll just create a diff, because 261935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org # that's easier to automate. 262763da4c1a1bd42dfafe0844b4c18f4882cc66352machenbach@chromium.org TextToFile(self.GitDiff("svn/trunk", self["push_hash"]), 26306b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org self.Config("PATCH_FILE")) 264935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 265113035e2f19feb7032fbe57b2e3e376f1dfc4110jkummerow@chromium.org # Convert the ChangeLog entry to commit message format. 26606b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org text = FileToText(self.Config("CHANGELOG_ENTRY_FILE")) 267113035e2f19feb7032fbe57b2e3e376f1dfc4110jkummerow@chromium.org 268113035e2f19feb7032fbe57b2e3e376f1dfc4110jkummerow@chromium.org # Remove date and trailing white space. 269f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org text = re.sub(r"^%s: " % self["date"], "", text.rstrip()) 270113035e2f19feb7032fbe57b2e3e376f1dfc4110jkummerow@chromium.org 271ef9a2b9208396fda21c01fdff922975fe35d9c4amachenbach@chromium.org # Retrieve svn revision for showing the used bleeding edge revision in the 272ef9a2b9208396fda21c01fdff922975fe35d9c4amachenbach@chromium.org # commit message. 273763da4c1a1bd42dfafe0844b4c18f4882cc66352machenbach@chromium.org self["svn_revision"] = self.GitSVNFindSVNRev(self["push_hash"]) 274f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org suffix = PUSH_MESSAGE_SUFFIX % int(self["svn_revision"]) 275f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org text = MSub(r"^(Version \d+\.\d+\.\d+)$", "\\1%s" % suffix, text) 276ef9a2b9208396fda21c01fdff922975fe35d9c4amachenbach@chromium.org 277113035e2f19feb7032fbe57b2e3e376f1dfc4110jkummerow@chromium.org # Remove indentation and merge paragraphs into single long lines, keeping 278113035e2f19feb7032fbe57b2e3e376f1dfc4110jkummerow@chromium.org # empty lines between them. 279113035e2f19feb7032fbe57b2e3e376f1dfc4110jkummerow@chromium.org def SplitMapJoin(split_text, fun, join_text): 280113035e2f19feb7032fbe57b2e3e376f1dfc4110jkummerow@chromium.org return lambda text: join_text.join(map(fun, text.split(split_text))) 281113035e2f19feb7032fbe57b2e3e376f1dfc4110jkummerow@chromium.org strip = lambda line: line.strip() 282113035e2f19feb7032fbe57b2e3e376f1dfc4110jkummerow@chromium.org text = SplitMapJoin("\n\n", SplitMapJoin("\n", strip, " "), "\n\n")(text) 283935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 284486536df718553960f9700559e80e5b10b0d5994dslomov@chromium.org if not text: # pragma: no cover 285935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org self.Die("Commit message editing failed.") 28606b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org TextToFile(text, self.Config("COMMITMSG_FILE")) 287935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 288935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 289935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.orgclass NewBranch(Step): 29090dca01eac542464c29011d239bf18f26e0b8f00machenbach@chromium.org MESSAGE = "Create a new branch from trunk." 291935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 292935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org def RunStep(self): 29306b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org self.GitCreateBranch(self.Config("TRUNKBRANCH"), "svn/trunk") 294935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 295935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 296935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.orgclass ApplyChanges(Step): 29790dca01eac542464c29011d239bf18f26e0b8f00machenbach@chromium.org MESSAGE = "Apply squashed changes." 298935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 299935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org def RunStep(self): 30006b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org self.ApplyPatch(self.Config("PATCH_FILE")) 30106b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org os.remove(self.Config("PATCH_FILE")) 302935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 303935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 30400a4ad70bb8883074ba7630edd7140762bcb86a0machenbach@chromium.orgclass AddChangeLog(Step): 30500a4ad70bb8883074ba7630edd7140762bcb86a0machenbach@chromium.org MESSAGE = "Add ChangeLog changes to trunk branch." 30600a4ad70bb8883074ba7630edd7140762bcb86a0machenbach@chromium.org 30700a4ad70bb8883074ba7630edd7140762bcb86a0machenbach@chromium.org def RunStep(self): 30800a4ad70bb8883074ba7630edd7140762bcb86a0machenbach@chromium.org # The change log has been modified by the patch. Reset it to the version 30900a4ad70bb8883074ba7630edd7140762bcb86a0machenbach@chromium.org # on trunk and apply the exact changes determined by this PrepareChangeLog 31000a4ad70bb8883074ba7630edd7140762bcb86a0machenbach@chromium.org # step above. 31106b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org self.GitCheckoutFile(self.Config("CHANGELOG_FILE"), "svn/trunk") 31206b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org changelog_entry = FileToText(self.Config("CHANGELOG_ENTRY_FILE")) 31306b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org old_change_log = FileToText(self.Config("CHANGELOG_FILE")) 31400a4ad70bb8883074ba7630edd7140762bcb86a0machenbach@chromium.org new_change_log = "%s\n\n\n%s" % (changelog_entry, old_change_log) 31506b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org TextToFile(new_change_log, self.Config("CHANGELOG_FILE")) 31606b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org os.remove(self.Config("CHANGELOG_ENTRY_FILE")) 31700a4ad70bb8883074ba7630edd7140762bcb86a0machenbach@chromium.org 31800a4ad70bb8883074ba7630edd7140762bcb86a0machenbach@chromium.org 319935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.orgclass SetVersion(Step): 32090dca01eac542464c29011d239bf18f26e0b8f00machenbach@chromium.org MESSAGE = "Set correct version for trunk." 321935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 322935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org def RunStep(self): 323763da4c1a1bd42dfafe0844b4c18f4882cc66352machenbach@chromium.org # The version file has been modified by the patch. Reset it to the version 324763da4c1a1bd42dfafe0844b4c18f4882cc66352machenbach@chromium.org # on trunk and apply the correct version. 32506b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org self.GitCheckoutFile(VERSION_FILE, "svn/trunk") 32606b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org self.SetVersion(os.path.join(self.default_cwd, VERSION_FILE), "new_") 327935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 328935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 329935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.orgclass CommitTrunk(Step): 33090dca01eac542464c29011d239bf18f26e0b8f00machenbach@chromium.org MESSAGE = "Commit to local trunk branch." 331935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 332935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org def RunStep(self): 33306b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org self.GitCommit(file_name = self.Config("COMMITMSG_FILE")) 33406b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org os.remove(self.Config("COMMITMSG_FILE")) 335935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 336935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 337935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.orgclass SanityCheck(Step): 33890dca01eac542464c29011d239bf18f26e0b8f00machenbach@chromium.org MESSAGE = "Sanity check." 339935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 340935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org def RunStep(self): 34186b1631344aedfc4be5dcd5237e28d0b28e5974emachenbach@chromium.org # TODO(machenbach): Run presubmit script here as it is now missing in the 34286b1631344aedfc4be5dcd5237e28d0b28e5974emachenbach@chromium.org # prepare push process. 343935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org if not self.Confirm("Please check if your local checkout is sane: Inspect " 344935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org "%s, compile, run tests. Do you want to commit this new trunk " 34506b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org "revision to the repository?" % VERSION_FILE): 346486536df718553960f9700559e80e5b10b0d5994dslomov@chromium.org self.Die("Execution canceled.") # pragma: no cover 347935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 348935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 349935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.orgclass CommitSVN(Step): 35090dca01eac542464c29011d239bf18f26e0b8f00machenbach@chromium.org MESSAGE = "Commit to SVN." 351935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 352935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org def RunStep(self): 353f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org result = self.GitSVNDCommit() 354486536df718553960f9700559e80e5b10b0d5994dslomov@chromium.org if not result: # pragma: no cover 355935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org self.Die("'git svn dcommit' failed.") 356935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org result = filter(lambda x: re.search(r"^Committed r[0-9]+", x), 357935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org result.splitlines()) 358935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org if len(result) > 0: 359f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org self["trunk_revision"] = re.sub(r"^Committed r([0-9]+)", r"\1",result[0]) 360935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 361935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org # Sometimes grepping for the revision fails. No idea why. If you figure 362935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org # out why it is flaky, please do fix it properly. 363f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org if not self["trunk_revision"]: 364935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org print("Sorry, grepping for the SVN revision failed. Please look for it " 365935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org "in the last command's output above and provide it manually (just " 366935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org "the number, without the leading \"r\").") 367ddf3811f8018dfe9e8ec7d1b8f4a8be1122fd767machenbach@chromium.org self.DieNoManualMode("Can't prompt in forced mode.") 368f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org while not self["trunk_revision"]: 369935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org print "> ", 370f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org self["trunk_revision"] = self.ReadLine() 371935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 372935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 373935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.orgclass TagRevision(Step): 37490dca01eac542464c29011d239bf18f26e0b8f00machenbach@chromium.org MESSAGE = "Tag the new revision." 375935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 376935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org def RunStep(self): 377f5a24546072ecdbbd6372c85c42157e01e913561titzer@chromium.org self.GitSVNTag(self["version"]) 378935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 379935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 380935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.orgclass CleanUp(Step): 38190dca01eac542464c29011d239bf18f26e0b8f00machenbach@chromium.org MESSAGE = "Done!" 382935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 383935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org def RunStep(self): 384fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org print("Congratulations, you have successfully created the trunk " 385fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org "revision %s. Please don't forget to roll this new version into " 386fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org "Chromium, and to update the v8rel spreadsheet:" 387fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org % self["version"]) 388fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org print "%s\ttrunk\t%s" % (self["version"], self["trunk_revision"]) 389935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 390935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org self.CommonCleanup() 39106b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org if self.Config("TRUNKBRANCH") != self["current_branch"]: 39206b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org self.GitDeleteBranch(self.Config("TRUNKBRANCH")) 393935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 394935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 395bc176057ae476990672de915df235c9aeadc8521titzer@chromium.orgclass PushToTrunk(ScriptsBase): 396bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org def _PrepareOptions(self, parser): 397bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org group = parser.add_mutually_exclusive_group() 398bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org group.add_argument("-f", "--force", 399bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org help="Don't prompt the user.", 400bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org default=False, action="store_true") 401bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org group.add_argument("-m", "--manual", 402bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org help="Prompt the user at every important step.", 403bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org default=False, action="store_true") 404bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org parser.add_argument("-b", "--last-bleeding-edge", 405bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org help=("The git commit ID of the last bleeding edge " 406bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org "revision that was pushed to trunk. This is " 407bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org "used for the auto-generated ChangeLog entry.")) 408bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org parser.add_argument("-l", "--last-push", 409bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org help="The git commit ID of the last push to trunk.") 410fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org parser.add_argument("-R", "--revision", 411fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org help="The svn revision to push (defaults to HEAD).") 412bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org 413486536df718553960f9700559e80e5b10b0d5994dslomov@chromium.org def _ProcessOptions(self, options): # pragma: no cover 414bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org if not options.manual and not options.reviewer: 415bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org print "A reviewer (-r) is required in (semi-)automatic mode." 416bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org return False 417bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org if not options.manual and not options.author: 418bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org print "Specify your chromium.org email with -a in (semi-)automatic mode." 419bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org return False 420fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org if options.revision and not int(options.revision) > 0: 421fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org print("The --revision flag must be a positiv integer pointing to a " 422fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org "valid svn revision.") 423fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org return False 424bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org 425bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org options.tbr_commit = not options.manual 426bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org return True 427bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org 42806b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org def _Config(self): 42906b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org return { 43006b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org "BRANCHNAME": "prepare-push", 43106b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org "TRUNKBRANCH": "trunk-push", 43206b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org "PERSISTFILE_BASENAME": "/tmp/v8-push-to-trunk-tempfile", 43306b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org "CHANGELOG_FILE": "ChangeLog", 43406b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org "CHANGELOG_ENTRY_FILE": "/tmp/v8-push-to-trunk-tempfile-changelog-entry", 43506b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org "PATCH_FILE": "/tmp/v8-push-to-trunk-tempfile-patch-file", 43606b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org "COMMITMSG_FILE": "/tmp/v8-push-to-trunk-tempfile-commitmsg", 43706b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org } 43806b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org 439bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org def _Steps(self): 440bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org return [ 441bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org Preparation, 442bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org FreshBranch, 443fa0c3c69b9d632e5730bdd9c745c375beef5e54dmachenbach@chromium.org PreparePushRevision, 444bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org DetectLastPush, 4454c3ce7c3fd2802da8f91c6516a9c9aea3cd93f1emachenbach@chromium.org GetCurrentBleedingEdgeVersion, 4465697144afb43181fed170b81c194fe1cc0fce3b6machenbach@chromium.org IncrementVersion, 447bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org PrepareChangeLog, 448bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org EditChangeLog, 449bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org StragglerCommits, 450bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org SquashCommits, 451bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org NewBranch, 452bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org ApplyChanges, 45300a4ad70bb8883074ba7630edd7140762bcb86a0machenbach@chromium.org AddChangeLog, 454bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org SetVersion, 455bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org CommitTrunk, 456bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org SanityCheck, 457bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org CommitSVN, 458bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org TagRevision, 459bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org CleanUp, 460bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org ] 461bc176057ae476990672de915df235c9aeadc8521titzer@chromium.org 462935a7790c70d49e252069bc2d34eaa72f8c6677fmachenbach@chromium.org 463486536df718553960f9700559e80e5b10b0d5994dslomov@chromium.orgif __name__ == "__main__": # pragma: no cover 46406b2696801712948b665372a38f96b1f10be6997machenbach@chromium.org sys.exit(PushToTrunk().Run()) 465