Fix AutoRoll after Git transition

scripts/tools/blink_roller/auto_roll.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 """Automates creation and management of DEPS roll CLs.
 
 This script is designed to be run in a loop (eg. with auto_roll_wrapper.sh) or
 on a timer. It may take one of several actions, depending on the state of
@@ skipping 129 matching lines @@
   ROLL_DESCRIPTION_STR = '%(project)s roll %(from_revision)s:%(to_revision)s'
   ROLL_DESCRIPTION_REGEXP = ROLL_DESCRIPTION_STR % {
       'project': '%(project)s',
       'from_revision': r'(?P<from_revision>[0-9a-fA-F]{2,40})',
       'to_revision': r'(?P<to_revision>[0-9a-fA-F]{2,40})'
   }
 
   # 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.
     http://www.chromium.org/blink/blinkrollbot''')
 
   PLEASE_RESUME_NAG = textwrap.dedent('''
     Rollbot was stopped by the presence of 'STOP' in an earlier comment.
     The last update to this issue was over %(stop_nag_timeout)s hours ago.
     Please close this issue as soon as possible to allow the bot to continue.
 
@@ skipping 101 matching lines @@
                         git_log, re.MULTILINE)
       if match:
         return match.group('svn_revision')
       else:
         raise AutoRollException('Could not determine the current SVN revision.')
 
   def _emails_to_cc_on_rolls(self):
     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']
+    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'])
 
-    emails = self._emails_to_cc_on_rolls()
-    if emails:
-      safely_roll_args.extend(['--reviewers', ','.join(emails)])
-    subprocess2.check_call(map(str, safely_roll_args))
+      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
     # safely-roll-deps into this script this can go away.
     search_result = self._search_for_active_roll()
     if search_result:
       self._rietveld.add_comment(search_result['issue'],
           self.ROLL_BOT_INSTRUCTIONS)
 
   def _maybe_close_active_roll(self, issue):
@@ skipping 121 matching lines @@
   _, args = parser.parse_args()
   if len(args) != 3:
     parser.print_usage()
     return 1
 
   AutoRoller(*args).main()
 
 
 if __name__ == '__main__':
   sys.exit(main())