autoroller: Allow to specify Rietveld e-mail.

tools/autoroller/roll_chromium_revision.py

 #!/usr/bin/env python
 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 """Script to roll chromium_revision in the WebRTC DEPS file."""
@@ skipping 331 matching lines @@
       _RunCommand(['git', 'branch', '-D', ROLL_BRANCH_NAME])
 
 
 def _LocalCommit(commit_msg, dry_run):
   logging.info('Committing changes locally.')
   if not dry_run:
     _RunCommand(['git', 'add', '--update', '.'])
     _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):
   logging.info('Sending tryjobs...')
   if not dry_run and not skip_try:
     _RunCommand(['git', 'cl', 'try'])
 
 
 def _SendToCQ(dry_run, skip_cq):
   logging.info('Sending the CL to the CQ...')
   if not dry_run and not skip_cq:
     _RunCommand(['git', 'cl', 'set_commit'])
     logging.info('Sent the CL to the CQ.')
 
 
 def main():
   p = argparse.ArgumentParser()
   p.add_argument('--clean', action='store_true', default=False,
                  help='Removes any previous local roll branch.')
   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 '
                        'tryjobs.'))
   p.add_argument('--allow-reverse', action='store_true', default=False,
                  help=('Allow rolling back in time (disabled by default but '
                        'may be useful to be able do to manually).'))
   p.add_argument('-s', '--skip-try', action='store_true', default=False,
                  help='Skip sending tryjobs (default: %(default)s)')
   p.add_argument('--skip-cq', action='store_true', default=False,
@@ skipping 44 matching lines @@
     logging.info('Currently pinned chromium_revision: %s (#%s) is newer than '
                  '%s (#%s). To roll to older revisions, you must pass the '
                  '--allow-reverse flag.\n'
                  'Aborting without action.', current_cr_rev, current_commit_pos,
                  new_cr_rev, new_commit_pos)
     return 0
 
   _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
 
 
 if __name__ == '__main__':
   sys.exit(main())