Added --(de)activate-update options

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 249 matching lines @@
     self.svn_branch = None
     self.tree_status_url = None
     self.viewvc_url = None
     self.updated = False
     self.is_gerrit = None
     self.git_editor = None
 
   def LazyUpdateIfNeeded(self):
     """Updates the settings from a codereview.settings file, if available."""
     if not self.updated:
+      noautoupdate = RunGit(['config', 'rietveld.noautoupdate'], error_ok=True
+                            ).strip().lower()

[iannucci, 2013/12/17 00:21:39]

polarity should reverse to 'autoupdate'

+      if noautoupdate == 'true':
+        self.updated = True
+        return

[iannucci, 2013/12/17 00:21:39]

then this block can go away.

+
       cr_settings_file = FindCodereviewSettingsFile()
       if cr_settings_file:

[iannucci, 2013/12/17 00:21:39]

if autoupdate and cr_settings_file:

         LoadCodereviewSettingsFromFile(cr_settings_file)
+        # set updated to True to avoid infinite calling loop
+        # through DownloadHooks
         self.updated = True
         DownloadHooks(False)
       self.updated = True
 
   def GetDefaultServerUrl(self, error_ok=False):
     if not self.default_server:
       self.LazyUpdateIfNeeded()
       self.default_server = gclient_utils.UpgradeToHttps(
           self._GetConfig('rietveld.server', error_ok=True))
       if error_ok:
@@ skipping 789 matching lines @@
       DieWithError('\nFailed to download hooks.\n'
                    'You need to download from\n%s\n'
                    'into .git/hooks/commit-msg and '
                    'chmod +x .git/hooks/commit-msg' % src)
 
 
 @subcommand.usage('[repo root containing codereview.settings]')
 def CMDconfig(parser, args):
   """Edits configuration for this tree."""
 
-  _, args = parser.parse_args(args)
+  parser.add_option('--activate-update', action='store_true',
+                    help='activate auto-updating [rietveld] section in '
+                    '.git/config')

[ghost stip (do not use), 2013/12/16 19:20:23]

align '.git with 'activate

+  parser.add_option('--deactivate-update', action='store_true',

[iannucci, 2013/12/17 00:21:39]

Hm... I think these should both have dest='activate_autoupdate', and this one
should be store_false. You can tell if the user passed in a value by doing an
identity comparison with None. i.e. `if activate_autoupdate is not None:`

+                    help='deactivate auto-updating [rietveld] section in '
+                    '.git/config')

[ghost stip (do not use), 2013/12/16 19:20:23]

same

+  options, args = parser.parse_args(args)
+
+  if options.deactivate_update:
+    RunGit(['config', 'rietveld.noautoupdate', 'true'])

[iannucci, 2013/12/17 00:21:39]

option should be rietveld.autoupdate

+    return
+
+  if options.activate_update:
+    RunGit(['config', '--unset', 'rietveld.noautoupdate'])
+    return
+
   if len(args) == 0:
     GetCodereviewSettingsInteractively()
     DownloadHooks(True)
     return 0
 
   url = args[0]
   if not url.endswith('codereview.settings'):
     url = os.path.join(url, 'codereview.settings')
 
   # Load code review settings and download hooks (if available).
@@ skipping 1264 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:]))