Make git-cl accepts multiple --reviewers and --cc arguments.

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 import json
@@ skipping 810 matching lines @@
     content = re.compile(r'^#.*$', re.MULTILINE).sub('', content).strip()
     if not content.strip():
       DieWithError('No CL description, aborting')
     self.description = content
 
   def ParseDescription(self):
     """Updates the list of reviewers and subject from the description."""
     self.description = self.description.strip('\n') + '\n'
     # Retrieves all reviewer lines
     regexp = re.compile(r'^\s*(TBR|R)=(.+)$', re.MULTILINE)
-    reviewers = ','.join(
+    reviewers = ', '.join(
         i.group(2).strip() for i in regexp.finditer(self.description))
     if reviewers:
       self.reviewers = reviewers
 
   def IsEmpty(self):
     return not self.description
 
 
 def FindCodereviewSettingsFile(filename='codereview.settings'):
   """Finds the given file starting in the cwd and going up.
@@ skipping 257 matching lines @@
   # It is probably not worthwhile to support different workflows.
   remote = 'origin'
   branch = 'master'
   if options.target_branch:
     branch = options.target_branch
 
   log_desc = options.message or CreateDescriptionFromLog(args)
   if CHANGE_ID not in log_desc:
     AddChangeIdToCommitMessage(options, args)
   if options.reviewers:
-    log_desc += '\nR=' + options.reviewers
-  change_desc = ChangeDescription(log_desc, options.reviewers)
+    log_desc += '\nR=' + ', '.join(options.reviewers)
+  change_desc = ChangeDescription(log_desc, ', '.join(options.reviewers))
   change_desc.ParseDescription()
   if change_desc.IsEmpty():
     print "Description is empty; aborting."
     return 1
 
   receive_options = []
   cc = cl.GetCCList().split(',')
   if options.cc:
-    cc += options.cc.split(',')
+    cc.extend(options.cc)
   cc = filter(None, cc)
   if cc:
     receive_options += ['--cc=' + email for email in cc]
   if change_desc.reviewers:
-    reviewers = filter(None, change_desc.reviewers.split(','))
+    reviewers = filter(
+        None, (r.strip() for r in change_desc.reviewers.split(',')))
     if reviewers:
       receive_options += ['--reviewer=' + email for email in reviewers]
 
   git_command = ['push']
   if receive_options:
     git_command.append('--receive-pack=git receive-pack %s' %
                        ' '.join(receive_options))
   git_command += [remote, 'HEAD:refs/for/' + branch]
   RunGit(git_command)
   # TODO(ukai): parse Change-Id: and set issue number?
@@ skipping 17 matching lines @@
       # for upload.py.  Soon this will be changed to set the --message option.
       # Will wait until people are used to typing -t instead of -m.
       upload_args.extend(['--title', options.message])
     upload_args.extend(['--issue', str(cl.GetIssue())])
     print ("This branch is associated with issue %s. "
            "Adding patch to that issue." % cl.GetIssue())
   else:
     if options.title:
       upload_args.extend(['--title', options.title])
     message = options.title or options.message or CreateDescriptionFromLog(args)
-    change_desc = ChangeDescription(message, options.reviewers)
+    change_desc = ChangeDescription(message, ','.join(options.reviewers))
     if not options.force:
       change_desc.Prompt()
     change_desc.ParseDescription()
 
     if change_desc.IsEmpty():
       print "Description is empty; aborting."
       return 1
 
     upload_args.extend(['--message', change_desc.description])
     if change_desc.reviewers:
-      upload_args.extend(['--reviewers', change_desc.reviewers])
+      upload_args.extend(
+          [
+            '--reviewers',
+            ','.join(r.strip() for r in change_desc.reviewers.split(',')),
+          ])
     if options.send_mail:
       if not change_desc.reviewers:
         DieWithError("Must specify reviewers to send email.")
       upload_args.append('--send_mail')
-    cc = ','.join(filter(None, (cl.GetCCList(), options.cc)))
+    cc = ','.join(filter(None, (cl.GetCCList(), ','.join(options.cc))))
     if cc:
       upload_args.extend(['--cc', cc])
 
   upload_args.extend(['--git_similarity', str(options.similarity)])
   if not options.find_copies:
     upload_args.extend(['--git_no_find_copies'])
 
   # Include the upstream repo's URL in the change -- this is useful for
   # projects that have their source spread across multiple repos.
   remote_url = cl.GetGitBaseUrlFromConfig()
@@ skipping 32 matching lines @@
 
   if not cl.GetIssue():
     cl.SetIssue(issue)
   cl.SetPatchset(patchset)
 
   if options.use_commit_queue:
     cl.SetFlag('commit', '1')
   return 0
 
 
+def cleanup_list(l):
+  """Fixes a list so that comma separated items are put as individual items.
+
+  So that "--reviewers joe@c,john@c --reviewers joa@c" results in
+  options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
+  """
+  items = sum((i.split(',') for i in l), [])
+  stripped_items = (i.strip() for i in items)
+  return sorted(filter(None, stripped_items))
+
+
 @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('-f', action='store_true', dest='force',
                     help="force yes to questions (don't prompt)")
   parser.add_option('-m', dest='message', help='message for patchset')
   parser.add_option('-t', dest='title', help='title for patchset')
   parser.add_option('-r', '--reviewers',
+                    action='append', default=[],
                     help='reviewer email addresses')
   parser.add_option('--cc',
+                    action='append', default=[],
                     help='cc email addresses')
   parser.add_option('-s', '--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('-c', '--use-commit-queue', action='store_true',
                     help='tell the commit queue to commit this patchset')
   parser.add_option('--target_branch',
                     help='When uploading to gerrit, remote branch to '
                          'use for CL.  Default: master')
   add_git_similarity(parser)
   (options, args) = parser.parse_args(args)
 
   if options.target_branch and not settings.GetIsGerrit():
     parser.error('Use --target_branch for non gerrit repository.')
 
   # Print warning if the user used the -m/--message argument.  This will soon
   # change to -t/--title.
   if options.message:
     print >> sys.stderr, (
         '\nWARNING: Use -t or --title to set the title of the patchset.\n'
         'In the near future, -m or --message will send a message instead.\n'
         'See http://goo.gl/JGg0Z for details.\n')
 
   if is_dirty_git_tree('upload'):
     return 1
 
+  options.reviewers = cleanup_list(options.reviewers)
+  options.cc = cleanup_list(options.cc)
+
   cl = Changelist()
   if args:
     # TODO(ukai): is it ok for gerrit case?
     base_branch = args[0]
   else:
     # Default to diffing against common ancestor of upstream branch
     base_branch = RunGit(['merge-base', cl.GetUpstreamBranch(), 'HEAD']).strip()
     args = [base_branch, 'HEAD']
 
   # Apply watchlists on upload.
   change = cl.GetChange(base_branch, None)
   watchlist = watchlists.Watchlists(change.RepositoryRoot())
   files = [f.LocalPath() for f in change.AffectedFiles()]
   cl.SetWatchers(watchlist.GetWatchersForPaths(files))
 
   if not options.bypass_hooks:
     hook_results = cl.RunHook(committing=False,
                               may_prompt=not options.force,
                               verbose=options.verbose,
                               change=change)
     if not hook_results.should_continue():
       return 1
     if not options.reviewers and hook_results.reviewers:
-      options.reviewers = hook_results.reviewers
+      options.reviewers = hook_results.reviewers.split(',')
 
   if cl.GetIssue():
     latest_patchset = cl.GetMostRecentPatchset(cl.GetIssue())
     local_patchset = cl.GetPatchset()
     if latest_patchset and local_patchset and local_patchset != latest_patchset:
       print ('The last upload made from this repository was patchset #%d but '
             'the most recent patchset on the server is #%d.'
             % (local_patchset, latest_patchset))
       ask_for_data('About to upload; enter to confirm.')
 
@@ skipping 600 matching lines @@
              '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__':
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))