Set default nag_timer=6, and make it disable-able.

gclient.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.
 
 """Meta checkout manager supporting both Subversion and GIT.
 
 Files
   .gclient      : Current client configuration, written by 'config' command.
                   Format is a Python script defining 'solutions', a list whose
@@ skipping 1682 matching lines @@
                     help='Produces additional output for diagnostics. Can be '
                           'used up to three times for more logging info.')
   parser.add_option('--gclientfile', dest='config_filename',
                     default=None,
                     help='Specify an alternate %s file' % gclientfile_default)
   parser.add_option('--spec',
                     default=None,
                     help='create a gclient file containing the provided '
                          'string. Due to Cygwin/Python brokenness, it '
                          'probably can\'t contain any newlines.')
+  parser.add_option('--no-nag-max', default=False, action='store_true',
+                    help='If a subprocess runs for too long without generating'
+                    ' terminal output, generate warnings, but do not kill'
+                    ' the process.')
   # Integrate standard options processing.
   old_parser = parser.parse_args
   def Parse(args):
     (options, args) = old_parser(args)
     level = [logging.ERROR, logging.WARNING, logging.INFO, logging.DEBUG][
         min(options.verbose, 3)]
     logging.basicConfig(level=level,
         format='%(module)s(%(lineno)d) %(funcName)s:%(message)s')
     if options.config_filename and options.spec:
       parser.error('Cannot specifiy both --gclientfile and --spec')
@@ skipping 10 matching lines @@
     if not hasattr(options, 'head'):
       options.head = None
     if not hasattr(options, 'nohooks'):
       options.nohooks = True
     if not hasattr(options, 'deps_os'):
       options.deps_os = None
     if not hasattr(options, 'manually_grab_svn_rev'):
       options.manually_grab_svn_rev = None
     if not hasattr(options, 'force'):
       options.force = None
+    if options.no_nag_max:
+      gclient_scm.SCMWrapper.nag_max = None
     return (options, args)
   parser.parse_args = Parse
   # We don't want wordwrapping in epilog (usually examples)
   parser.format_epilog = lambda _: parser.epilog or ''
   return parser
 
 
 def Main(argv):
   """Doesn't parse the arguments here, just find the right subcommand to
   execute."""
@@ skipping 40 matching lines @@
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   fix_encoding.fix_encoding()
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: