[release-tools] Only read from the chromium checkout in v8rel.

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 296 matching lines @@
       # Retrieve history for a specified branch.
       assert self._options.branch in (self.vc.GetBranches() +
           [self.vc.CandidateBranch(), self.vc.MasterBranch()])
       releases += self.GetReleasesFromBranch(self._options.branch)
 
     self["releases"] = sorted(releases,
                               key=lambda r: SortingKey(r["version"]),
                               reverse=True)
 
 
-class SwitchChromium(Step):
-  MESSAGE = "Switch to Chromium checkout."
+class UpdateChromiumCheckout(Step):
+  MESSAGE = "Update the chromium checkout."
 
   def RunStep(self):
     cwd = self._options.chromium
-    # Check for a clean workdir.
-    if not self.GitIsWorkdirClean(cwd=cwd):  # pragma: no cover
-      self.Die("Workspace is not clean. Please commit or undo your changes.")
-    # Assert that the DEPS file is there.
-    if not os.path.exists(os.path.join(cwd, "DEPS")):  # pragma: no cover
-      self.Die("DEPS file not present.")
-
-
-class UpdateChromiumCheckout(Step):
-  MESSAGE = "Update the checkout and create a new branch."
-
-  def RunStep(self):
-    cwd = self._options.chromium
-    self.GitCheckout("master", cwd=cwd)
-    self.GitPull(cwd=cwd)
-    self.DeleteBranch(self.Config("BRANCHNAME"), cwd=cwd)
-    self.GitCreateBranch(self.Config("BRANCHNAME"), cwd=cwd)
+    self.GitFetchOrigin("+refs/heads/*:refs/remotes/origin/*",
+                        "+refs/branch-heads/*:refs/remotes/branch-heads/*",
+                        cwd=cwd)
+    # Update v8 checkout in chromium.
+    self.GitFetchOrigin(cwd=os.path.join(cwd, "v8"))
 
 
 def ConvertToCommitNumber(step, revision):
   # Simple check for git hashes.
   if revision.isdigit() and len(revision) < 8:
     return revision
   return step.GetCommitPositionNumber(
       revision, cwd=os.path.join(step._options.chromium, "v8"))
 
 
 class RetrieveChromiumV8Releases(Step):
   MESSAGE = "Retrieve V8 releases from Chromium DEPS."
 
   def RunStep(self):
     cwd = self._options.chromium
 
-    # Update v8 checkout in chromium.
-    self.GitFetchOrigin(cwd=os.path.join(cwd, "v8"))
-
     # All v8 revisions we are interested in.
     releases_dict = dict((r["revision_git"], r) for r in self["releases"])
 
     cr_releases = []
     count_past_last_v8 = 0
     try:
       for git_hash in self.GitLog(
-          format="%H", grep="V8", cwd=cwd).splitlines():
-        if "DEPS" not in self.GitChangedFiles(git_hash, cwd=cwd):
-          continue
-        if not self.GitCheckoutFileSafe("DEPS", git_hash, cwd=cwd):
-          break  # pragma: no cover
-        deps = FileToText(os.path.join(cwd, "DEPS"))
+          format="%H", grep="V8", branch="origin/master",
+          path="DEPS", cwd=cwd).splitlines():
+        deps = self.GitShowFile(git_hash, "DEPS", cwd=cwd)
         match = DEPS_RE.search(deps)
         if match:
           cr_rev = self.GetCommitPositionNumber(git_hash, cwd=cwd)
           if cr_rev:
             v8_hsh = match.group(1)
             cr_releases.append([cr_rev, v8_hsh])
 
           if count_past_last_v8:
             count_past_last_v8 += 1  # pragma: no cover
 
-          if count_past_last_v8 > 10:
+          if count_past_last_v8 > 20:

[Michael Achenbach, 2015/04/07 14:21:15]

10 was a bit too small... missed exactly one commit in this cycles branch mess.

             break  # pragma: no cover
 
           # Stop as soon as we find a v8 revision that we didn't fetch in the
           # v8-revision-retrieval part above (i.e. a revision that's too old).
           # Just iterate a few more times in case there were reverts.
           if v8_hsh not in releases_dict:
             count_past_last_v8 += 1  # pragma: no cover
 
     # Allow Ctrl-C interrupt.
     except (KeyboardInterrupt, SystemExit):  # pragma: no cover
       pass
 
