Added --(de)activate-update options

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 128 matching lines @@
 
     if find_copies:
       stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
                    '--find-copies-harder', '-l100000', '-C'+similarity,
                    'fake_ancestor_sha', 'HEAD'],), '+dat')
     else:
       stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
                    '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
 
     return [
+      ((['git', 'config', 'rietveld.autoupdate'],),

[ghost stip (do not use), 2014/01/03 20:40:21]

nit: make this one line?

+       ''),
       ((['git', 'config', 'rietveld.server'],),
        'codereview.example.com'),
       ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
       similarity_call,
       ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
       find_copies_call,
       ((['git', 'update-index', '--refresh', '-q'],), ''),
       ((['git', 'diff-index', '--name-status', 'HEAD'],), ''),
       ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
       ((['git', 'config', 'branch.master.merge'],), 'master'),
@@ skipping 84 matching lines @@
 
   @classmethod
   def _dcommit_calls_1(cls):
     return [
       ((['git',
          'config', '--local', '--get-regexp', '^svn-remote\\.'],),
        ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
           'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
          None),
         0)),
+      ((['git', 'config', 'rietveld.autoupdate'],),
+       ''),
       ((['git',
          'config', 'rietveld.server'],), 'codereview.example.com'),
       ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
       ((['git', 'config', '--int', '--get',
         'branch.working.git-cl-similarity'],), ''),
       ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
       ((['git', 'config', '--int', '--get',
         'branch.working.git-find-copies'],), ''),
       ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
       ((['git',
@@ skipping 112 matching lines @@
     if '--find-copies' in upload_args:
       find_copies = True
     elif '--no-find-copies' in upload_args:
       find_copies = False
     else:
       find_copies = None
 
     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'
           '#--------------------This line is 72 characters long'
           '--------------------\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, 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=',
         [])
 
@@ skipping 96 matching lines @@
     self.calls = (
         self._dcommit_calls_1() +
         self._dcommit_calls_bypassed() +
         self._dcommit_calls_3())
     git_cl.main(['dcommit', '--bypass-hooks'])
 
 
   @classmethod
   def _gerrit_base_calls(cls):
     return [
+        ((['git', 'config', 'rietveld.autoupdate'],),
+         ''),
         ((['git',
            'config', 'rietveld.server'],), 'codereview.example.com'),
         ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
         ((['git', 'config', '--int', '--get',
           'branch.master.git-cl-similarity'],), ''),
         ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
         ((['git', 'config', '--int', '--get',
           'branch.master.git-find-copies'],), ''),
         ((['git', 'update-index', '--refresh', '-q'],), ''),
         ((['git', 'diff-index', '--name-status', 'HEAD'],), ''),
@@ skipping 116 matching lines @@
     commit_msg_path = os.path.join(src_dir, '.git', 'hooks', 'commit-msg')
     def Exists(path):
       if path == commit_msg_path:
         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.mock(git_cl, 'hasSheBang', self._mocked_call)
     self.calls = [
+        ((['git', 'config', 'rietveld.autoupdate'],),
+         ''),
         ((['git', 'config', 'rietveld.server',
            'gerrit.chromium.org'],), ''),
         ((['git', 'config', '--unset-all', 'rietveld.cc'],), ''),
         ((['git', 'config', '--unset-all',
            'rietveld.private'],), ''),
         ((['git', 'config', '--unset-all',
            'rietveld.tree-status-url'],), ''),
         ((['git', 'config', '--unset-all',
            'rietveld.viewvc-url'],), ''),
         ((['git', 'config', 'gerrit.host',
@@ skipping 53 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()