Revert of Add CC_LIST and --cc to Gerrit issues via API to be similar to CCs in Rietveld

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 and Gerrit."""
 
 from __future__ import print_function
@@ skipping 2600 matching lines @@
       # reverse on its side.
       refspec_opts.append('m=' + options.title.replace(' ', '_'))
 
     if options.send_mail:
       if not change_desc.get_reviewers():
         DieWithError('Must specify reviewers to send email.')
       refspec_opts.append('notify=ALL')
     else:
       refspec_opts.append('notify=NONE')
 
+    cc = self.GetCCList().split(',')
+    if options.cc:
+      cc.extend(options.cc)
+    cc = filter(None, cc)
+    if cc:
+      refspec_opts.extend('cc=' + email.strip() for email in cc)
+
     reviewers = change_desc.get_reviewers()
     if reviewers:
       refspec_opts.extend('r=' + email.strip() for email in reviewers)
 
     if options.private:
       refspec_opts.append('draft')
 
     if options.topic:
       # Documentation on Gerrit topics is here:
       # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
@@ skipping 17 matching lines @@
       regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
       change_numbers = [m.group(1)
                         for m in map(regex.match, push_stdout.splitlines())
                         if m]
       if len(change_numbers) != 1:
         DieWithError(
           ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
            'Change-Id: %s') % (len(change_numbers), change_id))
       self.SetIssue(change_numbers[0])
       self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
-
-    # Add cc's from the CC_LIST and --cc flag (if any).
-    cc = self.GetCCList().split(',')
-    if options.cc:
-      cc.extend(options.cc)
-    cc = filter(None, cc)
-    if cc:
-      gerrit_util.AddReviewers(
-          self._GetGerritHost(), self.GetIssue(), cc, is_reviewer=False)
-
     return 0
 
   def _AddChangeIdToCommitMessage(self, options, args):
     """Re-commits using the current message, assumes the commit hook is in
     place.
     """
     log_desc = options.message or CreateDescriptionFromLog(args)
     git_command = ['commit', '--amend', '-m', log_desc]
     RunGit(git_command)
     new_log_desc = CreateDescriptionFromLog(args)
@@ skipping 2621 matching lines @@
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   setup_color.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)