Make auto_roll run with a pure git checkout.

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 39 matching lines @@
 DEPS_RE = re.compile(r"""^\s*(?:["']v8_revision["']: ["']"""
                      """|\(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.
-COMMIT_POSITION_FOOTER_KEY = 'Cr-Commit-Position'
-
-# Regular expression to parse a commit position
-COMMIT_POSITION_RE = re.compile(r'(.+)@\{#(\d+)\}')
-
-# Key for the 'git-svn' ID metadata commit footer entry.
-GIT_SVN_ID_FOOTER_KEY = 'git-svn-id'
-
-# e.g., git-svn-id: https://v8.googlecode.com/svn/trunk@23117
-#     ce2b1a6d-e550-0410-aec6-3dcde31c8c00
-GIT_SVN_ID_RE = re.compile(r'((?:\w+)://[^@]+)@(\d+)\s+(?:[a-zA-Z0-9\-]+)')
-
-
-# Copied from bot_update.py.
-def GetCommitMessageFooterMap(message):
-  """Returns: (dict) A dictionary of commit message footer entries.
-  """
-  footers = {}
-
-  # Extract the lines in the footer block.
-  lines = []
-  for line in message.strip().splitlines():
-    line = line.strip()
-    if len(line) == 0:
-      del(lines[:])
-      continue
-    lines.append(line)
-
-  # Parse the footer
-  for line in lines:
-    m = COMMIT_FOOTER_ENTRY_RE.match(line)
-    if not m:
-      # If any single line isn't valid, the entire footer is invalid.
-      footers.clear()
-      return footers
-    footers[m.group(1)] = m.group(2).strip()
-  return footers
-
-
-# Copied from bot_update.py and modified for svn-like numbers only.
-def GetCommitPositionNumber(step, git_hash):
-  """Dumps the 'git' log for a specific revision and parses out the commit
-  position number.
-
-  If a commit position metadata key is found, its number will be returned.
-
-  Otherwise, we will search for a 'git-svn' metadata entry. If one is found,
-  its SVN revision value is returned.
-  """
-  git_log = step.GitLog(format='%B', n=1, git_hash=git_hash)
-  footer_map = GetCommitMessageFooterMap(git_log)
-
-  # Search for commit position metadata
-  value = footer_map.get(COMMIT_POSITION_FOOTER_KEY)
-  if value:
-    match = COMMIT_POSITION_RE.match(value)
-    if match:
-      return match.group(2)
-
-  # Extract the svn revision from 'git-svn' metadata
-  value = footer_map.get(GIT_SVN_ID_FOOTER_KEY)
-  if value:
-    match = GIT_SVN_ID_RE.match(value)
-    if match:
-      return match.group(2)
-  return None
-
 
 def SortBranches(branches):
   """Sort branches with version number names."""
   return sorted(branches, key=SortingKey, reverse=True)
 
 
 def FilterDuplicatesAndReverse(cr_releases):
   """Returns the chromium releases in reverse order filtered by v8 revision
   duplicates.
 
@@ skipping 271 matching lines @@
     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)
+          cr_rev = self.GetCommitPositionNumber(git_hash)
           if cr_rev:
             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
 
@@ skipping 132 matching lines @@
       RetrieveChromiumV8Releases,
       RietrieveChromiumBranches,
       SwitchV8,
       CleanUp,
       WriteOutput,
     ]
 
 
 if __name__ == "__main__":  # pragma: no cover
   sys.exit(Releases(CONFIG).Run())