Make auto_roll run with a pure git checkout.

tools/push-to-trunk/git_recipes.py

 #!/usr/bin/env python
 # Copyright 2014 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
@@ skipping 11 matching lines @@
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import re
 
 SHA1_RE = re.compile('^[a-fA-F0-9]{40}$')
-GIT_SVN_ID_RE = re.compile('^git-svn-id: .*@([0-9]+) .*$')
+ROLL_DEPS_GIT_SVN_ID_RE = re.compile('^git-svn-id: .*@([0-9]+) .*$')
+

[Michael Achenbach, 2014/09/04 08:08:47]

This is all copied from releases.py for sharing.

+# 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
 
 
 class GitFailedException(Exception):
   pass
 
 
 def Strip(f):
   def new_f(*args, **kwargs):
     return f(*args, **kwargs).strip()
   return new_f
@@ skipping 149 matching lines @@
 
   def GitFetchOrigin(self):
     self.Git("fetch origin")
 
   def GitConvertToSVNRevision(self, git_hash):
     result = self.Git(MakeArgs(["rev-list", "-n", "1", git_hash]))
     if not result or not SHA1_RE.match(result):
       raise GitFailedException("Git hash %s is unknown." % git_hash)
     log = self.GitLog(n=1, format="%B", git_hash=git_hash)
     for line in reversed(log.splitlines()):
-      match = GIT_SVN_ID_RE.match(line.strip())
+      match = ROLL_DEPS_GIT_SVN_ID_RE.match(line.strip())
       if match:
         return match.group(1)
     raise GitFailedException("Couldn't convert %s to SVN." % git_hash)
 
+  @Strip
+  # Copied from bot_update.py and modified for svn-like numbers only.
+  def GetCommitPositionNumber(self, 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 = self.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
+
+  ### Git svn stuff
+
   def GitSVNFetch(self):
     self.Git("svn fetch")
 
   def GitSVNRebase(self):
     self.Git("svn rebase")
 
   # TODO(machenbach): Unused? Remove.
   @Strip
   def GitSVNLog(self):
     return self.Git("svn log -1 --oneline")
 
   @Strip
   def GitSVNFindGitHash(self, revision, branch=""):
     assert revision
     return self.Git(MakeArgs(["svn find-rev", "r%s" % revision, branch]))
 
   @Strip
   def GitSVNFindSVNRev(self, git_hash, branch=""):
     return self.Git(MakeArgs(["svn find-rev", git_hash, branch]))
 
   def GitSVNDCommit(self):
     return self.Git("svn dcommit 2>&1", retry_on=lambda x: x is None)
 
   def GitSVNTag(self, version):
     self.Git(("svn tag %s -m \"Tagging version %s\"" % (version, version)),
              retry_on=lambda x: x is None)