Add --private option to git_cl.py

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 349 matching lines @@
     return self.tree_status_url
 
   def GetViewVCUrl(self):
     if not self.viewvc_url:
       self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
     return self.viewvc_url
 
   def GetDefaultCCList(self):
     return self._GetConfig('rietveld.cc', error_ok=True)
 
+  def GetDefaultPrivateFlag(self):
+    return self._GetConfig('rietveld.private', error_ok=True)
+
   def GetIsGerrit(self):
     """Return true if this repo is assosiated with gerrit code review system."""
     if self.is_gerrit is None:
       self.is_gerrit = self._GetConfig('gerrit.host', error_ok=True)
     return self.is_gerrit
 
   def GetGitEditor(self):
     """Return the editor specified in the git config, or None if none is."""
     if self.git_editor is None:
       self.git_editor = self._GetConfig('core.editor', error_ok=True)
@@ skipping 420 matching lines @@
     new_val = ask_for_data(prompt + ':')
     if new_val == 'x':
       RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
     elif new_val:
       if is_url:
         new_val = gclient_utils.UpgradeToHttps(new_val)
       if new_val != initial:
         RunGit(['config', 'rietveld.' + name, new_val])
 
   SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
+  SetProperty(settings.GetDefaultPrivateFlag(),
+              'Private flag (rietveld only)', 'private', False)
   SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
               'tree-status-url', False)
   SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
 
   # TODO: configure a default branch to diff against, rather than this
   # svn-based hackery.
 
 
 class ChangeDescription(object):
   """Contains a parsed form of the change description."""
@@ skipping 117 matching lines @@
     fullname = 'rietveld.' + name
     if setting in keyvals:
       RunGit(['config', fullname, keyvals[setting]])
     else:
       RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
 
   SetProperty('server', 'CODE_REVIEW_SERVER')
   # Only server setting is required. Other settings can be absent.
   # In that case, we ignore errors raised during option deletion attempt.
   SetProperty('cc', 'CC_LIST', unset_error_ok=True)
+  SetProperty('private', 'PRIVATE', unset_error_ok=True)
   SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
   SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
 
   if 'GERRIT_HOST' in keyvals and 'GERRIT_PORT' in keyvals:
     RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
     RunGit(['config', 'gerrit.port', keyvals['GERRIT_PORT']])
 
   if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
     #should be of the form
     #PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
@@ skipping 307 matching lines @@
     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))))
     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'])
 
   # 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()
   if not remote_url:
     if settings.GetIsGitSvn():
       # URL is dependent on the current directory.
@@ skipping 62 matching lines @@
   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('--private', action='store_true',
+                    help='set the review private (rietveld only)')
   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
@@ skipping 725 matching lines @@
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 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:]))