Include svn revision range in Blink roll descriptions.

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 130 matching lines @@
   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})[\'"],')
+      r'^  [\'"]%s_revision[\'"]: [\'"](?P<revision>[0-9a-fA-F]{2,40})[\'"],'
+      r'( # from svn revision (?P<svn_revision>\d+))?')
 
   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.
 
     Please email (%(admin)s) if the Rollbot is causing trouble.
     ''' % {'admin': ADMIN_EMAIL, 'stop_nag_timeout': STOP_NAG_TIME_LIMIT})
 
   def __init__(self, project, author, path_to_chrome):
     self._author = author
     self._project = project
     self._path_to_chrome = path_to_chrome
     self._rietveld = rietveld.Rietveld(
       self.RIETVELD_URL, self._author, None)
     self._cached_last_roll_revision = None
+    self._cached_deps_contents = None
 
     project_config = PROJECT_CONFIGS.get(self._project, {
       'path_to_project': os.path.join('third_party', self._project),
       'revision_link_fn': lambda before_rev, after_ref: '',
     })
     self._project_alias = project_config.get('project_alias', self._project)
     self._path_to_project = project_config['path_to_project']
     self._get_revision_link = project_config['revision_link_fn']
     self._get_extra_emails = project_config.get('extra_emails_fn', lambda: [])
     self._git_mode = project_config.get('git_mode', False)
@@ skipping 39 matching lines @@
     print 'Closing %s with message: \'%s\'' % (
       self._url_for_issue(issue_number), message)
     if message:
       self._rietveld.add_comment(issue_number, message)
     self._rietveld.close_issue(issue_number)
 
   def _path_from_chromium_root(self, *components):
     assert os.pardir not in components
     return os.path.join(self._path_to_chrome, *components)
 
+  def _do_git_fetch(self, git_dir):
+    subprocess2.check_call(['git', '--git-dir', git_dir, 'fetch'])
+
   def _last_roll_revision(self):
     """Returns the revision of the last roll.
 
     Returns:
         revision of the last roll; either a 40-character Git commit hash or an
         SVN revision number.
     """
     if not self._cached_last_roll_revision:
-      subprocess2.check_call(['git', '--git-dir', self._chromium_git_dir,
-                              'fetch'])
-      git_show_cmd = ['git', '--git-dir', self._chromium_git_dir, 'show',
-                      'origin/master:DEPS']
-      deps_contents = subprocess2.check_output(git_show_cmd)
-      pattern = self.REVISION_REGEXP % self._project_alias
-      match = re.search(pattern, deps_contents, re.MULTILINE)
-      self._cached_last_roll_revision = match.group('revision')
+      self._cached_last_roll_revision = self._last_roll_revision_helper(
+                                        'revision')

[szager1, 2014/09/11 00:52:04]

nit: indentation should be four characters in from start of previous line.

[skobes, 2014/09/11 01:32:42]

Done.

     if self._git_mode:
       assert len(self._cached_last_roll_revision) == 40
     return self._cached_last_roll_revision
 
+  def _last_roll_revision_svn(self):
+    return self._last_roll_revision_helper('svn_revision')
+
+  def _last_roll_revision_helper(self, match_group):
+    if not self._cached_deps_contents:
+      git_show_cmd = ['git', '--git-dir', self._chromium_git_dir, 'show',
+                      'origin/master:DEPS']
+      self._cached_deps_contents = subprocess2.check_output(git_show_cmd)
+
+    pattern = self.REVISION_REGEXP % self._project_alias
+    match = re.search(pattern, self._cached_deps_contents, re.MULTILINE)
+    return match.group(match_group)
+
   def _current_revision(self):
-    subprocess2.check_call(['git', '--git-dir', self._project_git_dir,
-                            'fetch'])
     if self._git_mode:
       git_revparse_cmd = ['git', '--git-dir', self._project_git_dir,
                           'rev-parse', 'origin/master']
       return subprocess2.check_output(git_revparse_cmd).rstrip()
     else:
-      git_show_cmd = ['git', '--git-dir', self._project_git_dir, 'show', '-s',
-                      'origin/master']
-      git_log = subprocess2.check_output(git_show_cmd)
-      match = re.search('^\s*git-svn-id:.*@(?P<svn_revision>\d+)\ ',
-                        git_log, re.MULTILINE)
-      if match:
-        return match.group('svn_revision')
-      else:
-        raise AutoRollException(
-            'Could not determine the current SVN revision.')
+      return self._current_revision_svn()
+
+  def _current_revision_svn(self):
+    git_show_cmd = ['git', '--git-dir', self._project_git_dir, 'show', '-s',
+                    'origin/master']
+    git_log = subprocess2.check_output(git_show_cmd)
+    match = re.search('^\s*git-svn-id:.*@(?P<svn_revision>\d+)\ ',
+                      git_log, re.MULTILINE)
+    if match:
+      return match.group('svn_revision')
+    else:
+      return None
 
   def _emails_to_cc_on_rolls(self):
     return _filter_emails(self._get_extra_emails())
 
   def _start_roll(self, new_roll_revision, commit_msg):
     roll_branch = '%s_roll' % self._project
     cwd_kwargs = {'cwd': self._path_to_chrome}
     subprocess2.check_call(['git', 'clean', '-d', '-f'], **cwd_kwargs)
     subprocess2.call(['git', 'rebase', '--abort'], **cwd_kwargs)
     subprocess2.call(['git', 'branch', '-D', roll_branch], **cwd_kwargs)
@@ skipping 107 matching lines @@
       issue = None
 
     if issue:
       if self._rollbot_should_stop(issue):
         return 1
       if not self._maybe_close_active_roll(issue):
         print '%s is still active, nothing to do.' % \
             self._url_for_issue(issue_number)
         return 0
 
+    self._do_git_fetch(self._chromium_git_dir)
+    self._do_git_fetch(self._project_git_dir)
+
     last_roll_revision = self._last_roll_revision()
     new_roll_revision = self._current_revision()
+
+    if not new_roll_revision:
+      raise AutoRollException(
+          'Could not determine the current revision.')
+
+    if self._git_mode:
+      last_roll_revision_svn = self._last_roll_revision_svn()
+      new_roll_revision_svn = self._current_revision_svn()
+    else:
+      last_roll_revision_svn = None
+      new_roll_revision_svn = None
+
     self._compare_revisions(last_roll_revision, new_roll_revision)
 
     display_from_rev = (
         self._short_rev(last_roll_revision) if self._git_mode
         else last_roll_revision)
     display_to_rev = (
         self._short_rev(new_roll_revision) if self._git_mode
         else new_roll_revision)
     commit_msg = self.ROLL_DESCRIPTION_STR % {
         'project': self._project.title(),
         'from_revision': display_from_rev,
         'to_revision': display_to_rev,
     }
+
+    if last_roll_revision_svn and new_roll_revision_svn:
+      commit_msg += ' (svn %s:%s)' % (
+                    last_roll_revision_svn, new_roll_revision_svn)
+
     revlink = self._get_revision_link(last_roll_revision, new_roll_revision)
     if revlink:
       commit_msg += '\n\n' + revlink
 
     if self._cq_extra_trybots:
       commit_msg += '\n\n' + CQ_EXTRA_TRYBOTS + ','.join(self._cq_extra_trybots)
 
     self._start_roll(new_roll_revision, commit_msg)
     return 0
 
@@ skipping 15 matching lines @@
   _, args = parser.parse_args()
   if len(args) != 3:
     parser.print_usage()
     return 1
 
   AutoRoller(*args).main()
 
 
 if __name__ == '__main__':
   sys.exit(main())