Teach v8rel script to read git hashes from DEPS.

tools/push-to-trunk/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 trunk revisions and
 # their corresponding Chromium revisions.
 
 # Requires a chromium checkout with branch heads:
 # gclient sync --with_branch_heads
@@ skipping 29 matching lines @@
 
 # Expression for retrieving reverted patches from a commit message (old and
 # new format).
 ROLLBACK_MESSAGE_RE = re.compile(r"^.*[R|r]ollback of (.+)(\)| in).*$", re.M)
 
 # Expression for retrieving the code review link.
 REVIEW_LINK_RE = re.compile(r"^Review URL: (.+)$", re.M)
 
 # Expression with three versions (historical) for extracting the v8 revision
 # from the chromium DEPS file.
-DEPS_RE = re.compile(r'^\s*(?:"v8_revision": "'
-                      '|\(Var\("googlecode_url"\) % "v8"\) \+ "\/trunk@'
-                      '|"http\:\/\/v8\.googlecode\.com\/svn\/trunk@)'
-                      '([0-9]+)".*$', re.M)
+DEPS_RE = re.compile('^\\s*(?:(?:"|\')v8_revision(?:"|\'): (?:"|\')'

[Ryan Tseng, 2014/08/25 13:19:17]

running regex on the DEPS file? :/

you can use r"""...""" to continue to do raw strings.

also i think ['"] works in place of (?:"|')

[Michael Achenbach, 2014/08/25 13:32:52]

The """ is good to know, thanks!

+                     '|\\(Var\\("googlecode_url"\\) % "v8"\\) \\+ "\\/trunk@'
+                     '|"http\\:\\/\\/v8\\.googlecode\\.com\\/svn\\/trunk@)'
+                     '([^"\']+)(?:"|\').*$', re.M)
 
 # Expression to pick tag and revision for bleeding edge tags. To be used with
 # output of 'svn log'.
 BLEEDING_EDGE_TAGS_RE = re.compile(
     r"A \/tags\/([^\s]+) \(from \/branches\/bleeding_edge\:(\d+)\)")
 
 # Regular expression that matches a single commit footer line.
 COMMIT_FOOTER_ENTRY_RE = re.compile(r'([^:]+):\s+(.+)')
 
 # Footer metadata key for commit position.
@@ skipping 303 matching lines @@
   MESSAGE = "Update the checkout and create a new branch."
   REQUIRES = "chrome_path"
 
   def RunStep(self):
     os.chdir(self["chrome_path"])
     self.GitCheckout("master")
     self.GitPull()
     self.GitCreateBranch(self.Config(BRANCHNAME))
 
 
+def ConvertToCommitNumber(step, revision):
+  if len(revision) > 6:

[Ryan Tseng, 2014/08/25 13:19:17]

Reversing this make more sense

if revision.isdigit() and len(revision) < 8:
  return revision

...{return git-svn}...

[Michael Achenbach, 2014/08/25 13:32:52]

Done.

+    # Simple check for git hashes.
+    try:
+      # TODO(machenbach): Add cwd to git calls.
+      os.chdir(os.path.join(step["chrome_path"], "v8"))

[Ryan Tseng, 2014/08/25 13:19:17]

I don't really like this, but seeing how the rest of the file uses this
convention it might be a lost cause...

[Michael Achenbach, 2014/08/25 13:32:52]

Most of this/these files originated from some old bash scripts and were
transformed to python line by line :/ These are the relics of it.

+      return step.GitConvertToSVNRevision(revision)
+    finally:
+      os.chdir(step["chrome_path"])
+  return revision
+
+
 class RetrieveChromiumV8Releases(Step):
   MESSAGE = "Retrieve V8 releases from Chromium DEPS."
   REQUIRES = "chrome_path"
 
   def RunStep(self):
     os.chdir(self["chrome_path"])
 
     releases = filter(
         lambda r: r["branch"] in ["trunk", "bleeding_edge"], self["releases"])
     if not releases:  # pragma: no cover
       print "No releases detected. Skipping chromium history."
       return True
 
+    # Update v8 checkout in chromium.
+    try:
+      # TODO(machenbach): Add cwd to git calls.
+      os.chdir(os.path.join(self["chrome_path"], "v8"))
+      self.GitFetchOrigin()

[Ryan Tseng, 2014/08/25 13:19:17]

You might have to either (1) rebase on current branch or (2) ensure
origin/master is checked out.

Unless you're just updating the clone to get the git-svn numbers, and not
fetching to get V8 HEAD, in which case ignore this comment.

[Michael Achenbach, 2014/08/25 13:32:52]

Just reading the svn numbers.

+    finally:
+      os.chdir(self["chrome_path"])
+
     oldest_v8_rev = int(releases[-1]["revision"])
 
     cr_releases = []
     try:
       for git_hash in self.GitLog(format="%H", grep="V8").splitlines():
         if self._config[DEPS_FILE] not in self.GitChangedFiles(git_hash):
           continue
         if not self.GitCheckoutFileSafe(self._config[DEPS_FILE], git_hash):
           break  # pragma: no cover
         deps = FileToText(self.Config(DEPS_FILE))
         match = DEPS_RE.search(deps)
         if match:
           cr_rev = GetCommitPositionNumber(self, git_hash)
           if cr_rev:
-            v8_rev = match.group(1)
+            v8_rev = ConvertToCommitNumber(self, match.group(1))
             cr_releases.append([cr_rev, v8_rev])
 
           # Stop after reaching beyond the last v8 revision we want to update.
           # We need a small buffer for possible revert/reland frenzies.
           # TODO(machenbach): Subtraction is not git friendly.
           if int(v8_rev) < oldest_v8_rev - 100:
             break  # pragma: no cover
 
     # Allow Ctrl-C interrupt.
     except (KeyboardInterrupt, SystemExit):  # pragma: no cover
@@ skipping 36 matching lines @@
 
     cr_branches = []
     try:
       for branch in branches:
         if not self.GitCheckoutFileSafe(self._config[DEPS_FILE],
                                         "branch-heads/%d" % branch):
           break  # pragma: no cover
         deps = FileToText(self.Config(DEPS_FILE))
         match = DEPS_RE.search(deps)
         if match:
-          v8_rev = match.group(1)
+          v8_rev = ConvertToCommitNumber(self, match.group(1))
           cr_branches.append([str(branch), v8_rev])
 
           # Stop after reaching beyond the last v8 revision we want to update.
           # We need a small buffer for possible revert/reland frenzies.
           # TODO(machenbach): Subtraction is not git friendly.
           if int(v8_rev) < oldest_v8_rev - 100:
             break  # pragma: no cover
 
     # Allow Ctrl-C interrupt.
     except (KeyboardInterrupt, SystemExit):  # pragma: no cover
@@ skipping 73 matching lines @@
       RetrieveChromiumV8Releases,
       RietrieveChromiumBranches,
       SwitchV8,
       CleanUp,
       WriteOutput,
     ]
 
 
 if __name__ == "__main__":  # pragma: no cover
   sys.exit(Releases(CONFIG).Run())