Include svn revision range in Blink roll descriptions.

scripts/tools/blink_roller/auto_roll_test.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.
 
 
 import datetime
 import unittest
 
 import auto_roll
@@ skipping 121 matching lines @@
         'created': created_datetime or self.RECENT_ISSUE_CREATED_STR,
         'description': 'Test_Project roll %s:%s' % (self._display_rev(old_rev),
                                                     self._display_rev(new_rev)),
         'issue': 1234567,
         'messages': [],
         'modified': created_datetime or self.RECENT_ISSUE_CREATED_STR,
         'subject': 'Test_Project roll %s:%s' % (old_rev, new_rev),
     }
 
   def _get_last_revision(self):
-    auto_roll.subprocess2.check_call(
-        ['git', '--git-dir', './.git', 'fetch'])
     auto_roll.subprocess2.check_output(
         ['git', '--git-dir', './.git', 'show', 'origin/master:DEPS']
         ).AndReturn(self.DEPS_CONTENT)
 
   def _get_current_revision(self):
-    auto_roll.subprocess2.check_call(
-        ['git', '--git-dir', './third_party/test_project/.git', 'fetch'])
     if self._arb._git_mode:
       self._parse_origin_master(returnval=self.NEW_REV)
     else:
       auto_roll.subprocess2.check_output(
           ['git', '--git-dir', './third_party/test_project/.git', 'show', '-s',
            'origin/master']).AndReturn(self.GIT_LOG_UPDATED)
 
   def _upload_issue(self, custom_message=None):
+    auto_roll.subprocess2.check_call(
+        ['git', '--git-dir', './.git', 'fetch'])
+    auto_roll.subprocess2.check_call(
+        ['git', '--git-dir', './third_party/test_project/.git', 'fetch'])
+
     self._get_last_revision()
     self._get_current_revision()
+    if self._arb._git_mode:
+      auto_roll.subprocess2.check_output(
+          ['git', '--git-dir', './third_party/test_project/.git', 'show', '-s',
+           'origin/master']).AndReturn(self.GIT_LOG_UPDATED)
+
     self._compare_revs(self.OLD_REV, self.NEW_REV)
 
     auto_roll.subprocess2.check_call(['git', 'clean', '-d', '-f'], cwd='.')
     auto_roll.subprocess2.call(['git', 'rebase', '--abort'], cwd='.')
     auto_roll.subprocess2.call(['git', 'branch', '-D', 'test_project_roll'],
                                cwd='.')
     auto_roll.subprocess2.check_call(['git', 'checkout', 'origin/master', '-f'],
                                      cwd='.')
     auto_roll.subprocess2.check_call(['git', 'checkout',
                                       '-b', 'test_project_roll',
                                       '-t', 'origin/master', '-f'], cwd='.')
 
     from_rev = self._display_rev(self.OLD_REV)
     to_rev = self._display_rev(self.NEW_REV)
