Switch release scripts to pure git.

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 27 matching lines @@
 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\-]+)')

[Michael Achenbach, 2014/11/12 10:56:12]

This is copied from bot_update. Added this bug:
https://code.google.com/p/chromium/issues/detail?id=432459

+GIT_SVN_ID_RE = re.compile(r'[^@]+@(\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 = []
@@ skipping 219 matching lines @@
     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, **kwargs):
-    self.Git("svn fetch", **kwargs)
-
-  def GitSVNRebase(self, **kwargs):
-    self.Git("svn rebase", **kwargs)
-
-  # TODO(machenbach): Unused? Remove.
-  @Strip
-  def GitSVNLog(self, **kwargs):
-    return self.Git("svn log -1 --oneline", **kwargs)
-
-  @Strip
-  def GitSVNFindGitHash(self, revision, branch="", **kwargs):
-    assert revision
-    args = MakeArgs(["svn find-rev", "r%s" % revision, branch])
-
-    # Pick the last line if multiple lines are available. The first lines might
-    # print information about rebuilding the svn-git mapping.
-    return self.Git(args, **kwargs).splitlines()[-1]
-
-  @Strip
-  def GitSVNFindSVNRev(self, git_hash, branch="", **kwargs):
-    return self.Git(MakeArgs(["svn find-rev", git_hash, branch]), **kwargs)
-
-  def GitSVNDCommit(self, **kwargs):
-    return self.Git("svn dcommit 2>&1", retry_on=lambda x: x is None, **kwargs)
-
-  def GitSVNTag(self, version, **kwargs):
-    self.Git(("svn tag %s -m \"Tagging version %s\"" % (version, version)),
-             retry_on=lambda x: x is None,
-             **kwargs)
+        return match.group(1)
+    raise GitFailedException("Couldn't determin commit position for %s" %

[tandrii(chromium), 2014/11/12 12:42:34]

nit: determine

+                             git_hash)