Roll WebRTC 13633:13652 (13 commits)

tools/roll_webrtc.py

 #!/usr/bin/env python
 # Copyright 2015 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 argparse
 import collections
 import logging
 import os
 import re
@@ skipping 136 matching lines @@
   status_to_name = {}
   for trybot_result in tryjob_results:
     status = TRYJOB_STATUS.get(trybot_result['result'], 'UNKNOWN')
     status_to_name.setdefault(status, [])
     status_to_name[status].append(trybot_result['builder'])
 
   print '\n========== TRYJOBS STATUS =========='
   for status,name_list in status_to_name.iteritems():
     print '%s: %s' % (status, ','.join(sorted(name_list)))
 
-
-def _GenerateCLDescriptionCommand(webrtc_current, webrtc_new):
-  def GetChangeLogURL(git_repo_url, current_hash, new_hash):
-    return '%s/+log/%s..%s' % (git_repo_url, current_hash[0:7], new_hash[0:7])
-
-  webrtc_str = 'WebRTC %s:%s' % (webrtc_current.commit_position,
-                                 webrtc_new.commit_position)
-  webrtc_changelog_url = GetChangeLogURL(webrtc_current.git_repo_url,
-                                         webrtc_current.git_commit,
-                                         webrtc_new.git_commit)
-
-  description = [ '-m', 'Roll ' + webrtc_str ]
-  description.extend(['-m', 'Changes: %s' % webrtc_changelog_url])
-  description.extend(['-m', 'TBR='])
-  description.extend(['-m', 'CQ_INCLUDE_TRYBOTS=%s' % EXTRA_TRYBOTS])
-  return description
-
-
 class AutoRoller(object):
   def __init__(self, chromium_src):
     self._chromium_src = chromium_src
 
   def _RunCommand(self, command, working_dir=None, ignore_exit_code=False,
                   extra_env=None):
     """Runs a command and returns the stdout from that command.
 
     If the command fails (exit code != 0), the function will exit the process.
     """
     working_dir = working_dir or self._chromium_src
     logging.debug('cmd: %s cwd: %s', ' '.join(command), working_dir)
     env = os.environ.copy()
     if extra_env:
       logging.debug('extra env: %s', extra_env)
       env.update(extra_env)
     p = subprocess.Popen(command, stdout=subprocess.PIPE,
                          stderr=subprocess.PIPE, shell=IS_WIN, env=env,
                          cwd=working_dir, universal_newlines=True)
     output = p.stdout.read()
     p.wait()
     p.stdout.close()
     p.stderr.close()
 
     if not ignore_exit_code and p.returncode != 0:
       logging.error('Command failed: %s\n%s', str(command), output)
       sys.exit(p.returncode)
     return output
 
+  def _GenerateCLDescriptionCommand(self, webrtc_current, webrtc_new):
+    commit_range = '%s..%s' % (webrtc_current.git_commit[:7],
+                               webrtc_new.git_commit[:7])
+
+    webrtc_changelog_url = '%s/+log/%s' % (webrtc_current.git_repo_url,
+                                           commit_range)
+
+    git_log_cmd = ['git', 'log', commit_range, '--date=short', '--no-merges',
+                   '--format=%ad %ae %s']
+
+    working_dir = os.path.join(self._chromium_src, WEBRTC_PATH)
+    git_log = self._RunCommand(git_log_cmd, working_dir=working_dir)
+
+    nb_commits = git_log.count('\n')
+    webrtc_header = 'Roll WebRTC %s:%s (%d commit%s)' % (
+        webrtc_current.commit_position, webrtc_new.commit_position,
+        nb_commits, 's' if nb_commits > 1 else '')
+
+    description = ('%s\n\n'
+                   'Changes: %s\n\n'
+                   '$ %s\n'
+                   '%s\n'
+                   'TBR=\n'
+                   'CQ_INCLUDE_TRYBOTS=%s\n') % (
+                       webrtc_header,
+                       webrtc_changelog_url,
+                       ' '.join(git_log_cmd),
+                       git_log,
+                       EXTRA_TRYBOTS)
+
+    return description
+
   def _GetCommitInfo(self, path_below_src, git_hash=None, git_repo_url=None):
     working_dir = os.path.join(self._chromium_src, path_below_src)
     self._RunCommand(['git', 'fetch', 'origin'], working_dir=working_dir)
     revision_range = git_hash or 'origin'
     ret = self._RunCommand(
         ['git', '--no-pager', 'log', revision_range, '--pretty=full', '-1'],
         working_dir=working_dir)
     return CommitInfo(_ParseGitCommitPosition(ret), _ParseGitCommitHash(ret),
                       git_repo_url)
 
@@ skipping 77 matching lines @@
     if IS_WIN:
       # Make sure the roll script doesn't use Windows line endings.
       self._RunCommand(['git', 'config', 'core.autocrlf', 'true'])
 
     self._UpdateDep(deps_filename, WEBRTC_PATH, webrtc_latest)
 
     if self._IsTreeClean():
       print 'The latest revision is already rolled for WebRTC.'
       self._DeleteRollBranch()
     else:
-      description = _GenerateCLDescriptionCommand(
+      description = self._GenerateCLDescriptionCommand(
         webrtc_current, webrtc_latest)
       logging.debug('Committing changes locally.')
       self._RunCommand(['git', 'add', '--update', '.'])
-      self._RunCommand(['git', 'commit'] + description)
+      self._RunCommand(['git', 'commit', '-m', description])
       logging.debug('Uploading changes...')
       self._RunCommand(['git', 'cl', 'upload'],
                        extra_env={'EDITOR': 'true'})
       cl_info = self._GetCLInfo()
       logging.debug('Issue: %d URL: %s', cl_info.issue, cl_info.url)
 
       if not dry_run and not no_commit:
         logging.debug('Sending the CL to the CQ...')
         self._RunCommand(['git', 'cl', 'set_commit'])
         logging.debug('Sent the CL to the CQ. Monitor here: %s', cl_info.url)
@@ skipping 98 matching lines @@
   if args.abort:
     return autoroller.Abort()
   elif args.wait_for_trybots:
     return autoroller.WaitForTrybots()
   else:
     return autoroller.PrepareRoll(args.dry_run, args.ignore_checks,
                                   args.no_commit, args.close_previous_roll)
 
 if __name__ == '__main__':
   sys.exit(main())