Extract authentication options handling into a separate function.

git_cherry_pick_upload.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.
 
 """Upload a cherry pick CL to rietveld."""
 
-import argparse
 import md5
+import optparse
 import subprocess2
 import sys
 
+import auth
+
 from git_cl import Changelist
 from git_common import config, run
 from third_party.upload import EncodeMultipartFormData, GitVCS
 from rietveld import Rietveld
 
 
-def cherry_pick(target_branch, commit):
+def cherry_pick(target_branch, commit, auth_config):
   """Attempt to upload a cherry pick CL to rietveld.
 
   Args:
     target_branch: The branch to cherry pick onto.
     commit: The git hash of the commit to cherry pick.
+    auth_config: auth.AuthConfig object with authentication configuration.
   """
   author = config('user.email')
 
   description = '%s\n\n(cherry picked from commit %s)\n' % (
       run('show', '--pretty=%B', '--quiet', commit), commit)
 
   parent = run('show', '--pretty=%P', '--quiet', commit)
   print 'Found parent revision:', parent
 
   class Options(object):
     def __init__(self):
       self.emulate_svn_auto_props = False
 
   content_type, payload = EncodeMultipartFormData([
       ('base', '%s@%s' % (Changelist().GetRemoteUrl(), target_branch)),
       ('cc', config('rietveld.cc')),
       ('content_upload', '1'),
       ('description', description),
       ('project', '%s@%s' % (config('rietveld.project'), target_branch)),
       ('subject', description.splitlines()[0]),
       ('user', author),
   ], [
       ('data', 'data.diff', GitVCS(Options()).PostProcessDiff(
           run('diff', parent, commit))),
   ])
 
-  rietveld = Rietveld(config('rietveld.server'), author, None)
+  rietveld = Rietveld(config('rietveld.server'), auth_config, author)
   # pylint: disable=W0212
   output = rietveld._send(
     '/upload',
     payload=payload,
     content_type=content_type,
   ).splitlines()
 
   # If successful, output will look like:
   # Issue created. URL: https://codereview.chromium.org/1234567890
   # 1
@@ skipping 55 matching lines @@
         '/%s/upload_content/%s/%s' % (issue, patchset, file_id),
         payload=payload,
         content_type=content_type,
       )
 
     # pylint: disable=W0212
     print 'Finalizing upload:', rietveld._send('/%s/upload_complete/1' % issue)
 
 
 def main():
-  parser = argparse.ArgumentParser()
-  parser.add_argument(
+  parser = optparse.OptionParser(
+      usage='usage: %prog --branch <branch> <commit>')
+  parser.add_option(
       '--branch',
       '-b',
       help='The upstream branch to cherry pick to.',
-      metavar='<branch>',
-      required=True,
-  )
-  parser.add_argument(
-      'commit',
-      help='SHA to cherry pick.',
-      metavar='<commit>',
-  )
-  args = parser.parse_args()
-  cherry_pick(args.branch, args.commit)
+      metavar='<branch>')
+  auth.add_auth_options(parser)
+  options, args = parser.parse_args()
+  auth_config = auth.extract_auth_config_from_options
+
+  if not options.branch:
+    parser.error('--branch is required')
+  if len(args) != 1:
+    parser.error('Expecting single argument <commit>')
+
+  cherry_pick(options.branch, args[0], auth_config)
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main())
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)