[release-tools] Chrome V8 version is now converted to real V8 version

tools/release/releases.py

 #!/usr/bin/env python
 # Copyright 2014 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script retrieves the history of all V8 branches and
 # their corresponding Chromium revisions.
 
 # Requires a chromium checkout with branch heads:
 # gclient sync --with_branch_heads
@@ skipping 442 matching lines @@
       for current_version in current_os["versions"]:
         if current_version["channel"] != "canary":
           continue
 
         current_candidate = self._CreateCandidate(current_version)
         canaries.append(current_candidate)
 
     chrome_releases = {"canaries": canaries}
     self["chrome_releases"] = chrome_releases
 
-  def _GetGitHashForV8Version(self, v8_version):
+  def _ConvertToRealV8Version(self, v8_version):
     if v8_version == "N/A":
       return ""
     if v8_version.split(".")[3]== "0":
-      return self.GitGetHashOfTag(v8_version[:-2])
-
-    return self.GitGetHashOfTag(v8_version)
+      return v8_version[:-2]
+    return v8_version
 
   def _CreateCandidate(self, current_version):
     params = None
     url_to_call = (OMAHA_PROXY_URL + "v8.json?version="
                    + current_version["previous_version"])
     result_raw = self.ReadURL(
                          url_to_call,
                          params,
                          wait_plan=[5, 20]
                          )
-    previous_v8_version = json.loads(result_raw)["v8_version"]
-    v8_previous_version_hash = self._GetGitHashForV8Version(previous_v8_version)
+    previous_v8_version = (
+      self._ConvertToRealV8Version(json.loads(result_raw)["v8_version"]))

[Michael Achenbach, 2015/04/28 20:48:49]

nit: 4 spaces after round parenthesis or better:
previous_v8_version = self._ConvertToRealV8Version(
    json.loads(result_raw)["v8_version"])

+    v8_previous_version_hash = ""
+    if previous_v8_version != "":
+      v8_previous_version_hash = self.GitGetHashOfTag(previous_v8_version)
 
-    current_v8_version = current_version["v8_version"]
-    v8_version_hash = self._GetGitHashForV8Version(current_v8_version)
+    current_v8_version = (
+      self._ConvertToRealV8Version(current_version["v8_version"]))
+    v8_version_hash = ""
+    if current_v8_version != "":
+      v8_version_hash = self.GitGetHashOfTag(current_v8_version)
 
     current_candidate = {
                         "chrome_version": current_version["version"],
                         "os": current_version["os"],
                         "release_date": current_version["current_reldate"],
                         "v8_version": current_v8_version,
                         "v8_version_hash": v8_version_hash,
                         "v8_previous_version": previous_v8_version,
                         "v8_previous_version_hash": v8_previous_version_hash,
                        }
@@ skipping 67 matching lines @@
       RetrieveChromiumV8Releases,
       RetrieveChromiumBranches,
       RetrieveInformationOnChromeReleases,
       CleanUp,
       WriteOutput,
     ]
 
 
 if __name__ == "__main__":  # pragma: no cover
   sys.exit(Releases().Run())