Fix AutoRoll after Git transition

scripts/tools/blink_roller/auto_roll.py

Index: scripts/tools/blink_roller/auto_roll.py
diff --git a/scripts/tools/blink_roller/auto_roll.py b/scripts/tools/blink_roller/auto_roll.py
index 482706b3f51e6d550ede464f0579478c37ef6997..9a10dd4249a58eb0263aeac156fa43f09de57234 100755
--- a/scripts/tools/blink_roller/auto_roll.py
+++ b/scripts/tools/blink_roller/auto_roll.py
@@ -147,7 +147,8 @@ class AutoRoller(object):
   # FIXME: These are taken from gardeningserver.py and should be shared.
   CHROMIUM_SVN_DEPS_URL = 'http://src.chromium.org/chrome/trunk/src/DEPS'
   # 'webkit_revision': '149598',
-  REVISION_REGEXP = r'^  "%s_revision": "(?P<revision>[0-9a-fA-F]{2,40})",$'
+  REVISION_REGEXP = (
+      r'^  [\'"]%s_revision[\'"]: [\'"](?P<revision>[0-9a-fA-F]{2,40})[\'"],$')
 
   ROLL_BOT_INSTRUCTIONS = textwrap.dedent(
     '''This roll was created by the Blink AutoRollBot.
@@ -269,15 +270,32 @@ class AutoRoller(object):
     return _filter_emails(self._get_extra_emails())
 
   def _start_roll(self, new_roll_revision, commit_msg):
-    safely_roll_path = (
-        self._path_from_chromium_root('tools', 'safely-roll-deps.py'))
-    safely_roll_args = [safely_roll_path, self._project_alias,
-                        new_roll_revision, '--message', commit_msg, '--force']
-
-    emails = self._emails_to_cc_on_rolls()
-    if emails:
-      safely_roll_args.extend(['--reviewers', ','.join(emails)])
-    subprocess2.check_call(map(str, safely_roll_args))
+    roll_branch = '%s_roll' % self._project
+    subprocess2.check_call(['git', 'clean', '-d', '-f'])
+    subprocess2.call(['git', 'rebase', '--abort'])
+    subprocess2.call(['git', 'branch', '-D', roll_branch])
+    subprocess2.check_call(['git', 'checkout', 'master', '-f'])
+    subprocess2.check_call(['git', 'checkout', '-b', roll_branch,
+                            '-t', 'origin/master', '-f'])
+    try:
+      subprocess2.check_call(['roll-dep', self._path_to_project,

[eseidel, 2014/08/25 18:09:01]

This assumes depot_tools is in the path. Unsure if that's "safe". :)

[borenet, 2014/08/25 18:20:21]

I think it's okay since we import find_depot_tools, which adds the depot_tools
path to sys.path.

[szager1, 2014/08/25 18:28:00]

It's in depot_tools, which is always in PATH.  But the module is already
import-able, so you could:

import roll_dep
...
roll_dep.main(self._path_to_project, new_roll_revision)

I'm fine either way.

[borenet, 2014/08/25 18:40:23]

I think I'd rather leave it as-is, since the auto_roll_test would suddenly start
to care about the internals of roll_dep as well.

+                              new_roll_revision])
+      subprocess2.check_call(['git', 'add', 'DEPS'])
+
+      upload_cmd = ['git', 'cl', 'upload', '--bypass-hooks',
+                    '--use-commit-queue']
+      tbr = '\nTBR='
+      emails = self._emails_to_cc_on_rolls()
+      if emails:
+        emails_str = ','.join(emails)
+        tbr += emails_str
+        upload_cmd.extend(['--cc', emails_str, '--send-mail'])
+      commit_msg += tbr
+      subprocess2.check_call(['git', 'commit', '-m', commit_msg])
+      subprocess2.check_call(upload_cmd)
+    finally:
+      subprocess2.check_call(['git', 'checkout', 'master', '-f'])
+      subprocess2.check_call(['git', 'branch', '-D', roll_branch])
 
     # FIXME: It's easier to pull the issue id from rietveld rather than
     # parse it from the safely-roll-deps output.  Once we inline