Ignore CC_LIST when private flag is specified.

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."""
 
 from distutils.version import LooseVersion
@@ skipping 424 matching lines @@
     self.watchers = ()
     self._remote = None
     self._props = None
 
   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:
-      base_cc = settings  .GetDefaultCCList()
+      base_cc = settings.GetDefaultCCList()
       more_cc = ','.join(self.watchers)
       self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
     return self.cc
 
+  def GetCCListWithoutDefault(self):
+    """Return the users cc'd on this CL excluding default ones."""
+    if self.cc is None:
+      self.cc = ','.join(self.watchers)
+    return self.cc
+
   def SetWatchers(self, watchers):
     """Set the list of email addresses that should be cc'd based on the changed
        files in this CL.
     """
     self.watchers = watchers
 
   def GetBranch(self):
     """Returns the short branch name, e.g. 'master'."""
     if not self.branch:
       self.branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
@@ skipping 954 matching lines @@
       print "Description is empty; aborting."
       return 1
 
     upload_args.extend(['--message', change_desc.description])
     if change_desc.get_reviewers():
       upload_args.append('--reviewers=' + ','.join(change_desc.get_reviewers()))
     if options.send_mail:
       if not change_desc.get_reviewers():
         DieWithError("Must specify reviewers to send email.")
       upload_args.append('--send_mail')
-    cc = ','.join(filter(None, (cl.GetCCList(), ','.join(options.cc))))
+
+    # We check this before applying rietveld.private assuming that in
+    # rietveld.cc only addresses which we can send private CLs to are listed
+    # if rietveld.private is set, and so we should ignore rietveld.cc only when
+    # --private is specified explicitly on the command line.
+    if options.private:
+      logging.warn('rietveld.cc is ignored since private flag is specified.  '
+                   'You need to review and add them manually if necessary.')
+      cc = cl.GetCCListWithoutDefault()
+    else:
+      cc = cl.GetCCList()
+    cc = ','.join(filter(None, (cc, ','.join(options.cc))))
     if cc:
       upload_args.extend(['--cc', cc])
 
   if options.private or settings.GetDefaultPrivateFlag() == "True":
     upload_args.append('--private')
 
   upload_args.extend(['--git_similarity', str(options.similarity)])
   if not options.find_copies:
     upload_args.extend(['--git_no_find_copies'])
 
@@ skipping 821 matching lines @@
         ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
           'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
 
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   colorama.init()
   sys.exit(main(sys.argv[1:]))