Add support for git cl upload --cc foo@example.com

git_cl/git_cl.py

 #!/usr/bin/python
 # git-cl -- a git-command for integrating reviews on Rietveld
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 import errno
 import logging
 import optparse
 import os
 import re
 import subprocess
@@ skipping 119 matching lines @@
         self.default_server = FixUrl(self._GetConfig(
             'rietveld.server', error_message=error_message))
     return self.default_server
 
   def GetCCList(self):
     """Return the users cc'd on this CL.
 
     Return is a string suitable for passing to gcl with the --cc flag.
     """
     if self.cc is None:
-      self.cc = self._GetConfig('rietveld.cc', error_ok=True)
+      base_cc = self._GetConfig('rietveld.cc', error_ok=True)
       more_cc = self._GetConfig('rietveld.extracc', error_ok=True)
-      if more_cc is not None:
-        self.cc += ',' + more_cc
+      self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
     return self.cc
 
   def GetRoot(self):
     if not self.root:
       self.root = os.path.abspath(RunGit(['rev-parse', '--show-cdup']).strip())
     return self.root
 
   def GetIsGitSvn(self):
     """Return true if this repo looks like it's using git-svn."""
     if self.is_git_svn is None:
@@ skipping 549 matching lines @@
 
 
 @usage('[args to "git diff"]')
 def CMDupload(parser, args):
   """upload the current changelist to codereview"""
   parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
                     help='bypass upload presubmit hook')
   parser.add_option('-m', dest='message', help='message for patch')
   parser.add_option('-r', '--reviewers',
                     help='reviewer email addresses')
+  parser.add_option('--cc',
+                    help='cc email addresses')
   parser.add_option('--send-mail', action='store_true',
                     help='send email to reviewer immediately')
   parser.add_option("--emulate_svn_auto_props", action="store_true",
                     dest="emulate_svn_auto_props",
                     help="Emulate Subversion's auto properties feature.")
   parser.add_option("--desc_from_logs", action="store_true",
                     dest="from_logs",
                     help="""Squashes git commit logs into change description and
                             uses message as subject""")
   (options, args) = parser.parse_args(args)
@@ skipping 63 matching lines @@
         log_desc += '\nTEST='
       change_desc = UserEditedLog(initial_text + log_desc)
       subject = ''
       if change_desc:
         subject = change_desc.splitlines()[0]
     if not change_desc:
       print "Description is empty; aborting."
       return 1
     upload_args.extend(['--message', subject])
     upload_args.extend(['--description', change_desc])
-    upload_args.extend(['--cc', settings.GetCCList()])
+    cc = ','.join(filter(None, (settings.GetCCList(), options.cc)))
+    if cc:
+      upload_args.extend(['--cc', cc])
 
   # Include the upstream repo's URL in the change -- this is useful for
   # projects that have their source spread across multiple repos.
   remote_url = None
   if settings.GetIsGitSvn():
     data = RunGit(['svn', 'info'])
     if data:
       keys = dict(line.split(': ', 1) for line in data.splitlines()
                   if ': ' in line)
       remote_url = keys.get('URL', None)
@@ skipping 462 matching lines @@
             ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))