Refactor version increment in release scripts.

tools/release/push_to_candidates.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 27 matching lines @@
 PUSH_MSG_GIT_RE = re.compile(r".* \(based on (?P<git_rev>[a-fA-F0-9]+)\)$")
 VERSION_RE = re.compile(r"^\d+\.\d+\.\d+(?:\.\d+)?$")
 
 class Preparation(Step):
   MESSAGE = "Preparation."
 
   def RunStep(self):
     self.InitialEnvironmentChecks(self.default_cwd)
     self.CommonPrepare()
 
-    # Make sure tags are fetched.
-    self.Git("fetch origin +refs/tags/*:refs/tags/*")
-
     if(self["current_branch"] == self.Config("CANDIDATESBRANCH")
        or self["current_branch"] == self.Config("BRANCHNAME")):
       print "Warning: Script started on branch %s" % self["current_branch"]
 
     self.PrepareBranch()
     self.DeleteBranch(self.Config("CANDIDATESBRANCH"))
 
 
 class FreshBranch(Step):
   MESSAGE = "Create a fresh branch."
@@ skipping 46 matching lines @@
     # This points to the git hash of the last push on candidates.
     self["last_push_candidates"] = last_push
     # This points to the last master revision that went into the last
     # push.
     # TODO(machenbach): Do we need a check to make sure we're not pushing a
     # revision older than the last push? If we do this, the output of the
     # current change log preparation won't make much sense.
     self["last_push_master"] = last_push_master
 
 
-class GetLatestVersion(Step):
-  MESSAGE = "Get latest version from tags."
-
-  def RunStep(self):
-    versions = sorted(filter(VERSION_RE.match, self.vc.GetTags()),
-                      key=SortingKey, reverse=True)
-    self.StoreVersion(versions[0], "latest_")
-    self["latest_version"] = self.ArrayToVersion("latest_")
-
-    # The version file on master can be used to bump up major/minor at
-    # branch time.
-    self.GitCheckoutFile(VERSION_FILE, self.vc.RemoteMasterBranch())
-    self.ReadAndPersistVersion("master_")
-    self["master_version"] = self.ArrayToVersion("master_")
-
-    if SortingKey(self["master_version"]) > SortingKey(self["latest_version"]):
-      self["latest_version"] = self["master_version"]
-      self.StoreVersion(self["latest_version"], "latest_")
-
-    print "Determined latest version %s" % self["latest_version"]
-
-
 class IncrementVersion(Step):
   MESSAGE = "Increment version number."
 
   def RunStep(self):
+    latest_version = self.GetLatestVersion()
+
+    # The version file on master can be used to bump up major/minor at
+    # branch time.
+    self.GitCheckoutFile(VERSION_FILE, self.vc.RemoteMasterBranch())
+    self.ReadAndPersistVersion("master_")
+    master_version = self.ArrayToVersion("master_")
+
+    # Use the highest version from master or from tags to determine the new
+    # version.
+    authoritative_version = sorted(
+        [master_version, latest_version], key=SortingKey)[1]
+    self.StoreVersion(authoritative_version, "authoritative_")
+
     # Variables prefixed with 'new_' contain the new version numbers for the
     # ongoing candidates push.
-    self["new_major"] = self["latest_major"]
-    self["new_minor"] = self["latest_minor"]
-    self["new_build"] = str(int(self["latest_build"]) + 1)
+    self["new_major"] = self["authoritative_major"]
+    self["new_minor"] = self["authoritative_minor"]
+    self["new_build"] = str(int(self["authoritative_build"]) + 1)
 
     # Make sure patch level is 0 in a new push.
     self["new_patch"] = "0"
 
     self["version"] = "%s.%s.%s" % (self["new_major"],
                                     self["new_minor"],
                                     self["new_build"])
 
+    print ("Incremented version to %s" % self["version"])
+
 
 class PrepareChangeLog(Step):
   MESSAGE = "Prepare raw ChangeLog entry."
 
   def Reload(self, body):
     """Attempts to reload the commit message from rietveld in order to allow
     late changes to the LOG flag. Note: This is brittle to future changes of
     the web page name or structure.
     """
     match = re.search(r"^Review URL: https://codereview\.chromium\.org/(\d+)$",
@@ skipping 256 matching lines @@
       "PATCH_FILE": "/tmp/v8-push-to-candidates-tempfile-patch-file",
       "COMMITMSG_FILE": "/tmp/v8-push-to-candidates-tempfile-commitmsg",
     }
 
   def _Steps(self):
     return [
       Preparation,
       FreshBranch,
       PreparePushRevision,
       DetectLastPush,
-      GetLatestVersion,
       IncrementVersion,
       PrepareChangeLog,
       EditChangeLog,
       StragglerCommits,
       SquashCommits,
       NewBranch,
       ApplyChanges,
       CommitSquash,
       SanityCheck,
       Land,
       PrepareVersionBranch,
       AddChangeLog,
       SetVersion,
       CommitCandidate,
       Land,
       TagRevision,
       CleanUp,
     ]
 
 
 if __name__ == "__main__":  # pragma: no cover
   sys.exit(PushToCandidates().Run())