-    message = custom_message or 'Test_Project roll %s:%s' % (from_rev, to_rev)
+
+    if custom_message:
+      message = custom_message
+    else:
+      message = 'Test_Project roll %s:%s' % (from_rev, to_rev)
+      if self._arb._git_mode:
+        message += ' (svn %s:%s)' % (self.OLD_SVN_REV, self.NEW_SVN_REV)
+
     message += '\nTBR='
     auto_roll.subprocess2.check_call(
         ['roll-dep', 'third_party/%s' % self.TEST_PROJECT, str(self.NEW_REV)],
         cwd='.')
 
     auto_roll.subprocess2.check_call(['git', 'add', 'DEPS'], cwd='.')
     auto_roll.subprocess2.check_call(['git', 'commit', '-m', message], cwd='.')
     auto_roll.subprocess2.check_call(['git', 'cl', 'upload', '--bypass-hooks',
                                       '--use-commit-queue', '-f',
                                       '-m', message],
@@ skipping 39 matching lines @@
 
   def test_already_rolling(self):
     if self.__class__.__name__ == 'AutoRollTestBase':
       return
     issue = self._make_issue()
     search_results = [issue]
     self._arb._rietveld.search(owner=self.TEST_AUTHOR,
                                closed=2).AndReturn(search_results)
     self._arb._rietveld.get_issue_properties(issue['issue'],
                                              messages=True).AndReturn(issue)
-    auto_roll.subprocess2.check_call(
-        ['git', '--git-dir', './.git', 'fetch'])
     auto_roll.subprocess2.check_output(
         ['git', '--git-dir', './.git', 'show', 'origin/master:DEPS']
         ).AndReturn(self.DEPS_CONTENT)
     if self._arb._git_mode:
       self._short_rev(self.OLD_REV)
     self.mox.ReplayAll()
     self.assertEquals(self._arb.main(), 0)
     self.checkstdout('https://codereview.chromium.org/%d/ started %s ago\n'
                      'https://codereview.chromium.org/%d/ is still active, '
                      'nothing to do.\n'
@@ skipping 48 matching lines @@
         ['git', '--git-dir', './.git', 'fetch'])
     auto_roll.subprocess2.check_output(
         ['git', '--git-dir', './.git', 'show', 'origin/master:DEPS']
         ).AndReturn(self.DEPS_CONTENT)
     auto_roll.subprocess2.check_call(
         ['git', '--git-dir', './third_party/test_project/.git', 'fetch'])
     if self._arb._git_mode:
       auto_roll.subprocess2.check_output(
           ['git', '--git-dir', './third_party/test_project/.git', 'rev-parse',
            'origin/master']).AndReturn(self.OLDER_REV)
-    else:
-      auto_roll.subprocess2.check_output(
-          ['git', '--git-dir', './third_party/test_project/.git', 'show', '-s',
-           'origin/master']).AndReturn(self.GIT_LOG_TOO_OLD)
+    auto_roll.subprocess2.check_output(
+        ['git', '--git-dir', './third_party/test_project/.git', 'show', '-s',
+         'origin/master']).AndReturn(self.GIT_LOG_TOO_OLD)
     self._compare_revs(self.OLD_REV, self.OLDER_REV)
 
     self.mox.ReplayAll()
     try:
       self._arb.main()
     except auto_roll.AutoRollException, e:
       self.assertEquals(e.args[0], ('Already at %s refusing to roll backwards '
                                     'to %s.') % (self.OLD_REV, self.OLDER_REV))
 
   def test_upload_issue(self):
@@ skipping 18 matching lines @@
       return
     self._get_current_revision()
     self.mox.ReplayAll()
     self.assertEquals(type(self._arb._current_revision()), str)
 
   def test_extra_trybots(self):
     if self.__class__.__name__ == 'AutoRollTestBase':
       return
     self._arb._cq_extra_trybots = ['sometrybot']
     self._arb._rietveld.search(owner=self.TEST_AUTHOR, closed=2).AndReturn([])
-    commit_msg = ('Test_Project roll %s:%s\n\nCQ_EXTRA_TRYBOTS=sometrybot' %
+    commit_msg = ('Test_Project roll %s:%s' %
                   (self._display_rev(self.OLD_REV),
                    self._display_rev(self.NEW_REV)))
+    if self._arb._git_mode:
+      commit_msg += ' (svn %s:%s)' % (self.OLD_SVN_REV, self.NEW_SVN_REV)
+    commit_msg += '\n\nCQ_EXTRA_TRYBOTS=sometrybot'
     self._upload_issue(custom_message=commit_msg)
     self.mox.ReplayAll()
     self.assertEquals(self._arb.main(), 0)
 
 
 class AutoRollTestSVN(AutoRollTestBase):
 
   OLDER_REV = 1231
   OLD_REV = 1234
   NEW_REV = 1235
@@ skipping 36 matching lines @@
   def _parse_origin_master(self, returnval):
     # Not required for SVN.
     pass
 
 
 class AutoRollTestGit(AutoRollTestBase):
 
   OLDER_REV = 'cfcf604fbdcf6e2d9b982a2fab3fc9f1e3f8cd65'
   OLD_REV =   'b9af6489f6f2004ad11b82c6057f7007e3c35372'
   NEW_REV =   '79539998e04afab3ee9c3016881755ca52f60a73'
+  OLDER_SVN_REV = 1231
+  OLD_SVN_REV = 1234
+  NEW_SVN_REV = 1235
 
   DEPS_CONTENT = '''
 vars = {
-  'test_project_revision': '%s', # Some comment.
+  'test_project_revision': '%s', # from svn revision %s
 }
-''' % OLD_REV
+''' % (OLD_REV, OLD_SVN_REV)
 
   _GIT_LOG = '''
 commit %s
 Author: Test Author <test_author@example.com>
 Date:   Wed Apr 2 14:00:14 2014 -0400
 
     Make some changes.
+
+    git-svn-id: svn://svn.url/trunk@%d abcdefgh-abcd-abcd-abcd-abcdefghijkl
 '''
-  GIT_LOG_UPDATED = _GIT_LOG % NEW_REV
-  GIT_LOG_TOO_OLD = _GIT_LOG % OLDER_REV
+  GIT_LOG_UPDATED = _GIT_LOG % (NEW_REV, NEW_SVN_REV)
+  GIT_LOG_TOO_OLD = _GIT_LOG % (OLDER_REV, OLDER_SVN_REV)
 
   _commit_timestamps = {
     OLDER_REV: '1399573100',
     OLD_REV: '1399573342',
     NEW_REV: '1399598876',
   }
 
   def setUp(self):
     AutoRollTestBase.setUp(self)
     self._arb._git_mode = True
@@ skipping 29 matching lines @@
 
   # pylint: disable=R0201
   def _parse_origin_master(self, returnval):
     auto_roll.subprocess2.check_output(
         ['git', '--git-dir', './third_party/test_project/.git', 'rev-parse',
          'origin/master']).AndReturn(returnval)
 
 
 if __name__ == '__main__':
   unittest.main()