[release-tools] Fix v8rel in branch period.

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 341 matching lines @@
   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"))
         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:
+            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:
-            break  # pragma: no cover
+            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.

[Michael Achenbach, 2015/04/07 09:39:29]

Sorry for the code dup... need to work on this TODO.

 class RietrieveChromiumBranches(Step):
   MESSAGE = "Retrieve Chromium branch information."
 
   def RunStep(self):
     cwd = self._options.chromium
 
     # All v8 revisions we are interested in.
     releases_dict = dict((r["revision_git"], r) for r in self["releases"])
 
     # Filter out irrelevant branches.
     branches = filter(lambda r: re.match(r"branch-heads/\d+", r),
                       self.GitRemotes(cwd=cwd))
 
     # 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"))
         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:
+            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:
-            break  # pragma: no cover
+            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)
@@ skipping 63 matching lines @@
       UpdateChromiumCheckout,
       RetrieveChromiumV8Releases,
       RietrieveChromiumBranches,
       CleanUp,
       WriteOutput,
     ]
 
 
 if __name__ == "__main__":  # pragma: no cover
   sys.exit(Releases().Run())