-    # Clean up.
-    self.GitCheckoutFileSafe("DEPS", "HEAD", cwd=cwd)
-
     # Add the chromium ranges to the v8 candidates and master releases.
     all_ranges = BuildRevisionRanges(cr_releases)
 
     for hsh, ranges in all_ranges.iteritems():
       releases_dict.get(hsh, {})["chromium_revision"] = ranges
 
 
 # TODO(machenbach): Unify common code with method above.
 class RietrieveChromiumBranches(Step):
   MESSAGE = "Retrieve Chromium branch information."
@@ skipping 11 matching lines @@
     # Transform into pure branch numbers.
     branches = map(lambda r: int(re.match(r"branch-heads/(\d+)", r).group(1)),
                    branches)
 
     branches = sorted(branches, reverse=True)
 
     cr_branches = []
     count_past_last_v8 = 0
     try:
       for branch in branches:
-        if not self.GitCheckoutFileSafe("DEPS",
-                                        "branch-heads/%d" % branch,
-                                        cwd=cwd):
-          break  # pragma: no cover
-        deps = FileToText(os.path.join(cwd, "DEPS"))
+        deps = self.GitShowFile(
+            "refs/branch-heads/%d" % branch, "DEPS", cwd=cwd)
         match = DEPS_RE.search(deps)
         if match:
           v8_hsh = match.group(1)
           cr_branches.append([str(branch), v8_hsh])
 
           if count_past_last_v8:
             count_past_last_v8 += 1  # pragma: no cover
 
-          if count_past_last_v8 > 10:
+          if count_past_last_v8 > 20:
             break  # pragma: no cover
 
           # Stop as soon as we find a v8 revision that we didn't fetch in the
           # v8-revision-retrieval part above (i.e. a revision that's too old).
           # Just iterate a few more times in case there were reverts.
           if v8_hsh not in releases_dict:
             count_past_last_v8 += 1  # pragma: no cover
 
     # Allow Ctrl-C interrupt.
     except (KeyboardInterrupt, SystemExit):  # pragma: no cover
       pass
 
-    # Clean up.
-    self.GitCheckoutFileSafe("DEPS", "HEAD", cwd=cwd)
-
     # Add the chromium branches to the v8 candidate releases.
     all_ranges = BuildRevisionRanges(cr_branches)
     for revision, ranges in all_ranges.iteritems():
       releases_dict.get(revision, {})["chromium_branch"] = ranges
 
 
 class CleanUp(Step):
   MESSAGE = "Clean up."
 
   def RunStep(self):
-    self.GitCheckout("master", cwd=self._options.chromium)
-    self.GitDeleteBranch(self.Config("BRANCHNAME"), cwd=self._options.chromium)
     self.CommonCleanup()
 
 
 class WriteOutput(Step):
   MESSAGE = "Print output."
 
   def Run(self):
     if self._options.csv:
       with open(self._options.csv, "w") as f:
         writer = csv.DictWriter(f,
@@ skipping 32 matching lines @@
   def _Config(self):
     return {
       "BRANCHNAME": "retrieve-v8-releases",
       "PERSISTFILE_BASENAME": "/tmp/v8-releases-tempfile",
     }
 
   def _Steps(self):
     return [
       Preparation,
       RetrieveV8Releases,
-      SwitchChromium,
       UpdateChromiumCheckout,
       RetrieveChromiumV8Releases,
       RietrieveChromiumBranches,

[tandrii(chromium), 2015/04/07 15:13:51]

unrelated CL nit: /s/RietrieveChromiumBranches/RetrieveChromiumBranches

[Michael Achenbach, 2015/04/07 19:41:48]

Yea - looks like Rietveld :) - but I'll hit the CQ as I'm not on my comp and
this also fixes a bug. Will take care of that nit in the next CL...

       CleanUp,
       WriteOutput,
     ]
 
 
 if __name__ == "__main__":  # pragma: no cover
   sys.exit(Releases().Run())