Add --private option to git_cl.py

tests/git_cl_test.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.
 
 """Unit tests for git_cl.py."""
 
 import os
 import StringIO
 import stat
@@ skipping 91 matching lines @@
     # diagnose.
     if expected_args != args:
       msg = '@%d  Expected: %r   Actual: %r' % (
           self._calls_done, expected_args, args)
       git_cl.logging.error(msg)
       self.fail(msg)
     self._calls_done += 1
     return result
 
   @classmethod
-  def _upload_calls(cls, similarity, find_copies):
+  def _upload_calls(cls, similarity, find_copies, private):
     return (cls._git_base_calls(similarity, find_copies) +
-            cls._git_upload_calls())
+            cls._git_upload_calls(private))
 
   @classmethod
   def _upload_no_rev_calls(cls, similarity, find_copies):
     return (cls._git_base_calls(similarity, find_copies) +
             cls._git_upload_no_rev_calls())
 
   @classmethod
   def _git_base_calls(cls, similarity, find_copies):
     if similarity is None:
       similarity = '50'
@@ skipping 54 matching lines @@
        'desc\n'),
     ]
 
   @classmethod
   def _git_upload_no_rev_calls(cls):
     return [
       ((['git', '--no-pager', 'config', 'core.editor'],), ''),
     ]
 
   @classmethod
