diff options
| author | Henrik Kjellander <kjellander@google.com> | 2015-10-05 10:44:24 +0200 |
|---|---|---|
| committer | Henrik Kjellander <kjellander@google.com> | 2015-10-05 08:44:34 +0000 |
| commit | 42b6c634f00ca0b5e8d0f304574282a1112889cf (patch) | |
| tree | ce5416eecfeea9924f97e1a65d3eef586eaf8f44 /tools | |
| parent | 990d57dc6569dee924c702011d160dfad0878d81 (diff) | |
| download | webrtc-42b6c634f00ca0b5e8d0f304574282a1112889cf.tar.gz | |
autoroller: Allow to specify Rietveld e-mail.
This is useful in order to specify which account to be used
for creating the Rietveld CL.
Always pass -f to force yes to any prompts during uplaod.
BUG=webrtc:4688
R=phoglund@webrtc.org
Review URL: https://codereview.webrtc.org/1383203002 .
Cr-Commit-Position: refs/heads/master@{#10165}
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/autoroller/roll_chromium_revision.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/tools/autoroller/roll_chromium_revision.py b/tools/autoroller/roll_chromium_revision.py index 4331a2c08a..917ecd6570 100755 --- a/tools/autoroller/roll_chromium_revision.py +++ b/tools/autoroller/roll_chromium_revision.py @@ -349,10 +349,13 @@ def _LocalCommit(commit_msg, dry_run): _RunCommand(['git', 'commit', '-m', commit_msg]) -def _UploadCL(dry_run): +def _UploadCL(dry_run, rietveld_email=None): logging.info('Uploading CL...') if not dry_run: - _RunCommand(['git', 'cl', 'upload'], extra_env={'EDITOR': 'true'}) + cmd = ['git', 'cl', 'upload', '-f'] + if rietveld_email: + cmd.append('--email=%s' % rietveld_email) + _RunCommand(cmd, extra_env={'EDITOR': 'true'}) def _LaunchTrybots(dry_run, skip_try): @@ -375,6 +378,10 @@ def main(): p.add_argument('-r', '--revision', help=('Chromium Git revision to roll to. Defaults to the ' 'Chromium HEAD revision if omitted.')) + p.add_argument('-u', '--rietveld-email', + help=('E-mail address to use for creating the CL at Rietveld' + 'If omitted a previously cached one will be used or an ' + 'error will be thrown during upload.')) p.add_argument('--dry-run', action='store_true', default=False, help=('Calculate changes and modify DEPS, but don\'t create ' 'any local branch, commit, upload CL or send any ' @@ -439,7 +446,7 @@ def main(): _CreateRollBranch(opts.dry_run) UpdateDeps(deps_filename, current_cr_rev, new_cr_rev) _LocalCommit(commit_msg, opts.dry_run) - _UploadCL(opts.dry_run) + _UploadCL(opts.dry_run, opts.rietveld_email) _LaunchTrybots(opts.dry_run, opts.skip_try) _SendToCQ(opts.dry_run, opts.skip_cq) return 0 |