| Index: tools/autoroller/roll_chromium_revision.py
|
| diff --git a/tools/autoroller/roll_chromium_revision.py b/tools/autoroller/roll_chromium_revision.py
|
| index 4f2de2f7e9c30c5624139536125f845073a24326..262eba1cc280b076d336a299dc5e07215e8ca8ca 100755
|
| --- a/tools/autoroller/roll_chromium_revision.py
|
| +++ b/tools/autoroller/roll_chromium_revision.py
|
| @@ -259,13 +259,17 @@ def GenerateCommitMessage(current_cr_rev, new_cr_rev, changed_deps_list,
|
|
|
| commit_msg = ['Roll chromium_revision %s (%s)' % (rev_interval,
|
| git_number_interval)]
|
| -
|
| + # TBR field will be empty unless in some custom cases, where some engineers
|
| + # are added.
|
| + tbr_authors = ''
|
| if changed_deps_list:
|
| commit_msg.append('\nRelevant changes:')
|
|
|
| for c in changed_deps_list:
|
| commit_msg.append('* %s: %s..%s' % (c.path, c.current_rev[0:7],
|
| c.new_rev[0:7]))
|
| + if 'libvpx' in c.path:
|
| + tbr_authors += 'marpan@webrtc.org, stefan@webrtc.org, '
|
|
|
| change_url = CHROMIUM_FILE_TEMPLATE % (rev_interval, 'DEPS')
|
| commit_msg.append('Details: %s' % change_url)
|
| @@ -276,8 +280,10 @@ def GenerateCommitMessage(current_cr_rev, new_cr_rev, changed_deps_list,
|
| change_url = CHROMIUM_FILE_TEMPLATE % (rev_interval,
|
| CLANG_UPDATE_SCRIPT_URL_PATH)
|
| commit_msg.append('Details: %s' % change_url)
|
| + tbr_authors += 'pbos@webrtc.org'
|
| else:
|
| commit_msg.append('\nClang version was not updated in this roll.')
|
| + commit_msg.append('\nTBR=%s\n' % tbr_authors)
|
| return '\n'.join(commit_msg)
|
|
|
|
|
| @@ -307,8 +313,7 @@ def _EnsureUpdatedMasterBranch(dry_run):
|
| sys.exit(-1)
|
|
|
| logging.info('Updating master branch...')
|
| - if not dry_run:
|
| - _RunCommand(['git', 'pull'])
|
| + _RunCommand(['git', 'pull'])
|
|
|
|
|
| def _CreateRollBranch(dry_run):
|
|
|