-  def _git_upload_calls(cls):
+  def _git_upload_calls(cls, private):
+    if private:
+      private_call = []
+    else:
+      private_call = [
+          ((['git', '--no-pager', 'config', 'rietveld.private'],), '')]
+
     return [
-      ((['git', '--no-pager', 'config', 'core.editor'],), ''),
-      ((['git', '--no-pager', 'config', 'rietveld.cc'],), ''),
-      ((['git', '--no-pager', 'config', 'branch.master.base-url'],), ''),
-      ((['git', '--no-pager',
-         'config', '--local', '--get-regexp', '^svn-remote\\.'],),
-        (('', None), 0)),
-      ((['git', '--no-pager', 'rev-parse', '--show-cdup'],), ''),
-      ((['git', '--no-pager', 'svn', 'info'],), ''),
-      ((['git', '--no-pager',
-         'config', 'branch.master.rietveldissue', '1'],), ''),
-      ((['git', '--no-pager', 'config', 'branch.master.rietveldserver',
-          'https://codereview.example.com'],), ''),
-      ((['git', '--no-pager',
-         'config', 'branch.master.rietveldpatchset', '2'],), ''),
-      ((['git', '--no-pager', 'rev-parse', 'HEAD'],), 'hash'),
-      ((['git', '--no-pager', 'symbolic-ref', 'HEAD'],), 'hash'),
-      ((['git', '--no-pager',
-         'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
+        ((['git', '--no-pager', 'config', 'core.editor'],), ''),
+        ((['git', '--no-pager', 'config', 'rietveld.cc'],), '')
+    ] + private_call + [
+        ((['git', '--no-pager', 'config', 'branch.master.base-url'],), ''),
+        ((['git', '--no-pager',
+           'config', '--local', '--get-regexp', '^svn-remote\\.'],),
+         (('', None), 0)),
+        ((['git', '--no-pager', 'rev-parse', '--show-cdup'],), ''),
+        ((['git', '--no-pager', 'svn', 'info'],), ''),
+        ((['git', '--no-pager',
+           'config', 'branch.master.rietveldissue', '1'],), ''),
+        ((['git', '--no-pager', 'config', 'branch.master.rietveldserver',
+           'https://codereview.example.com'],), ''),
+        ((['git', '--no-pager',
+           'config', 'branch.master.rietveldpatchset', '2'],), ''),
+        ((['git', '--no-pager', 'rev-parse', 'HEAD'],), 'hash'),
+        ((['git', '--no-pager', 'symbolic-ref', 'HEAD'],), 'hash'),
+        ((['git', '--no-pager',
+           'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
     ]
 
   @staticmethod
   def _git_sanity_checks(diff_base, working_branch):
     fake_ancestor = 'fake_ancestor'
     fake_cl = 'fake_cl_for_patch'
     return [
       # Calls to verify branch point is ancestor
       ((['git', '--no-pager',
          'rev-parse', '--verify', diff_base],), fake_ancestor),
@@ skipping 110 matching lines @@
          'Review URL: https://codereview.example.com/12345'],),
        ''),
       ((['git', '--no-pager',
          'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
        (('', None), 0)),
       ((['git', '--no-pager', 'checkout', '-q', 'working'],), ''),
       ((['git', '--no-pager', 'branch', '-D', 'git-cl-commit'],), ''),
   ]
 
   @staticmethod
-  def _cmd_line(description, args, similarity, find_copies):
+  def _cmd_line(description, args, similarity, find_copies, private):
     """Returns the upload command line passed to upload.RealMain()."""
     return [
         'upload', '--assume_yes', '--server',
         'https://codereview.example.com',
         '--message', description
     ] + args + [
         '--cc', 'joe@example.com',
+    ] + (['--private'] if private else []) + [
         '--git_similarity', similarity or '50'
     ] + (['--git_no_find_copies'] if find_copies == False else []) + [
         'fake_ancestor_sha', 'HEAD'
     ]
 
   def _run_reviewer_test(
       self,
       upload_args,
       expected_description,
       returned_description,
       final_description,
-      reviewers):
+      reviewers,
+      private=False):
     """Generic reviewer test framework."""
     try:
       similarity = upload_args[upload_args.index('--similarity')+1]
     except ValueError:
       similarity = None
 
     if '--find-copies' in upload_args:
       find_copies = True
     elif '--no-find-copies' in upload_args:
       find_copies = False
     else:
       find_copies = None
 
-    self.calls = self._upload_calls(similarity, find_copies)
+    private = '--private' in upload_args
+
+    self.calls = self._upload_calls(similarity, find_copies, private)
     def RunEditor(desc, _, **kwargs):
       self.assertEquals(
           '# Enter a description of the change.\n'
           '# This will be displayed on the codereview site.\n'
           '# The first line will also be used as the subject of the review.\n' +
           expected_description,
           desc)
       return returned_description
     self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
     def check_upload(args):
       cmd_line = self._cmd_line(final_description, reviewers, similarity,
-                                find_copies)
+                                find_copies, private)
       self.assertEquals(cmd_line, args)
       return 1, 2
     self.mock(git_cl.upload, 'RealMain', check_upload)
     git_cl.main(['upload'] + upload_args)
 
   def test_no_reviewer(self):
     self._run_reviewer_test(
         [],
         'desc\n\nBUG=',
         '# Blah blah comment.\ndesc\n\nBUG=',
         'desc\n\nBUG=',
         [])
 
   def test_keep_similarity(self):
     self._run_reviewer_test(
         ['--similarity', '70'],
         'desc\n\nBUG=',
         '# Blah blah comment.\ndesc\n\nBUG=',
         'desc\n\nBUG=',
         [])
 
   def test_keep_find_copies(self):
     self._run_reviewer_test(
         ['--no-find-copies'],
         'desc\n\nBUG=',
         '# Blah blah comment.\ndesc\n\nBUG=\n',
         'desc\n\nBUG=',
         [])
 
+  def test_private(self):
+    self._run_reviewer_test(
+        ['--private'],
+        'desc\n\nBUG=',
+        '# Blah blah comment.\ndesc\n\nBUG=\n',
+        'desc\n\nBUG=',
+        [])
+
   def test_reviewers_cmd_line(self):
     # Reviewer is passed as-is
     description = 'desc\n\nR=foo@example.com\nBUG='
     self._run_reviewer_test(
         ['-r' 'foo@example.com'],
         description,
         '\n%s\n' % description,
         description,
         ['--reviewers=foo@example.com'])
 
@@ skipping 200 matching lines @@
         return False
       # others paths, such as /usr/share/locale/....
       return True
     self.mock(git_cl.os.path, 'exists', Exists)
     self.mock(git_cl, 'urlretrieve', self._mocked_call)
     self.calls = [
         ((['git', '--no-pager', 'config', 'rietveld.server',
            'gerrit.chromium.org'],), ''),
         ((['git', '--no-pager', 'config', '--unset-all', 'rietveld.cc'],), ''),
         ((['git', '--no-pager', 'config', '--unset-all',
+           'rietveld.private'],), ''),
+        ((['git', '--no-pager', 'config', '--unset-all',
            'rietveld.tree-status-url'],), ''),
         ((['git', '--no-pager', 'config', '--unset-all',
            'rietveld.viewvc-url'],), ''),
         ((['git', '--no-pager', 'config', 'gerrit.host',
            'gerrit.chromium.org'],), ''),
         ((['git', '--no-pager', 'config', 'gerrit.port', '29418'],), ''),
         # DownloadHooks(False)
         ((['git', '--no-pager', 'config', 'gerrit.host'],),
          'gerrit.chromium.org'),
         ((['git', '--no-pager', 'config', 'rietveld.server'],),
          'gerrit.chromium.org'),
         ((['git', '--no-pager', 'rev-parse', '--show-cdup'],), ''),
         ((commit_msg_path, os.X_OK,), False),
         (('https://gerrit.chromium.org/tools/hooks/commit-msg',
           commit_msg_path,), ''),
         ((commit_msg_path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR,), ''),
         # GetCodereviewSettingsInteractively
         ((['git', '--no-pager', 'config', 'rietveld.server'],),
          'gerrit.chromium.org'),
         (('Rietveld server (host[:port]) [https://gerrit.chromium.org]:',),
          ''),
         ((['git', '--no-pager', 'config', 'rietveld.cc'],), ''),
         (('CC list:',), ''),
+        ((['git', '--no-pager', 'config', 'rietveld.private'],), ''),
+        (('Private flag (rietveld only):',), ''),
         ((['git', '--no-pager', 'config', 'rietveld.tree-status-url'],), ''),
         (('Tree status URL:',), ''),
         ((['git', '--no-pager', 'config', 'rietveld.viewvc-url'],), ''),
         (('ViewVC URL:',), ''),
         # DownloadHooks(True)
         ((commit_msg_path, os.X_OK,), True),
         ]
     git_cl.main(['config'])
 
   def test_update_reviewers(self):
@@ skipping 19 matching lines @@
       obj = git_cl.ChangeDescription(orig)
       obj.update_reviewers(reviewers)
       actual.append(obj.description)
     self.assertEqual(expected, actual)
 
 
 if __name__ == '__main__':
   git_cl.logging.basicConfig(
       level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
   unittest.main()